@@ -67,40 +67,6 @@ def user_test_fail():
67
67
return jsonify ("Here's your failure" ), 401
68
68
69
69
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
-
104
70
105
71
@user_api .route ("/api/user/login_json" , methods = ["POST" ])
106
72
def user_login_json ():
0 commit comments