Skip to content

Commit 85bd0ad

Browse files
committed
Removed non-json user_login()
1 parent 2c8d5df commit 85bd0ad

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

src/server/api/user_api.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -67,40 +67,6 @@ def user_test_fail():
6767
return jsonify("Here's your failure"), 401
6868

6969

70-
@user_api.route("/api/user/login", methods=["POST"])
71-
def user_login():
72-
""" Validate user in db, return JWT if legit and active.
73-
Expects non-json form data
74-
"""
75-
76-
with engine.connect() as connection:
77-
78-
pwhash = None
79-
s = text(
80-
"""select password, pdp_user_roles.role, active
81-
from pdp_users
82-
left join pdp_user_roles on pdp_users.role = pdp_user_roles._id
83-
where username=:u """
84-
)
85-
s = s.bindparams(u=request.form["username"])
86-
result = connection.execute(s)
87-
88-
if result.rowcount: # Did we get a match on username?
89-
pwhash, role, is_active = result.fetchone()
90-
else:
91-
log_user_action(request.form["username"], "Failure", "Invalid username")
92-
return jsonify("Bad credentials"), 401
93-
94-
if is_active.lower() == "y" and check_password(request.form["password"], pwhash):
95-
# Yes, user is active and password matches
96-
token = jwt_ops.create_token(request.form["username"], role)
97-
log_user_action(request.form["username"], "Success", "Logged in")
98-
return token
99-
100-
else:
101-
log_user_action(request.form["username"], "Failure", "Bad password or inactive")
102-
return jsonify("Bad credentials"), 401
103-
10470

10571
@user_api.route("/api/user/login_json", methods=["POST"])
10672
def user_login_json():

0 commit comments

Comments
 (0)