darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 01:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for forgotten password.

Browse Source
This commit is contained in:
Nicholas Staples
2016-02-11 15:59:28 +00:00
parent 48368584d9
commit dbdd689f8d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/new_password.py
View File

@@ -1,4 +1,4 @@
from flask import (render_template, url_for, redirect, flash) from flask import (render_template, url_for, redirect, flash, session)
from app.main import main from app.main import main
from app.main.dao import users_dao from app.main.dao import users_dao
@@ -26,6 +26,7 @@ def new_password(token):
'id': user.id, 'id': user.id,
'email': user.email_address, 'email': user.email_address,
'password': form.new_password.data} 'password': form.new_password.data}
users_dao.activate_user(user)
return redirect(url_for('main.two_factor')) return redirect(url_for('main.two_factor'))
else: else:
return render_template('views/new-password.html', token=token, form=form, user=user) return render_template('views/new-password.html', token=token, form=form, user=user)

2
app/main/views/sign_in.py
View File

@@ -36,6 +36,8 @@ def sign_in():
def _get_and_verify_user(user, password): def _get_and_verify_user(user, password):
print(user.serialize())
print(password)
if not user: if not user:
return None return None
elif user.is_locked(): elif user.is_locked():