format and login exception
This commit is contained in:
@@ -23,9 +23,9 @@ class AuthService(BaseService):
|
||||
access_token = AuthManager.create_access_token(user_data.model_dump())
|
||||
refresh_token = AuthManager.create_refresh_token()
|
||||
await self.session.auth.create_one({
|
||||
"token": refresh_token,
|
||||
"token": refresh_token,
|
||||
"user_id": user_data.id,
|
||||
"fingerprint": fingerprint
|
||||
"fingerprint": fingerprint,
|
||||
})
|
||||
return {
|
||||
"access_token": access_token,
|
||||
@@ -34,28 +34,27 @@ class AuthService(BaseService):
|
||||
}
|
||||
|
||||
async def login(self, username: str, password: str, fingerprint: str) -> dict:
|
||||
login_exception = HTTPException(
|
||||
status_code=401,
|
||||
detail="Incorrect username or password",
|
||||
)
|
||||
result = await self.session.user.get_one_or_none(username=username)
|
||||
if result is None:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Incorrect username or password",
|
||||
)
|
||||
raise login_exception
|
||||
user = UserWithHashedPass.model_validate(result)
|
||||
token_data = TokenData.model_validate(user.model_dump())
|
||||
verify = AuthManager.verify_password(
|
||||
plain_password=password, hashed_password=user.hashed_password
|
||||
)
|
||||
if not verify or user.is_active is False:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Incorrect username or password",
|
||||
)
|
||||
raise login_exception
|
||||
tokens = await self._tokens_create(token_data, fingerprint)
|
||||
await self.session.commit()
|
||||
print(tokens)
|
||||
return tokens
|
||||
|
||||
async def refresh_tokens(self, refresh_token: str, user_data: TokenData, fingerprint: str) -> dict:
|
||||
async def refresh_tokens(
|
||||
self, refresh_token: str, user_data: TokenData, fingerprint: str
|
||||
) -> dict:
|
||||
token_record = await self.session.auth.get_one_or_none(token=refresh_token)
|
||||
if not token_record or token_record.user_id != user_data.id:
|
||||
raise HTTPException(status_code=401, detail="Invalid refresh token")
|
||||
@@ -63,7 +62,7 @@ class AuthService(BaseService):
|
||||
await self.session.auth.delete_one(token=refresh_token)
|
||||
await self.session.commit()
|
||||
return token
|
||||
|
||||
|
||||
async def delete_token(self, token: str) -> None:
|
||||
await self.session.auth.delete_one(token=token)
|
||||
await self.session.commit()
|
||||
|
||||
Reference in New Issue
Block a user