From 69225d60f63f6dc695da9bb9aa5171d0188f0bbe Mon Sep 17 00:00:00 2001 From: Divit Singh Date: Mon, 11 Jan 2016 01:38:36 -0500 Subject: [PATCH] Fixed Adityas request of pw reset error log. --- graphs/static/graphs/js/reset.js | 1 + graphs/util/db.py | 7 ++++--- graphs/views.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/graphs/static/graphs/js/reset.js b/graphs/static/graphs/js/reset.js index e2f9bc8d..d8925e15 100644 --- a/graphs/static/graphs/js/reset.js +++ b/graphs/static/graphs/js/reset.js @@ -24,6 +24,7 @@ $(document).ready(function() { }, function(data) { if (data.Error) { + console.log(data); return alert(data.Error); } else { alert("Password Updated!"); diff --git a/graphs/util/db.py b/graphs/util/db.py index 4a19cd47..c8f01991 100644 --- a/graphs/util/db.py +++ b/graphs/util/db.py @@ -191,12 +191,13 @@ def resetPassword(username, password): # Hash password password = bcrypt.hashpw(password, bcrypt.gensalt()) # Update the password for the user (after encryption of course) - user_to_reset_pw_for = db_session.query(models.User).filter(models.User.user_id == username).one() + user_to_reset_pw_for = db_session.query(models.User).filter(models.User.user_id == username).first() user_to_reset_pw_for.password = password # Remove user's account from password_reset table - delete_from_password_reset = db_session.query(models.PasswordReset).filter(models.PasswordReset.user_id == username).one() - db_session.delete(delete_from_password_reset) + delete_from_password_reset = db_session.query(models.PasswordReset).filter(models.PasswordReset.user_id == username).all() + for acct in delete_from_password_reset: + db_session.delete(acct) db_session.commit() db_session.close() return "Password updated successfully" diff --git a/graphs/views.py b/graphs/views.py index 9b59e279..8d82ff07 100644 --- a/graphs/views.py +++ b/graphs/views.py @@ -884,7 +884,6 @@ def resetLink(request): return render(request, 'graphs/error.html', context) context = {"email": email, "url": URL_PATH} - return render(request, 'graphs/reset.html', context) def resetPassword(request): @@ -899,6 +898,7 @@ def resetPassword(request): ''' resetInfo = db.resetPassword(request.POST['email'], request.POST['password']) + print resetInfo if resetInfo == None: return HttpResponse(json.dumps(db.throwError(500, "Password Update not successful!")), content_type="application/json");