|
@@ -169,8 +169,9 @@ async def login_for_access_token(request: Request, form_data: OAuth2PasswordRequ
|
|
|
table = db['users']
|
|
|
user.token = access_token
|
|
|
table.update(dict(user), ['username'])
|
|
|
- access_token = Authorize.create_access_token(subject=user.username)
|
|
|
- refresh_token = Authorize.create_refresh_token(subject=user.username)
|
|
|
+ expires = timedelta(days=ACCESS_TOKEN_EXPIRE_DAYS)
|
|
|
+ access_token = Authorize.create_access_token(subject=user.username, expires_time=expires)
|
|
|
+ refresh_token = Authorize.create_refresh_token(subject=user.username, expires_time =expires)
|
|
|
Authorize.set_access_cookies(access_token)
|
|
|
Authorize.set_refresh_cookies(refresh_token)
|
|
|
#return templates.TemplateResponse("index.html", {"request": request, "msg": 'Login'})
|
|
@@ -481,10 +482,10 @@ def authenticate_user(username: str, password: str):
|
|
|
return False
|
|
|
return user
|
|
|
|
|
|
-def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
|
|
|
+def create_access_token(data: dict, expires_delta):
|
|
|
to_encode = data.copy()
|
|
|
- if expires_delta:
|
|
|
- expire = datetime.utcnow() + expires_delta
|
|
|
+
|
|
|
+ expire = datetime.utcnow() + expires_delta
|
|
|
to_encode.update({"exp": expire})
|
|
|
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
|
|
return encoded_jwt
|