mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-02 04:27:13 +02:00
This commit is contained in:
parent
1d1d60f6dd
commit
1370dba59f
@ -85,10 +85,15 @@ def login_step(page, urlh, note, data):
|
|||||||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
|
||||||
response = self._parse_json(
|
response = self._parse_json(
|
||||||
e.cause.read().decode('utf-8'), None)
|
e.cause.read().decode('utf-8'), None)
|
||||||
fail(response['message'])
|
fail(response.get('message') or response['errors'][0])
|
||||||
raise
|
raise
|
||||||
|
|
||||||
redirect_url = urljoin(post_url, response['redirect'])
|
if 'Authenticated successfully' in response.get('message', ''):
|
||||||
|
return None, None
|
||||||
|
|
||||||
|
redirect_url = urljoin(
|
||||||
|
post_url,
|
||||||
|
response.get('redirect') or response['redirect_path'])
|
||||||
return self._download_webpage_handle(
|
return self._download_webpage_handle(
|
||||||
redirect_url, None, 'Downloading login redirect page',
|
redirect_url, None, 'Downloading login redirect page',
|
||||||
headers=headers)
|
headers=headers)
|
||||||
@ -106,6 +111,10 @@ def login_step(page, urlh, note, data):
|
|||||||
'password': password,
|
'password': password,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Successful login
|
||||||
|
if not redirect_page:
|
||||||
|
return
|
||||||
|
|
||||||
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
|
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
|
||||||
# TODO: Add mechanism to request an SMS or phone call
|
# TODO: Add mechanism to request an SMS or phone call
|
||||||
tfa_token = self._get_tfa_info('two-factor authentication token')
|
tfa_token = self._get_tfa_info('two-factor authentication token')
|
||||||
|
Loading…
Reference in New Issue
Block a user