diff --git a/yt_dlp/extractor/thisoldhouse.py b/yt_dlp/extractor/thisoldhouse.py index fbc12d55d9..b9d1154272 100644 --- a/yt_dlp/extractor/thisoldhouse.py +++ b/yt_dlp/extractor/thisoldhouse.py @@ -1,18 +1,17 @@ -import json +import urllib.parse from .brightcove import BrightcoveNewIE from .common import InfoExtractor from .zype import ZypeIE from ..networking import HEADRequest -from ..networking.exceptions import HTTPError from ..utils import ( ExtractorError, filter_dict, parse_qs, smuggle_url, - try_call, urlencode_postdata, ) +from ..utils.traversal import traverse_obj class ThisOldHouseIE(InfoExtractor): @@ -77,46 +76,43 @@ class ThisOldHouseIE(InfoExtractor): 'only_matching': True, }] - _LOGIN_URL = 'https://login.thisoldhouse.com/usernamepassword/login' - def _perform_login(self, username, password): - self._request_webpage( - HEADRequest('https://www.thisoldhouse.com/insider'), None, 'Requesting session cookies') - urlh = self._request_webpage( - 'https://www.thisoldhouse.com/wp-login.php', None, 'Requesting login info', - errnote='Unable to login', query={'redirect_to': 'https://www.thisoldhouse.com/insider'}) + login_page = self._download_webpage( + 'https://www.thisoldhouse.com/insider-login', None, 'Downloading login page') + hidden_inputs = self._hidden_inputs(login_page) + response = self._download_json( + 'https://www.thisoldhouse.com/wp-admin/admin-ajax.php', None, 'Logging in', + headers={ + 'Accept': 'application/json', + 'X-Requested-With': 'XMLHttpRequest', + }, data=urlencode_postdata(filter_dict({ + 'action': 'onebill_subscriber_login', + 'email': username, + 'password': password, + 'pricingPlanTerm': hidden_inputs['pricing_plan_term'], + 'utm_parameters': hidden_inputs.get('utm_parameters'), + 'nonce': hidden_inputs['mdcr_onebill_login_nonce'], + }))) - try: - auth_form = self._download_webpage( - self._LOGIN_URL, None, 'Submitting credentials', headers={ - 'Content-Type': 'application/json', - 'Referer': urlh.url, - }, data=json.dumps(filter_dict({ - **{('client_id' if k == 'client' else k): v[0] for k, v in parse_qs(urlh.url).items()}, - 'tenant': 'thisoldhouse', - 'username': username, - 'password': password, - 'popup_options': {}, - 'sso': True, - '_csrf': try_call(lambda: self._get_cookies(self._LOGIN_URL)['_csrf'].value), - '_intstate': 'deprecated', - }), separators=(',', ':')).encode()) - except ExtractorError as e: - if isinstance(e.cause, HTTPError) and e.cause.status == 401: + message = traverse_obj(response, ('data', 'message', {str})) + if not response['success']: + if message and 'Something went wrong' in message: raise ExtractorError('Invalid username or password', expected=True) - raise - - self._request_webpage( - 'https://login.thisoldhouse.com/login/callback', None, 'Completing login', - data=urlencode_postdata(self._hidden_inputs(auth_form))) + raise ExtractorError(message or 'Login was unsuccessful') + if message and 'Your subscription is not active' in message: + self.report_warning( + f'{self.IE_NAME} said your subscription is not active. ' + f'If your subscription is active, this could be caused by too many sign-ins, ' + f'and you should instead try using {self._login_hint(method="cookies")[4:]}') + else: + self.write_debug(f'{self.IE_NAME} said: {message}') def _real_extract(self, url): display_id = self._match_id(url) - webpage = self._download_webpage(url, display_id) - if 'To Unlock This content' in webpage: - self.raise_login_required( - 'This video is only available for subscribers. ' - 'Note that --cookies-from-browser may not work due to this site using session cookies') + webpage, urlh = self._download_webpage_handle(url, display_id) + # If login response says inactive subscription, site redirects to frontpage for Insider content + if 'To Unlock This content' in webpage or urllib.parse.urlparse(urlh.url).path in ('', '/'): + self.raise_login_required('This video is only available for subscribers') video_url, video_id = self._search_regex( r']+src=[\'"]((?:https?:)?//(?:www\.)?thisoldhouse\.(?:chorus\.build|com)/videos/zype/([0-9a-f]{24})[^\'"]*)[\'"]',