From dbdd689f8d9275fd0a3daf4c8c93734e70805c31 Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Thu, 11 Feb 2016 15:59:28 +0000 Subject: [PATCH] Fix for forgotten password. --- app/main/views/new_password.py | 3 ++- app/main/views/sign_in.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/main/views/new_password.py b/app/main/views/new_password.py index aeed71e13..23cd5c981 100644 --- a/app/main/views/new_password.py +++ b/app/main/views/new_password.py @@ -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.dao import users_dao @@ -26,6 +26,7 @@ def new_password(token): 'id': user.id, 'email': user.email_address, 'password': form.new_password.data} + users_dao.activate_user(user) return redirect(url_for('main.two_factor')) else: return render_template('views/new-password.html', token=token, form=form, user=user) diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index 376451cd9..5bab808a0 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -36,6 +36,8 @@ def sign_in(): def _get_and_verify_user(user, password): + print(user.serialize()) + print(password) if not user: return None elif user.is_locked():