nirvana-7777/script.service.ultimate
1
0
Fork 0
mirror of https://github.com/nirvana-7777/script.service.ultimate.git synced 2026-09-17 14:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix get_manifest

Browse Source
This commit is contained in:
Nirvana
2025-11-18 10:28:33 +01:00
parent 7d43949e5b
commit ea4ffa6bc0
3 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/streaming_providers/providers/magenta2/auth.py
+9 -2
View File
@@ -509,15 +509,22 @@ class Magenta2Authenticator(BaseOAuth2Authenticator):
if self._sam3_client and self._taa_client:
from .token_flow_manager import TokenFlowManager
# Get session manager from settings_manager
session_manager = getattr(self.settings_manager, 'session_manager', None)
if not session_manager:
logger.error("Cannot initialize TokenFlowManager: No session_manager available")
return
self.token_flow_manager = TokenFlowManager(
session_manager=self.settings_manager.session_manager, # ✅ Correct!
session_manager=session_manager,
sam3_client=self._sam3_client,
taa_client=self._taa_client,
provider_name=self.provider_name,
country=self.country,
provider_config=self.provider_config
provider_config=self.provider_config # ✅ Make sure this is passed!
)
logger.debug("TokenFlowManager initialized")
logger.debug(f"TokenFlowManager provider_config available: {self.provider_config is not None}")
def get_yo_digital_token(self, force_refresh: bool = False) -> Optional[str]:
"""
lib/streaming_providers/providers/magenta2/provider.py
+6
View File
@@ -154,6 +154,12 @@ class Magenta2Provider(StreamingProvider):
# Update authenticator with discovered client_id and models
self.authenticator.provider_config = self.provider_config # ✅ Store the config
logger.info("✓ ProviderConfig stored in authenticator")
# Also update TokenFlowManager if it exists
if hasattr(self.authenticator, 'token_flow_manager') and self.authenticator.token_flow_manager:
self.authenticator.token_flow_manager.provider_config = self.provider_config
logger.info("✓ ProviderConfig also stored in TokenFlowManager")
if self.provider_config.bootstrap.sam3_client_id:
# Use public method if available, otherwise update directly
if hasattr(self.authenticator, 'update_sam3_client_id'):
lib/streaming_providers/providers/magenta2/token_flow_manager.py
+31 -39
View File
@@ -114,55 +114,51 @@ class TokenFlowManager:
def _compose_persona_token(self, access_token: str) -> Optional[str]:
"""
Compose persona token from access_token JWT claims with correct claim names
Compose persona token from access_token JWT claims with fallback logic
"""
try:
# Import here to avoid circular imports
from .config_models import ProviderConfig
# Extract claims from JWT
claims = self._extract_jwt_claims(access_token)
# CORRECTED: Use the actual claim name from your logs
dc_cts_persona_token = claims.get('dc_cts_personaToken') # Capital T!
if not dc_cts_persona_token:
# Try alternative names
alternative_names = [
'dc_cts_persona_token', # underscore
'personaToken', # simple
'urn:telekom:ott:dc_cts_persona_token' # URN format
]
for alt_name in alternative_names:
if alt_name in claims:
dc_cts_persona_token = claims[alt_name]
logger.debug(f"Found persona token using alternative name: {alt_name}")
break
# Get persona token
dc_cts_persona_token = claims.get('dc_cts_personaToken')
if not dc_cts_persona_token:
logger.error("No persona token found in JWT claims")
logger.error(
f"Available persona-related claims: {[k for k in claims.keys() if 'persona' in k.lower()]}")
return None
# Use the discovered account URI from ProviderConfig
if not hasattr(self, 'provider_config') or not self.provider_config:
logger.error("No provider_config available - cannot compose persona token")
return None
# Get account URI - try multiple sources
account_uri = None
# Type check to ensure it's a ProviderConfig
if not isinstance(self.provider_config, ProviderConfig):
logger.error(f"provider_config is not ProviderConfig: {type(self.provider_config)}")
return None
# 1. Try provider_config first
if hasattr(self, 'provider_config') and self.provider_config:
account_uri = self.provider_config.get_mpx_account_uri()
if account_uri:
logger.debug("Using account URI from provider_config")
# Get account URI
account_uri = self.provider_config.get_mpx_account_uri()
# 2. Try to extract from JWT claims
if not account_uri:
logger.error("No account URI available from provider_config")
account_uri = claims.get('dc_cts_account_uri') or claims.get('accountUri')
if account_uri:
logger.debug("Using account URI from JWT claims")
# 3. Try to construct from MPX account PID in JWT
if not account_uri:
# Look for account-related claims
account_pid = claims.get('oid') # From your JWT: 'oid': '2709353023'
if account_pid:
account_uri = f"http://access.auth.theplatform.com/data/Account/{account_pid}"
logger.debug(f"Constructed account URI from oid: {account_uri}")
# 4. Final fallback - hardcoded (should match your MPX account)
if not account_uri:
account_uri = "http://access.auth.theplatform.com/data/Account/2709353023"
logger.warning(f"Using fallback account URI: {account_uri}")
if not account_uri:
logger.error("No account URI available from any source")
return None
logger.debug(f"Using discovered account URI: {account_uri}")
logger.debug(f"Using account URI: {account_uri}")
logger.debug(f"Persona token length: {len(dc_cts_persona_token)}")
# Compose: account_uri + ":" + dc_cts_persona_token
@@ -172,15 +168,11 @@ class TokenFlowManager:
persona_token = base64.b64encode(raw_token.encode('utf-8')).decode('utf-8')
logger.info("✓ Persona token composed successfully")
logger.debug(f"Account URI: {account_uri}")
logger.debug(f"Raw token length: {len(raw_token)}")
logger.debug(f"Persona token preview: {persona_token[:50]}...")
return persona_token
except ImportError as e:
logger.error(f"Failed to import ProviderConfig: {e}")
return None
except Exception as e:
logger.error(f"Failed to compose persona token: {e}")
return None