Skip to content

Fix GitHub auth #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
T8902 merged 2 commits into from
Jan 31, 2025
Merged

Fix GitHub auth #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ceadd
Fix tests
T8902 Jan 30, 2025
5f28d9f
Fix authentication error
T8902 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions website/projects/githubsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def __init__(self):
self._github = Github() # used to talk to GitHub as our own app

if (
settings.DJANGO_GITHUB_SYNC_APP_ID != "" and settings.DJANGO_GITHUB_SYNC_APP_PRIVATE_KEY_BASE64 != ""
settings.DJANGO_GITHUB_SYNC_APP_ID != "" and settings.DJANGO_GITHUB_SYNC_APP_PRIVATE_KEY != ""
): # pragma: no cover
self._gi = GithubIntegration(
auth=Auth.AppAuth(
settings.DJANGO_GITHUB_SYNC_APP_ID, settings.DJANGO_GITHUB_SYNC_APP_PRIVATE_KEY_BASE64
settings.DJANGO_GITHUB_SYNC_APP_ID, settings.DJANGO_GITHUB_SYNC_APP_PRIVATE_KEY
)
)
else:
Expand Down Expand Up @@ -63,7 +63,7 @@ def renew_access_token_if_required(self):

:except: GithubException when requesting a new access token fails
"""
if self._access_token is None or self._access_token.expires_at < datetime.utcnow() + timedelta(seconds=60):
if self._access_token is None or self._access_token.expires_at < datetime.now() + timedelta(seconds=60):
self._access_token = self._gi.get_access_token(self.installation_id)
self._github = Github(self._access_token.token)
self._organization = self._github.get_organization(self.organization_name)
Expand Down
12 changes: 6 additions & 6 deletions website/projects/tests/test_githubsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,35 +311,35 @@ def test_remove_users_not_in_team__employee(self):
self.remove_users_not_in_team(self.employee1.github_username, "member")
self.github_team.remove_membership.assert_not_called()
self.talker.remove_user.assert_not_called()
self.assertEquals(self.sync.users_removed, 0)
self.assertEqual(self.sync.users_removed, 0)
self.assert_no_log()

def test_remove_users_not_in_team__no_employee(self):
self.remove_users_not_in_team("anunwanteduser", "member")
self.github_team.remove_membership.assert_not_called()
self.talker.remove_user.assert_called_once_with(self.github_user)
self.assertEquals(self.sync.users_removed, 1)
self.assertEqual(self.sync.users_removed, 1)
self.assert_info()

def test_remove_users_not_in_team__owner(self):
self.remove_users_not_in_team("anunwanteduser", "admin")
self.github_team.remove_membership.assert_called_once_with(self.github_user)
self.talker.remove_user.assert_not_called()
self.assertEquals(self.sync.users_removed, 1)
self.assertEqual(self.sync.users_removed, 1)
self.assert_info()

def test_remove_users_not_in_team__exception_employee(self):
self.remove_users_not_in_team("anunwanteduser", "member", self.exception, None)
self.github_team.remove_membership.assert_not_called()
self.talker.remove_user.assert_called_once_with(self.github_user)
self.assertEquals(self.sync.users_removed, 0)
self.assertEqual(self.sync.users_removed, 0)
self.assert_error()

def test_remove_users_not_in_team__exception_owner(self):
self.remove_users_not_in_team("anunwanteduser", "admin", None, self.exception)
self.github_team.remove_membership.assert_called_once_with(self.github_user)
self.talker.remove_user.assert_not_called()
self.assertEquals(self.sync.users_removed, 0)
self.assertEqual(self.sync.users_removed, 0)
self.assert_error()

def test_remove_team__user_in_employees(self):
Expand Down Expand Up @@ -527,7 +527,7 @@ def test_create_repo(self):
self.talker.create_repo.return_value = "ThisShouldBeAPyGithubRepo"
returned_repo = self.sync.create_repo(self.repo1)
self.talker.create_repo.assert_called_once_with(self.repo1)
self.assertEquals(returned_repo, "ThisShouldBeAPyGithubRepo")
self.assertEqual(returned_repo, "ThisShouldBeAPyGithubRepo")
self.github_team.add_to_repos.assert_called_once_with(returned_repo)
self.github_team.set_repo_permission.assert_called_once_with(returned_repo, "admin")

Expand Down
Loading