From 7bad686517c51405075940895d1baf5e5e401d59 Mon Sep 17 00:00:00 2001
From: Nirvana <Nirvana@gmail.com>
Date: Wed, 20 May 2026 10:40:44 +0200
Subject: [PATCH] Joyn change auth

---
 .idea/script.service.ultimate.iml             |  4 ++-
 .../providers/joyn/auth.py                    | 31 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/.idea/script.service.ultimate.iml b/.idea/script.service.ultimate.iml
index 1dfd243..b06e1b3 100644
--- a/.idea/script.service.ultimate.iml
+++ b/.idea/script.service.ultimate.iml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
+    </content>
     <orderEntry type="jdk" jdkName="Python 3.12 (.venv)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/lib/streaming_providers/providers/joyn/auth.py b/lib/streaming_providers/providers/joyn/auth.py
index ccb0951..b0b6260 100644
--- a/lib/streaming_providers/providers/joyn/auth.py
+++ b/lib/streaming_providers/providers/joyn/auth.py
@@ -296,6 +296,15 @@ class JoynAuthenticator(BaseOAuth2Authenticator):
         # Extract and cache client_id during initialization
         self._client_id = self._extract_client_id_from_endpoints()
 
+        # Register BEFORE super().__init__ so the Kodi sync in SettingsManager
+        # knows joyn is country-aware and syncs with the country parameter
+        if settings_manager is not None:
+            settings_manager.register_provider(
+                "joyn",
+                supports_countries=True,
+                available_countries=["de", "at", "ch"],
+            )
+
         # NOW call parent __init__ - config, http_manager AND country are ready
         super().__init__(
             provider_name="joyn",
@@ -308,6 +317,23 @@ class JoynAuthenticator(BaseOAuth2Authenticator):
             proxy_config=proxy_config,
         )
 
+        # Guaranteed non-None credentials after init
+        if self.credentials is None:
+            logger.info(f"No credentials resolved for joyn/{self.country}, using anonymous fallback")
+            self.credentials = self.get_fallback_credentials()
+
+        # Safe credential log
+        from ...base.auth.credentials import UserPasswordCredentials
+        if isinstance(self.credentials, UserPasswordCredentials):
+            logger.info(
+                f"JoynAuthenticator [{self.country}]: user credentials loaded, "
+                f"username='{self.credentials.username}', password=[REDACTED]"
+            )
+        else:
+            logger.info(
+                f"JoynAuthenticator [{self.country}]: using {type(self.credentials).__name__}"
+            )
+
     def _get_joyn_auth_headers(self) -> Dict[str, str]:
         from .constants import JOYN_AUTH_HEADERS_BASE
         headers = JOYN_AUTH_HEADERS_BASE.copy()
@@ -630,7 +656,7 @@ class JoynAuthenticator(BaseOAuth2Authenticator):
 
             if not request_id:
                 request_id_match = re.search(
-                    r'requestId[ "\'\']?\s*:\s*[ "\'\']([^ "\']+)', auth_response.text
+                    r'requestId[ "\']?\s*:\s*[ "\']([^ "\']+)', auth_response.text
                 )
                 if request_id_match:
                     request_id = request_id_match.group(1)
@@ -793,7 +819,8 @@ class JoynAuthenticator(BaseOAuth2Authenticator):
                 session.headers.clear()
                 session.headers.update(original_headers)
 
-    def _strip_joyn_headers_for_7pass(self, session) -> None:
+    @staticmethod
+    def _strip_joyn_headers_for_7pass(session) -> None:
         """Remove joyn-* headers that can cause 431 errors on 7pass endpoints"""
         for key in list(session.headers.keys()):
             if key.lower().startswith('joyn-'):