Feature/new-login-page (#989)

* login page refresh

* use user_id for token identification
This commit is contained in:
Hayden
2022-02-22 11:36:58 -09:00
committed by GitHub
parent 684f39fe24
commit 177a430d8c
5 changed files with 103 additions and 179 deletions

View File

@@ -48,10 +48,7 @@ class MealieAuthToken(BaseModel):
@public_router.post("/token")
def get_token(
data: CustomOAuth2Form = Depends(),
session: Session = Depends(generate_session),
):
def get_token(data: CustomOAuth2Form = Depends(), session: Session = Depends(generate_session)):
email = data.username
password = data.password
@@ -64,12 +61,12 @@ def get_token(
)
duration = timedelta(days=14) if data.remember_me else None
access_token = security.create_access_token(dict(sub=user.email), duration)
access_token = security.create_access_token(dict(sub=str(user.id)), duration)
return MealieAuthToken.respond(access_token)
@user_router.get("/refresh")
async def refresh_token(current_user: PrivateUser = Depends(get_current_user)):
"""Use a valid token to get another token"""
access_token = security.create_access_token(data=dict(sub=current_user.email))
access_token = security.create_access_token(data=dict(sub=str(current_user.id)))
return MealieAuthToken.respond(access_token)

View File

@@ -66,7 +66,7 @@ class UserController(BaseUserController):
self.repos.users.update(item_id, new_data.dict())
if self.user.id == item_id:
access_token = security.create_access_token(data=dict(sub=new_data.email))
access_token = security.create_access_token(data=dict(sub=str(self.user.id)))
return {"access_token": access_token, "token_type": "bearer"}
@user_router.put("/{item_id}/password")