StarrySkyWorld commited on
Commit
c7f27a3
·
1 Parent(s): 2f7aeb5

fix: fix Profiles load error

Browse files
Files changed (1) hide show
  1. services/token_service.py +7 -2
services/token_service.py CHANGED
@@ -28,12 +28,14 @@ class TokenInfo:
28
  """Информация о токене"""
29
  path: Path
30
  account_name: str
 
31
  provider: str
32
  auth_method: str
33
  region: str
34
  expires_at: Optional[datetime]
35
  is_expired: bool
36
  has_refresh_token: bool
 
37
 
38
  # Raw data
39
  raw_data: Dict[str, Any] = None
@@ -381,15 +383,18 @@ class TokenService:
381
  except:
382
  pass
383
 
 
384
  return TokenInfo(
385
  path=path,
386
  account_name=data.get('accountName', path.stem),
 
387
  provider=data.get('provider', 'Unknown'),
388
  auth_method=data.get('authMethod', 'Unknown'),
389
  region=data.get('region', 'us-east-1'),
390
  expires_at=expires_at,
391
  is_expired=is_expired,
392
- has_refresh_token=bool(data.get('refreshToken')),
 
393
  raw_data=data
394
  )
395
  except Exception:
@@ -410,4 +415,4 @@ class TokenService:
410
  return refreshable[0]
411
 
412
  # Любой
413
- return tokens[0] if tokens else None
 
28
  """Информация о токене"""
29
  path: Path
30
  account_name: str
31
+ email: Optional[str]
32
  provider: str
33
  auth_method: str
34
  region: str
35
  expires_at: Optional[datetime]
36
  is_expired: bool
37
  has_refresh_token: bool
38
+ needs_refresh: bool
39
 
40
  # Raw data
41
  raw_data: Dict[str, Any] = None
 
383
  except:
384
  pass
385
 
386
+ has_refresh = bool(data.get('refreshToken'))
387
  return TokenInfo(
388
  path=path,
389
  account_name=data.get('accountName', path.stem),
390
+ email=data.get('email') or data.get('accountEmail') or data.get('userEmail'),
391
  provider=data.get('provider', 'Unknown'),
392
  auth_method=data.get('authMethod', 'Unknown'),
393
  region=data.get('region', 'us-east-1'),
394
  expires_at=expires_at,
395
  is_expired=is_expired,
396
+ has_refresh_token=has_refresh,
397
+ needs_refresh=bool(is_expired and has_refresh),
398
  raw_data=data
399
  )
400
  except Exception:
 
415
  return refreshable[0]
416
 
417
  # Любой
418
+ return tokens[0] if tokens else None