fixes

Author: aw-was-here

nowplaying/oauth2.py

@@ -403,7 +403,7 @@ def get_redirect_uri(self, token_type: str = 'main') -> str:  # pylint: disable=
         return f'http://localhost:{port}/{redirect_path}'
 
     @staticmethod
-    async def handle_oauth_redirect(request, oauth_config: dict):
+    async def handle_oauth_redirect(request, oauth_config: dict, config, jinja2_env):
         """Generic OAuth2 redirect handler for any service.
 
         This method handles the OAuth2 authorization code flow redirect for any service.
@@ -420,12 +420,14 @@ async def handle_oauth_redirect(request, oauth_config: dict):
                 - 'redirect_path': Path component for redirect URI (e.g., 'kickredirect')
                 - 'token_keys': Dict with 'access' and 'refresh' keys for token storage
                 - 'success_template': Success template name (optional)
+            config: The config object (nowplaying.config.ConfigFile)
+            jinja2_env: The Jinja2 environment (jinja2.Environment)
 
         Returns:
             aiohttp.web.Response: HTML response for the OAuth flow result
         """
         # Initialize helper
-        helper = _OAuthRedirectHelper(request, oauth_config)
+        helper = _OAuthRedirectHelper(request, oauth_config, config, jinja2_env)
 
         # Process OAuth flow steps
         if error_response := helper.handle_oauth_error():
@@ -441,7 +443,7 @@ async def handle_oauth_redirect(request, oauth_config: dict):
 class _OAuthRedirectHelper:  # pylint: disable=too-many-instance-attributes
     """Helper class to handle OAuth redirect processing steps."""
 
-    def __init__(self, request: web.Request, oauth_config: dict):
+    def __init__(self, request: web.Request, oauth_config: dict, config, jinja2_env):
         self.request = request
         self.oauth_config = oauth_config
         self.params = dict(request.query)
@@ -457,10 +459,9 @@ def __init__(self, request: web.Request, oauth_config: dict):
         self.success_template = oauth_config.get('success_template',
                                                  f"{oauth_config['template_prefix']}_success.htm")
 
-        # Get app context - use string constants to avoid circular import
-        self.config = request.app['config']
+        # Use provided config and jinja2 environment
+        self.config = config
         self.config.get()
-        jinja2_env = request.app['jinja2']
         self.load_template = self._create_template_loader(jinja2_env)
 
         # Log redirect for debugging (don't log auth code for security)

nowplaying/processes/webserver.py

@@ -475,7 +475,11 @@ async def internals(request: web.Request):
     @staticmethod
     async def _handle_oauth_redirect(request: web.Request, oauth_config: dict) -> web.Response:
         """Generic OAuth2 redirect handler - delegates to base OAuth2 class."""
-        return await nowplaying.oauth2.OAuth2Client.handle_oauth_redirect(request, oauth_config)
+        # Pass config and jinja2 environment from app context using correct keys
+        config = request.app[CONFIG_KEY]
+        jinja2_env = request.app[JINJA2_KEY]
+        return await nowplaying.oauth2.OAuth2Client.handle_oauth_redirect(
+            request, oauth_config, config, jinja2_env)
 
 
     async def kickredirect_handler(self, request: web.Request):  # pylint: disable=no-self-use