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

Merge conflicts with master.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-05 17:24:13 +00:00
parent 4fcc4efea2 e1c2ba034d
commit ecc3485d72
7 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/main/views/verify.py
View File

@@ -1,5 +1,6 @@
from flask import (
render_template, redirect, jsonify, session, url_for)
from flask_login import login_user
from app.main import main
@@ -10,16 +11,13 @@ from app.main.forms import VerifyForm
@main.route('/verify', methods=['GET', 'POST'])
def verify():
# TODO there needs to be a way to regenerate a session id
try:
user = users_dao.get_user_by_id(session['user_id'])
form = VerifyForm()
if form.validate_on_submit():
verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='email')
verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
users_dao.activate_user(user.id)
login_user(user)
return redirect(url_for('.add_service'))
return render_template('views/verify.html', form=form)
except:
import traceback
traceback.print_exc()
# or handle gracefully.
user = users_dao.get_user_by_id(session['user_id'])
form = VerifyForm()
if form.validate_on_submit():
verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='email')
verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
users_dao.activate_user(user.id)
login_user(user)
return redirect(url_for('.add_service'))
return render_template('views/verify.html', form=form)