fixes
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
from uuid import UUID
|
||||
|
||||
from sqlalchemy import and_, not_, select
|
||||
from sqlalchemy.exc import NoResultFound
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from src.errors.http_errors.errors import Errors
|
||||
@@ -37,33 +36,33 @@ class JwtCrudActions:
|
||||
with self.Session() as session: # noqa: SIM117
|
||||
with session.begin():
|
||||
new_token=RefreshTokens(**data)
|
||||
response=session.add(new_token)
|
||||
return response
|
||||
session.add(new_token)
|
||||
|
||||
def update_token(self, old_jti:UUID, new_jti:UUID)->bool:
|
||||
with self.Session() as session: # noqa: SIM117
|
||||
with session.begin():
|
||||
query=select(RefreshTokens).where(RefreshTokens.id==old_jti)
|
||||
response=session.scalars(query).one()
|
||||
response.is_revoked=True
|
||||
response.replaced_by=new_jti
|
||||
return True
|
||||
response = session.scalars(query).one_or_none()
|
||||
if response is None:
|
||||
return False
|
||||
else:
|
||||
response.is_revoked=True
|
||||
response.replaced_by=new_jti
|
||||
return True
|
||||
|
||||
def create_and_update_token(self,data:dict, old_jti:UUID, new_jti:UUID)->bool:
|
||||
with self.Session() as session: #noqa:SIM117
|
||||
with session.begin():
|
||||
new_token=RefreshTokens(**data)
|
||||
session.add(new_token)
|
||||
query=select(RefreshTokens).where(RefreshTokens.id==old_jti)
|
||||
|
||||
try:
|
||||
response = session.scalars(query).one()
|
||||
except NoResultFound as e:
|
||||
raise self.error.not_found_error(detail="Token not found") from e
|
||||
|
||||
response.is_revoked=True
|
||||
response.replaced_by=new_jti
|
||||
return True
|
||||
response = session.scalars(query).one_or_none()
|
||||
if response is None:
|
||||
return False
|
||||
else:
|
||||
session.add(new_token)
|
||||
response.is_revoked=True
|
||||
response.replaced_by=new_jti
|
||||
return True
|
||||
|
||||
|
||||
def revoke_all(self, user_id:UUID)->bool:
|
||||
|
||||
Reference in New Issue
Block a user