mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-05-19 17:35:43 -05:00
Code Activity

refactor: refresh token logic

Browse source
This commit is contained in:
ChocoLZS 2025-01-30 16:30:35 +08:00
parent a9fe89e291
commit 346653488d
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
yt_dlp/extractor/sheeta.py
View file

@ -1,4 +1,5 @@
import base64 import base64
import enum
import functools import functools
import hashlib import hashlib
import json import json
@ -25,6 +26,11 @@
from ..utils.traversal import traverse_obj from ..utils.traversal import traverse_obj
class AuthType(enum.Enum):
AUTH0 = 'auth0'
NICONICO = 'niconico'
class AuthManager: class AuthManager:
_AUTH_INFO_CACHE = {} _AUTH_INFO_CACHE = {}
_AUTH0_BASE64_TRANS = str.maketrans({ _AUTH0_BASE64_TRANS = str.maketrans({
@ -79,11 +85,17 @@ def _get_auth_token(self):
return None return None
def _refresh_token(self): def _refresh_token(self):
if not (refresh_func := self._auth_info.get('refresh_func')): if not (refresh_func_params := self._auth_info.get('refresh_func_params')):
return False return False
if self._auth_info.get('auth_type') == AuthType.AUTH0:
refresh_func_params['data'] = urlencode_postdata({
**refresh_func_params['data'],
'refresh_token': self._auth_info.get('refresh_token'),
})
res = self._ie._download_json( res = self._ie._download_json(
**refresh_func(self._auth_info), expected_status=(400, 403, 404), **refresh_func_params, expected_status=(400, 403, 404),
note='Refreshing token', errnote='Unable to refresh token') note='Refreshing token', errnote='Unable to refresh token')
if error := traverse_obj( if error := traverse_obj(
res, ('error', 'message', {lambda x: base64.b64decode(x).decode()}), ('error', 'message')): res, ('error', 'message', {lambda x: base64.b64decode(x).decode()}), ('error', 'message')):
@ -127,7 +139,7 @@ def _login(self):
return self._auth0_login() return self._auth0_login()
def _niconico_sns_login(self, redirect_url, refresh_url): def _niconico_sns_login(self, redirect_url, refresh_url):
self._auth_info = {'login_method': 'any'} self._auth_info = {'login_method': 'any', 'auth_type': AuthType.NICONICO}
mail_tel, password = self._ie._get_login_info() mail_tel, password = self._ie._get_login_info()
if not mail_tel: if not mail_tel:
return return
@ -153,13 +165,12 @@ def _niconico_sns_login(self, redirect_url, refresh_url):
return return
self._auth_info = { self._auth_info = {
'refresh_func': lambda data: { 'refresh_func_params': {
'url_or_request': data['refresh_url'], 'url_or_request': refresh_url,
'video_id': None, 'video_id': None,
'headers': {'Authorization': data['auth_token']}, 'headers': {'Authorization': auth_token},
'data': b'', 'data': b'',
}, },
'refresh_url': refresh_url,
'auth_token': auth_token, 'auth_token': auth_token,
} }
@ -235,7 +246,7 @@ def _niconico_login(self, mail_tel, password):
return True return True
def _auth0_login(self): def _auth0_login(self):
self._auth_info = {'login_method': 'password'} self._auth_info = {'login_method': 'password', 'auth_type': AuthType.AUTH0}
username, password = self._ie._get_login_info() username, password = self._ie._get_login_info()
if not username: if not username:
return return
@ -260,17 +271,15 @@ def _auth0_login(self):
'version': '2.0.6', 'version': '2.0.6',
}).encode()).decode() }).encode()).decode()
self._auth_info = {'refresh_func': lambda data: { self._auth_info = {'refresh_func_params': {
'url_or_request': token_url, 'url_or_request': token_url,
'video_id': None, 'video_id': None,
'headers': {'Auth0-Client': auth0_client}, 'headers': {'Auth0-Client': auth0_client},
'data': urlencode_postdata({ 'data': {
'client_id': auth0_web_client_id, 'client_id': auth0_web_client_id,
'grant_type': 'refresh_token', 'grant_type': 'refresh_token',
'refresh_token': data['refresh_token'],
'redirect_uri': redirect_url, 'redirect_uri': redirect_url,
}), }}}
}}
def random_str(): def random_str():
return ''.join(random.choices(string.digits + string.ascii_letters, k=43)) return ''.join(random.choices(string.digits + string.ascii_letters, k=43))