Removed remember me checkbox

- remember me functionality always applied.
This commit is contained in:
Martyn Inglis
2016-03-07 14:39:20 +00:00
parent 48a8be9ea4
commit 5429107f93
3 changed files with 7 additions and 7 deletions

View File

@@ -127,7 +127,6 @@ class TwoFactorForm(Form):
super(TwoFactorForm, self).__init__(*args, **kwargs) super(TwoFactorForm, self).__init__(*args, **kwargs)
sms_code = sms_code() sms_code = sms_code()
remember_me = BooleanField("Remember me")
def validate_sms_code(self, field): def validate_sms_code(self, field):
is_valid, reason = self.validate_code_func(field.data) is_valid, reason = self.validate_code_func(field.data)

View File

@@ -1,6 +1,9 @@
from flask import ( from flask import (
render_template, redirect, jsonify, session, url_for) render_template,
redirect,
session,
url_for
)
from flask_login import login_user from flask_login import login_user
@@ -26,14 +29,13 @@ def two_factor():
try: try:
user = users_dao.get_user_by_id(user_id) user = users_dao.get_user_by_id(user_id)
services = services_dao.get_services(user_id).get('data', []) services = services_dao.get_services(user_id).get('data', [])
# Check if coming from new password page
if 'password' in session['user_details']: if 'password' in session['user_details']:
user.set_password(session['user_details']['password']) user.set_password(session['user_details']['password'])
users_dao.update_user(user) users_dao.update_user(user)
login_user(user, remember=form.remember_me.data if form.remember_me.data else False) login_user(user, remember=True)
finally: finally:
del session['user_details'] del session['user_details']
if (len(services) == 1): if len(services) == 1:
return redirect(url_for('main.service_dashboard', service_id=services[0]['id'])) return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else: else:
return redirect(url_for('main.choose_service')) return redirect(url_for('main.choose_service'))

View File

@@ -23,7 +23,6 @@
help_link=url_for('.verification_code_not_received'), help_link=url_for('.verification_code_not_received'),
help_link_text='I havent received a text message' help_link_text='I havent received a text message'
) }} ) }}
{{ checkbox(form.remember_me) }}
{{ page_footer( {{ page_footer(
"Continue" "Continue"
) }} ) }}