fix merge)
This commit is contained in:
commit
ff67ec4cdc
1 changed files with 4 additions and 0 deletions
|
|
@ -25,11 +25,15 @@ def signup():
|
||||||
@auth_bp.route("/login", methods=["POST"])
|
@auth_bp.route("/login", methods=["POST"])
|
||||||
def login():
|
def login():
|
||||||
data = request.get_json()
|
data = request.get_json()
|
||||||
|
<<<<<<< HEAD
|
||||||
username = data.get("username")
|
username = data.get("username")
|
||||||
password = data.get("password")
|
password = data.get("password")
|
||||||
|
|
||||||
print(f"Login attempt: username={username}, password={password}")
|
print(f"Login attempt: username={username}, password={password}")
|
||||||
|
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> 3ab162d8b88a23ad1d0ef5f72a3162bdd7f75ca8
|
||||||
try:
|
try:
|
||||||
user = user_service.verify_user(username, password)
|
user = user_service.verify_user(username, password)
|
||||||
session["user_id"] = user.id
|
session["user_id"] = user.id
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue