feat: front end for login
This commit was merged in pull request #5.
This commit is contained in:
+7
-3
@@ -31,10 +31,10 @@ def delete_item(db: Session, item_id: int):
|
||||
|
||||
|
||||
def authenticate_user(db: Session, username: str, password: str):
|
||||
user = get_user_by_username(db, username)
|
||||
user = get_user_by_username(db, username) or get_user_by_email(db, username)
|
||||
if not user:
|
||||
return None
|
||||
if not verify_password(password, str(user.hashed_password)):
|
||||
if not verify_password(password, user.hashed_password):
|
||||
return None
|
||||
return user
|
||||
|
||||
@@ -50,7 +50,11 @@ def get_user_by_email(db: Session, email: str):
|
||||
def create_user(db: Session, user: schemas.UserCreate):
|
||||
hashed_pw = hash_password(user.password)
|
||||
db_user = models.User(
|
||||
username=user.username, email=user.email, hashed_password=hashed_pw
|
||||
username=user.username,
|
||||
email=user.email,
|
||||
hashed_password=hashed_pw,
|
||||
permissions=user.permissions,
|
||||
subscriber=user.subscriber,
|
||||
)
|
||||
db.add(db_user)
|
||||
db.commit()
|
||||
|
||||
Reference in New Issue
Block a user