Updated oauth error messages

Author: nheeb

src/hermes/commands/init/base.py

@@ -623,7 +623,8 @@ def configure_github(self) -> None:
                                              token=self.tokens[GitHoster.GitHub])
                 oauth_success = True
             else:
-                sc.echo("Something went wrong while doing OAuth. You'll have to do it manually instead.",
+                sc.echo("Something went wrong while doing OAuth. You will have to restart 'hermes init' to try OAuth "
+                        "again. Alternatively you can do it manually instead by executing the following steps:",
                         formatting=sc.Formats.WARNING)
         if not oauth_success:
             sc.echo("Add the {} token{} to your {} under the name {}.".format(

src/hermes/commands/init/util/oauth_process.py

@@ -24,7 +24,6 @@
 PREFER_DEVICE_FLOW = True
 DEACTIVATE_BROWSER_OPENING = False
 
-
 def setup_logging_for_oauthlib():
     """
     This makes requests_oauthlib.oauth2_session print all the debug logs onto the console.
@@ -160,10 +159,10 @@ def get_tokens_from_device_flow(self) -> dict[str: str]:
             if "access_token" in token_response_data:
                 return token_response_data
             elif "error" in token_response_data and token_response_data["error"] != "authorization_pending":
-                sc.echo(f"Error: {token_response_data['error']}", sc.Formats.WARNING)
+                sc.echo(f"Device Flow Error: {token_response_data['error']}", sc.Formats.WARNING)
                 return {}
             elif self.error_description:
-                sc.echo(f"Error: {self.error_description}", sc.Formats.WARNING)
+                sc.echo(f"Device Flow Error: {self.error_description}", sc.Formats.WARNING)
                 return {}
 
             time.sleep(interval)
@@ -172,7 +171,7 @@ def get_tokens_from_oauth(self) -> dict[str: str]:
         if self.authorize_url == "":
             sc.echo(f"OAuth is not available for {self.name}")
             return {}
-        # sc.echo(f"Opening browser to log into your {self.name} account...")
+        sc.echo(f"Opening browser to log into your {self.name} account...")
         self.tokens = {}
         server_thread = threading.Thread(target=self.start_server, daemon=True)
         server_thread.start()
@@ -187,9 +186,9 @@ def get_tokens_from_oauth(self) -> dict[str: str]:
 
     def get_tokens(self) -> dict[str: str]:
         if PREFER_DEVICE_FLOW:
-            return self.get_tokens_from_device_flow() or self.get_tokens_from_oauth() or {}
+            return self.get_tokens_from_device_flow() or {}
         else:
-            return self.get_tokens_from_oauth() or self.get_tokens_from_device_flow() or {}
+            return self.get_tokens_from_oauth() or {}
 
 
 class Handler(BaseHTTPRequestHandler):