Fixing oauth decline error messages and wrong jinja warning

Author: nheeb

src/hermes/commands/init/base.py

@@ -553,15 +553,13 @@ def configure_ci_template(self, ci_file_path) -> None:
         jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(""),
                                        block_start_string="{%%", block_end_string="%%}",
                                        variable_start_string="{%", variable_end_string="%}")
-        source_text = Path(ci_file_path).read_text(encoding="utf-8")
-        used_params = jinja2.meta.find_undeclared_variables(jinja_env.parse(source_text))
         template = jinja_env.get_template(str(ci_file_path))
-        missing = [p for p in used_params if p not in self.ci_parameters]
-        if missing:
-            sc.echo(f"CI Template has missing parameters: {missing}", formatting=sc.Formats.WARNING)
         rendered = template.render(self.ci_parameters)
         with open(ci_file_path, 'w') as file:
             file.write(rendered)
+        undeclared_params = jinja2.meta.find_undeclared_variables(jinja_env.parse(rendered))
+        if undeclared_params:
+            sc.echo(f"CI Template has missing parameters: {undeclared_params}", formatting=sc.Formats.WARNING)
 
     def create_zenodo_token(self) -> None:
         """Makes the user create a zenodo token and saves it in self.deposit_platform.token."""

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

@@ -17,6 +17,7 @@
 
 import requests
 import requests_oauthlib
+from oauthlib.oauth2.rfc6749.errors import CustomOAuth2Error
 
 from . import slim_click as sc
 
@@ -74,6 +75,7 @@ def __init__(self, name: str, client_id: str = "", client_secret: str = "", auth
         self.tokens = {}
         self.device_code_url = device_code_url
         self.server: HTTPServer = None
+        self.error_description: str = ""
 
     def create_handler_constructor(self):
         def handler(*args, **kwargs):
@@ -158,7 +160,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.echo(f"Error: {token_response_data['error']}", sc.Formats.WARNING)
+                return {}
+            elif self.error_description:
+                sc.echo(f"Error: {self.error_description}", sc.Formats.WARNING)
                 return {}
 
             time.sleep(interval)
@@ -167,7 +172,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()
@@ -220,9 +225,12 @@ def callback(self):
         parsed = urlparse(self.path)
         auth_code = parse_qs(parsed.query)["code"][0]
 
-        tokens = self.oauth_process.get_tokens_from_auth_code(auth_code)
-        self.oauth_process.tokens = tokens
-        self.oauth_process.shutdown_event.set()
+        try:
+            tokens = self.oauth_process.get_tokens_from_auth_code(auth_code)
+            self.oauth_process.tokens = tokens
+            self.oauth_process.shutdown_event.set()
+        except CustomOAuth2Error as e:
+            self.oauth_process.error_description = e.description
 
         self.end_headers()
         self.wfile.write(b"You can close this window now.")