discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

fix signIn

Browse Source
This commit is contained in:
knst-kotov 2021-10-24 17:13:32 +03:00
parent 2d74842d9a
commit 0d87f52d3a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auth/identity.py
View File

@ -9,12 +9,8 @@ from sqlalchemy import or_
class Identity: class Identity:
@staticmethod @staticmethod
def identity(user_id: int, password: str) -> User: def identity(orm_user: OrmUser, password: str) -> User:
with local_session() as session: user = User(**orm_user.dict())
user = session.query(OrmUser).filter_by(id=user_id).first()
if not user:
raise ObjectNotExist("User does not exist")
user = User(**user.dict())
if user.password is None: if user.password is None:
raise InvalidPassword("Wrong user password") raise InvalidPassword("Wrong user password")
if not Password.verify(password, user.password): if not Password.verify(password, user.password):

4
resolvers/auth.py
View File

@ -66,12 +66,12 @@ async def login(_, info: GraphQLResolveInfo, email: str, password: str = ""):
auto_delete = False if device == "mobile" else True # why autodelete with mobile? auto_delete = False if device == "mobile" else True # why autodelete with mobile?
try: try:
user = Identity.identity(user_id=orm_user.id, password=password) user = Identity.identity(orm_user, password)
except InvalidPassword: except InvalidPassword:
return {"error" : "invalid password"} return {"error" : "invalid password"}
token = await Authorize.authorize(user, device=device, auto_delete=auto_delete) token = await Authorize.authorize(user, device=device, auto_delete=auto_delete)
return {"token" : token, "user": user} return {"token" : token, "user": orm_user}
@query.field("signOut") @query.field("signOut")