darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-29 22:50:40 +01:00
parent 3e16fc1962
commit 644336b151
16 changed files with 91 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/two_factor.py
View File

@@ -9,8 +9,9 @@ from flask import (
from flask_login import login_user, current_user
from app.main import main
from app.main.dao import users_dao, services_dao
from app.main.dao import users_dao
from app.main.forms import TwoFactorForm
from app import service_api_client
@main.route('/two-factor', methods=['GET', 'POST'])
@@ -29,7 +30,7 @@ def two_factor():
if form.validate_on_submit():
try:
user = users_dao.get_user_by_id(user_id)
services = services_dao.get_services(user_id).get('data', [])
services = service_api_client.get_services({'user_id': str(user_id)}).get('data', [])
# Check if coming from new password page
if 'password' in session['user_details']:
user.set_password(session['user_details']['password'])