1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-08 22:38:33 +00:00

rename _is_jwt_token_expired to _jwt_is_expired

This commit is contained in:
Michaël De Boey 2025-03-16 23:15:55 +01:00
parent 0242090a86
commit 5ffedda327
No known key found for this signature in database
11 changed files with 20 additions and 20 deletions

View File

@ -653,7 +653,7 @@ def _perform_login(self, username, password):
raise raise
def _fetch_access_token(self): def _fetch_access_token(self):
if self._is_jwt_token_expired(self._access_token): if self._jwt_is_expired(self._access_token):
try: try:
self._call_oauth_api({ self._call_oauth_api({
'grant_type': 'refresh_token', 'grant_type': 'refresh_token',
@ -671,7 +671,7 @@ def _fetch_claims_token(self):
if not self._get_login_info()[0]: if not self._get_login_info()[0]:
return None return None
if not self._claims_token or self._is_jwt_token_expired(self._claims_token): if not self._claims_token or self._jwt_is_expired(self._claims_token):
self._claims_token = self._download_json( self._claims_token = self._download_json(
'https://services.radio-canada.ca/ott/subscription/v2/gem/Subscriber/profile', 'https://services.radio-canada.ca/ott/subscription/v2/gem/Subscriber/profile',
None, 'Downloading claims token', query={'device': 'web'}, None, 'Downloading claims token', query={'device': 'web'},

View File

@ -996,7 +996,7 @@ def _guess_encoding_from_content(content_type, webpage_bytes):
return encoding return encoding
@staticmethod @staticmethod
def _is_jwt_token_expired(token): def _jwt_is_expired(token):
return jwt_decode_hs256(token)['exp'] - time.time() < 300 return jwt_decode_hs256(token)['exp'] - time.time() < 300
def __check_blocked(self, content): def __check_blocked(self, content):

View File

@ -86,7 +86,7 @@ class DigitalConcertHallIE(InfoExtractor):
@property @property
def _access_token_is_expired(self): def _access_token_is_expired(self):
return self._is_jwt_token_expired(self._access_token) return self._jwt_is_expired(self._access_token)
def _set_access_token(self, value): def _set_access_token(self, value):
self._access_token = value self._access_token = value

View File

@ -22,7 +22,7 @@ class IwaraBaseIE(InfoExtractor):
def _is_token_expired(self, token, token_type): def _is_token_expired(self, token, token_type):
# User token TTL == ~3 weeks, Media token TTL == ~1 hour # User token TTL == ~3 weeks, Media token TTL == ~1 hour
if self._is_jwt_token_expired(token): if self._jwt_is_expired(token):
self.to_screen(f'{token_type} token has expired') self.to_screen(f'{token_type} token has expired')
return True return True

View File

@ -106,7 +106,7 @@ def _call_login_api(self, endpoint, guest_token, data, note):
})}, data=data) })}, data=data)
def _perform_login(self, username, password): def _perform_login(self, username, password):
if self._ACCESS_TOKEN and not self._is_jwt_token_expired(self._ACCESS_TOKEN): if self._ACCESS_TOKEN and not self._jwt_is_expired(self._ACCESS_TOKEN):
return return
UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}' UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
@ -181,7 +181,7 @@ def _perform_login(self, username, password):
if JioCinemaBaseIE._REFRESH_TOKEN: if JioCinemaBaseIE._REFRESH_TOKEN:
self._cache_token('access') self._cache_token('access')
self.to_screen(f'Logging in as device ID "{JioCinemaBaseIE._DEVICE_ID}"') self.to_screen(f'Logging in as device ID "{JioCinemaBaseIE._DEVICE_ID}"')
if self._is_jwt_token_expired(JioCinemaBaseIE._ACCESS_TOKEN): if self._jwt_is_expired(JioCinemaBaseIE._ACCESS_TOKEN):
self._refresh_token() self._refresh_token()
@ -246,9 +246,9 @@ def _extract_formats_and_subtitles(self, playback, video_id):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
if not self._ACCESS_TOKEN and self._is_jwt_token_expired(self._GUEST_TOKEN): if not self._ACCESS_TOKEN and self._jwt_is_expired(self._GUEST_TOKEN):
self._fetch_guest_token() self._fetch_guest_token()
elif self._ACCESS_TOKEN and self._is_jwt_token_expired(self._ACCESS_TOKEN): elif self._ACCESS_TOKEN and self._jwt_is_expired(self._ACCESS_TOKEN):
self._refresh_token() self._refresh_token()
playback = self._call_api( playback = self._call_api(

View File

@ -351,7 +351,7 @@ class MLBTVIE(InfoExtractor):
@property @property
def _api_headers(self): def _api_headers(self):
if self._is_jwt_token_expired(self._access_token): if self._jwt_is_expired(self._access_token):
self.write_debug('Access token has expired; re-logging in') self.write_debug('Access token has expired; re-logging in')
self._perform_login(*self._get_login_info()) self._perform_login(*self._get_login_info())
return {'Authorization': f'Bearer {self._access_token}'} return {'Authorization': f'Bearer {self._access_token}'}

View File

@ -114,7 +114,7 @@ def _real_initialize(self):
self.raise_login_required() self.raise_login_required()
def _get_auth(self): def _get_auth(self):
if self._is_jwt_token_expired(self._access_token): if self._jwt_is_expired(self._access_token):
if not self._refresh_token: if not self._refresh_token:
raise ExtractorError( raise ExtractorError(
'Cannot refresh access token, login with yt-dlp or refresh cookies in browser') 'Cannot refresh access token, login with yt-dlp or refresh cookies in browser')

View File

@ -20,7 +20,7 @@ class StacommuBaseIE(WrestleUniverseBaseIE):
@WrestleUniverseBaseIE._TOKEN.getter @WrestleUniverseBaseIE._TOKEN.getter
def _TOKEN(self): def _TOKEN(self):
if self._REAL_TOKEN and self._is_jwt_token_expired(self._REAL_TOKEN): if self._REAL_TOKEN and self._jwt_is_expired(self._REAL_TOKEN):
self._refresh_token() self._refresh_token()
return self._REAL_TOKEN return self._REAL_TOKEN

View File

@ -272,15 +272,15 @@ def _fetch_tokens(self):
access_token = self._get_vrt_cookie(self._ACCESS_TOKEN_COOKIE_NAME) access_token = self._get_vrt_cookie(self._ACCESS_TOKEN_COOKIE_NAME)
video_token = self._get_vrt_cookie(self._VIDEO_TOKEN_COOKIE_NAME) video_token = self._get_vrt_cookie(self._VIDEO_TOKEN_COOKIE_NAME)
if (access_token and not self._is_jwt_token_expired(access_token) if (access_token and not self._jwt_is_expired(access_token)
and video_token and not self._is_jwt_token_expired(video_token)): and video_token and not self._jwt_is_expired(video_token)):
return access_token, video_token return access_token, video_token
if has_credentials: if has_credentials:
access_token, video_token = self.cache.load(self._NETRC_MACHINE, 'token_data', default=(None, None)) access_token, video_token = self.cache.load(self._NETRC_MACHINE, 'token_data', default=(None, None))
if (access_token and not self._is_jwt_token_expired(access_token) if (access_token and not self._jwt_is_expired(access_token)
and video_token and not self._is_jwt_token_expired(video_token)): and video_token and not self._jwt_is_expired(video_token)):
self.write_debug('Restored tokens from cache') self.write_debug('Restored tokens from cache')
self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._ACCESS_TOKEN_COOKIE_NAME, access_token) self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._ACCESS_TOKEN_COOKIE_NAME, access_token)
self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._VIDEO_TOKEN_COOKIE_NAME, video_token) self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._VIDEO_TOKEN_COOKIE_NAME, video_token)
@ -317,12 +317,12 @@ def _get_vrt_cookie(self, cookie_name):
def _perform_login(self, username, password): def _perform_login(self, username, password):
refresh_token = self._get_vrt_cookie(self._REFRESH_TOKEN_COOKIE_NAME) refresh_token = self._get_vrt_cookie(self._REFRESH_TOKEN_COOKIE_NAME)
if refresh_token and not self._is_jwt_token_expired(refresh_token): if refresh_token and not self._jwt_is_expired(refresh_token):
self.write_debug('Using refresh token from logged-in cookies; skipping login with credentials') self.write_debug('Using refresh token from logged-in cookies; skipping login with credentials')
return return
refresh_token = self.cache.load(self._NETRC_MACHINE, 'refresh_token', default=None) refresh_token = self.cache.load(self._NETRC_MACHINE, 'refresh_token', default=None)
if refresh_token and not self._is_jwt_token_expired(refresh_token): if refresh_token and not self._jwt_is_expired(refresh_token):
self.write_debug('Restored refresh token from cache') self.write_debug('Restored refresh token from cache')
self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._REFRESH_TOKEN_COOKIE_NAME, refresh_token, path='/vrtmax/sso') self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._REFRESH_TOKEN_COOKIE_NAME, refresh_token, path='/vrtmax/sso')
return return

View File

@ -43,7 +43,7 @@ def _TOKEN(self):
self.raise_login_required() self.raise_login_required()
self._TOKEN = token self._TOKEN = token
if not self._REAL_TOKEN or self._is_jwt_token_expired(self._REAL_TOKEN): if not self._REAL_TOKEN or self._jwt_is_expired(self._REAL_TOKEN):
if not self._REFRESH_TOKEN: if not self._REFRESH_TOKEN:
raise ExtractorError( raise ExtractorError(
'Expired token. Refresh your cookies in browser and try again', expected=True) 'Expired token. Refresh your cookies in browser and try again', expected=True)

View File

@ -123,7 +123,7 @@ def _perform_login(self, username, password):
else: else:
raise ExtractorError(self._LOGIN_HINT, expected=True) raise ExtractorError(self._LOGIN_HINT, expected=True)
if self._is_jwt_token_expired(self._USER_TOKEN): if self._jwt_is_expired(self._USER_TOKEN):
raise ExtractorError('User token has expired', expected=True) raise ExtractorError('User token has expired', expected=True)
self._USER_COUNTRY = jwt_decode_hs256(self._USER_TOKEN).get('current_country') self._USER_COUNTRY = jwt_decode_hs256(self._USER_TOKEN).get('current_country')