mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 12:50:23 -05:00
Code Activity

revert: traverse_obj & use direct cache key

Browse source
This commit is contained in:
ChocoLZS 2025-01-30 15:59:56 +08:00
parent 68232ed11c
commit a9fe89e291
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
yt_dlp/extractor/sheeta.py
View file

@ -132,7 +132,7 @@ def _niconico_sns_login(self, redirect_url, refresh_url):
if not mail_tel: if not mail_tel:
return return
cache_key = hashlib.sha1(f'{self._ie._DOMAIN}:{mail_tel}:{password}'.encode()).hexdigest() cache_key = f'{self._ie._DOMAIN}:{mail_tel}'
self._auth_info = {'cache_key': cache_key} self._auth_info = {'cache_key': cache_key}
cache_name = 'niconico_sns' cache_name = 'niconico_sns'
@ -240,19 +240,17 @@ def _auth0_login(self):
if not username: if not username:
return return
cache_key = hashlib.sha1(f'{self._ie._DOMAIN}:{username}:{password}'.encode()).hexdigest() cache_key = f'{self._ie._DOMAIN}:{username}'
cache_name = 'refresh' cache_name = 'refresh'
self._auth_info = { self._auth_info = {
'cache_key': cache_key, 'cache_key': cache_key,
'cache_name': cache_name, 'cache_name': cache_name,
} }
login_info = traverse_obj( login_info = self._ie._call_api(f'fanclub_sites/{self._ie._FANCLUB_SITE_ID_AUTH}/login', None)['data']['fanclub_site']
self._ie._call_api(f'fanclub_sites/{self._ie._FANCLUB_SITE_ID_AUTH}/login', None),
('data', 'fanclub_site'))
self._ie.write_debug(f'login_info = {login_info}') self._ie.write_debug(f'login_info = {login_info}')
auth0_web_client_id = login_info.get('auth0_web_client_id') auth0_web_client_id = login_info['auth0_web_client_id']
auth0_domain = traverse_obj(login_info, ('fanclub_group', 'auth0_domain')) auth0_domain = login_info['fanclub_group']['auth0_domain']
token_url = f'https://{auth0_domain}/oauth/token' token_url = f'https://{auth0_domain}/oauth/token'
redirect_url = f'https://{self._ie._DOMAIN}/login/login-redirect' redirect_url = f'https://{self._ie._DOMAIN}/login/login-redirect'
@ -327,7 +325,7 @@ def random_str():
self._ie.report_warning('Unable to log in: Unknown login status') self._ie.report_warning('Unable to log in: Unknown login status')
return return
code = traverse_obj(parse_qs(urlh.url), ('code', 0)) code = parse_qs(urlh.url)['code'][0]
token_json = self._ie._download_json( token_json = self._ie._download_json(
token_url, None, headers={'Auth0-Client': auth0_client}, token_url, None, headers={'Auth0-Client': auth0_client},
@ -340,8 +338,8 @@ def random_str():
'redirect_uri': redirect_url, 'redirect_uri': redirect_url,
})) }))
access_token = token_json.get('access_token') access_token = token_json['access_token']
refresh_token = token_json.get('refresh_token') refresh_token = token_json['refresh_token']
auth_token = f'Bearer {access_token}' auth_token = f'Bearer {access_token}'