From 93465c60302e7a3742f6359ce4d978d063a58c98 Mon Sep 17 00:00:00 2001
From: Nirvana <Nirvana@gmail.com>
Date: Fri, 24 Apr 2026 13:11:10 +0200
Subject: [PATCH] Prepare RTLPlus for new streaming prov

---
 .../providers/rtlplus/auth.py                  | 18 +++++++++++++++---
 .../providers/rtlplus/channel_manager.py       |  2 +-
 .../providers/rtlplus/constants.py             |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/streaming_providers/providers/rtlplus/auth.py b/lib/streaming_providers/providers/rtlplus/auth.py
index e7c160c..7a4589c 100644
--- a/lib/streaming_providers/providers/rtlplus/auth.py
+++ b/lib/streaming_providers/providers/rtlplus/auth.py
@@ -59,7 +59,7 @@ class RTLPlusAuthenticator(BaseOAuth2Authenticator):
 
     @property
     def oauth_client_id(self) -> str:
-        return self._get_client_id()
+        return RTLPlusDefaults.BEDROCK_CLIENT_ID  # "bedrock-m6group_web"
 
     @property
     def oauth_scope(self) -> str:
@@ -67,7 +67,13 @@ class RTLPlusAuthenticator(BaseOAuth2Authenticator):
 
     @property
     def oauth_redirect_uri(self) -> str:
-        return self.config.base_website
+        # Used in the authorize step
+        return f"{self.config.beta_website}tv-programm"
+
+    @property
+    def oauth_token_redirect_uri(self) -> str:
+        # Used in the token exchange step
+        return f"{self.config.beta_website}silent-sso-iframe.html"
 
     @property
     def config(self) -> RTLPlusConfig:
@@ -155,7 +161,13 @@ class RTLPlusAuthenticator(BaseOAuth2Authenticator):
             password=password,
             form_selector_pattern=r'<form id="rtlplus-form-login" action="([^"]*)"',
             login_fields={"username": "username", "password": "password"},
-            extra_params={"prompt": "login", "nonce": str(uuid.uuid4())},
+            extra_params={
+                "prompt": "login",
+                "nonce": str(uuid.uuid4()),
+                "claim": "sub",  # ← add this
+                "state": '{"redirectUrl":"#"}',  # ← add this
+                "auth_flow_type": "login",  # ← add this
+            },
             additional_form_data={"credentialId": "", "rememberMe": "on"},
         )
 
diff --git a/lib/streaming_providers/providers/rtlplus/channel_manager.py b/lib/streaming_providers/providers/rtlplus/channel_manager.py
index 0b6524a..b5ea013 100644
--- a/lib/streaming_providers/providers/rtlplus/channel_manager.py
+++ b/lib/streaming_providers/providers/rtlplus/channel_manager.py
@@ -215,7 +215,7 @@ class RTLPlusChannelManager:
         bedrock_token = self.auth.get_bedrock_token()
 
         url = self.cfg.get_bedrock_layout_url(channel_seo=channel_seo)
-        location = f"https://plus.rtl.de/{channel_seo}/live"
+        location = f"{self.cfg.beta_website}{channel_seo}/live"
         headers = self.cfg.get_bedrock_layout_headers(oauth_token, bedrock_token, location)
 
         params = {"blockPage": 1, "nbPages": 2}
diff --git a/lib/streaming_providers/providers/rtlplus/constants.py b/lib/streaming_providers/providers/rtlplus/constants.py
index e330682..85e684c 100644
--- a/lib/streaming_providers/providers/rtlplus/constants.py
+++ b/lib/streaming_providers/providers/rtlplus/constants.py
@@ -39,6 +39,7 @@ class RTLPlusDefaults:
     # Client and version information
     CLIENT_VERSION_FALLBACK = "2025.6.26.0"
     CLIENT_ID = f"rtlplus-{PLATFORM_DEFAULT}"
+    BEDROCK_CLIENT_ID = "bedrock-m6group_web"
 
     # API endpoints
     AUTH_BASE_URL = "https://auth.rtl.de/auth/realms/rtlplus/protocol/openid-connect"