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

auth fixes

Browse Source
This commit is contained in:
knst-kotov
2021-07-14 14:45:31 +00:00
parent 6c9337be4c
commit d304362684
5 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
auth/identity.py
View File

@@ -4,6 +4,8 @@ from orm import User as OrmUser
from orm.base import global_session
from auth.validations import User
from sqlalchemy import or_
class Identity:
@staticmethod
@@ -12,14 +14,22 @@ class Identity:
if not user:
raise ObjectNotExist("User does not exist")
user = User(**user.dict())
if user.password is None:
raise InvalidPassword("Wrong user password")
if not Password.verify(password, user.password):
raise InvalidPassword("Wrong user password")
return user
@staticmethod
def identity_oauth(oauth_id, input) -> User:
user = global_session.query(OrmUser).filter_by(oauth_id=oauth_id).first()
def identity_oauth(input) -> User:
user = global_session.query(OrmUser).filter(
or_(OrmUser.oauth_id == input["oauth_id"], OrmUser.email == input["email"])
).first()
if not user:
user = OrmUser.create(**input)
if not user.oauth_id:
user.oauth_id = input["oauth_id"]
global_session.commit()
user = User(**user.dict())
return user