Skip to content
Open
Changes from all commits
Commits
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
20 changes: 5 additions & 15 deletions ggshield/verticals/auth/oauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def oauth_process(
if extra_scopes is not None:
self._extra_scopes = extra_scopes

self._prepare_server()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since your removed that line, the program is never entering in _prepare_server method that you edited below.

self._redirect_to_login()
self._wait_for_callback()
self._print_login_success()
Expand Down Expand Up @@ -163,20 +162,11 @@ def _redirect_to_login(self) -> None:
webbrowser.open_new_tab(request_uri)

def _prepare_server(self) -> None:
for port in range(*USABLE_PORT_RANGE):
try:
self.server = HTTPServer(
# only consider requests from localhost on the predetermined port
("127.0.0.1", port),
functools.partial(RequestHandler, self),
)
self._port = port
break
except OSError:
continue
else:
raise UnexpectedError("Could not find unoccupied port.")

self.server = HTTPServer(
("127.0.0.1", 0),
functools.partial(RequestHandler, self),
)
self._port = self.server.server_port
def _wait_for_callback(self) -> None:
"""
Wait to receive and process the authorization callback on the local server.
Expand Down