|
@@ -129,12 +129,16 @@ class AuthsTable:
|
|
|
|
|
|
def authenticate_user(self, email: str, password: str) -> Optional[UserModel]:
|
|
|
log.info(f"authenticate_user: {email}")
|
|
|
+
|
|
|
+ user = Users.get_user_by_email(email)
|
|
|
+ if not user:
|
|
|
+ return None
|
|
|
+
|
|
|
try:
|
|
|
with get_db() as db:
|
|
|
- auth = db.query(Auth).filter_by(email=email, active=True).first()
|
|
|
+ auth = db.query(Auth).filter_by(id=user.id, active=True).first()
|
|
|
if auth:
|
|
|
if verify_password(password, auth.password):
|
|
|
- user = Users.get_user_by_id(auth.id)
|
|
|
return user
|
|
|
else:
|
|
|
return None
|