Compare commits

..

2 Commits

Author SHA1 Message Date
bashonly
2e0576378c
fixing my typo 2024-01-27 21:34:10 +00:00
Christian Kündig
be31128af2
Apply suggestions from code review
Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
2024-01-27 22:20:57 +01:00

View File

@ -1,7 +1,14 @@
import json import json
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import int_or_none, traverse_obj, urlencode_postdata, parse_qs, ExtractorError, update_url_query from ..utils import (
ExtractorError,
int_or_none,
parse_qs,
traverse_obj,
update_url_query,
urlencode_postdata,
)
class PlaySuisseIE(InfoExtractor): class PlaySuisseIE(InfoExtractor):
@ -135,6 +142,8 @@ class PlaySuisseIE(InfoExtractor):
id id
url url
}''' }'''
_LOGIN_BASE_URL = 'https://login.srgssr.ch/srgssrlogin.onmicrosoft.com'
_LOGIN_PATH = 'B2C_1A__SignInV2'
_ID_TOKEN = None _ID_TOKEN = None
def _perform_login(self, username, password): def _perform_login(self, username, password):
@ -143,21 +152,31 @@ class PlaySuisseIE(InfoExtractor):
query={'x': 'x', 'locale': 'de', 'redirectUrl': 'https://www.playsuisse.ch/'}) query={'x': 'x', 'locale': 'de', 'redirectUrl': 'https://www.playsuisse.ch/'})
settings = self._search_json(r'var\s+SETTINGS\s*=', login_page, 'settings', None) settings = self._search_json(r'var\s+SETTINGS\s*=', login_page, 'settings', None)
webpage, urlh = self._download_webpage_handle( csrf_token = settings['csrf']
'https://login.srgssr.ch/srgssrlogin.onmicrosoft.com/B2C_1A__SignInV2/SelfAsserted', query = {'tx': settings['transId'], 'p': self._LOGIN_PATH}
None, note='Logging in', headers={'X-CSRF-TOKEN': settings['csrf']},
data=urlencode_postdata({'request_type': 'RESPONSE', 'signInName': username, 'password': password}),
query={'tx': settings['transId'], 'p': 'B2C_1A__SignInV2'})
webpage, urlh = self._download_webpage_handle( status = traverse_obj(self._download_json(
'https://login.srgssr.ch/srgssrlogin.onmicrosoft.com/B2C_1A__SignInV2/api/CombinedSigninAndSignup/confirmed', f'{self._LOGIN_BASE_URL}/{self._LOGIN_PATH}/SelfAsserted', None, 'Logging in',
None, note='Downloading ID token', query=query, headers={'X-CSRF-TOKEN': csrf_token}, data=urlencode_postdata({
query={'rememberMe': 'false', 'csrf_token': settings['csrf'], 'tx': settings['transId'], 'p': 'B2C_1A__SignInV2', 'diags': ''}) 'request_type': 'RESPONSE',
'signInName': username,
'password': password
}), expected_status=400), ('status', {int_or_none}))
if status == 400:
raise ExtractorError('Invalid username or password', expected=True)
query = parse_qs(urlh.url) urlh = self._request_webpage(
if 'id_token' not in query: f'{self._LOGIN_BASE_URL}/{self._LOGIN_PATH}/api/CombinedSigninAndSignup/confirmed',
raise ExtractorError("Login failed") None, 'Downloading ID token', query={
self._ID_TOKEN = query['id_token'][0] 'rememberMe': 'false',
'csrf_token': csrf_token,
**query,
'diags': '',
})
self._ID_TOKEN = traverse_obj(parse_qs(urlh.url), ('id_token', 0))
if not self._ID_TOKEN:
raise ExtractorError('Login failed')
def _get_media_data(self, media_id): def _get_media_data(self, media_id):
# NOTE In the web app, the "locale" header is used to switch between languages, # NOTE In the web app, the "locale" header is used to switch between languages,
@ -175,7 +194,7 @@ class PlaySuisseIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
if not self._ID_TOKEN: if not self._ID_TOKEN:
self.raise_login_required() self.raise_login_required(method='password')
media_id = self._match_id(url) media_id = self._match_id(url)
media_data = self._get_media_data(media_id) media_data = self._get_media_data(media_id)