From 5429107f93c7fbf4510ef0b97d70f421350fe71c Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Mon, 7 Mar 2016 14:39:20 +0000
Subject: [PATCH] Removed remember me checkbox

- remember me functionality always applied.
---
 app/main/forms.py                   |  1 -
 app/main/views/two_factor.py        | 12 +++++++-----
 app/templates/views/two-factor.html |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 4d0cb8f80..ad9036e1c 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -127,7 +127,6 @@ class TwoFactorForm(Form):
         super(TwoFactorForm, self).__init__(*args, **kwargs)
 
     sms_code = sms_code()
-    remember_me = BooleanField("Remember me")
 
     def validate_sms_code(self, field):
         is_valid, reason = self.validate_code_func(field.data)
diff --git a/app/main/views/two_factor.py b/app/main/views/two_factor.py
index 325225ae2..6ed2a6089 100644
--- a/app/main/views/two_factor.py
+++ b/app/main/views/two_factor.py
@@ -1,6 +1,9 @@
-
 from flask import (
-    render_template, redirect, jsonify, session, url_for)
+    render_template,
+    redirect,
+    session,
+    url_for
+)
 
 from flask_login import login_user
 
@@ -26,14 +29,13 @@ def two_factor():
         try:
             user = users_dao.get_user_by_id(user_id)
             services = services_dao.get_services(user_id).get('data', [])
-            # Check if coming from new password page
             if 'password' in session['user_details']:
                 user.set_password(session['user_details']['password'])
                 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:
             del session['user_details']
-        if (len(services) == 1):
+        if len(services) == 1:
             return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
         else:
             return redirect(url_for('main.choose_service'))
diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html
index 19126706e..f834b93e4 100644
--- a/app/templates/views/two-factor.html
+++ b/app/templates/views/two-factor.html
@@ -23,7 +23,6 @@
         help_link=url_for('.verification_code_not_received'),
         help_link_text='I haven’t received a text message'
       ) }}
-      {{ checkbox(form.remember_me) }}
       {{ page_footer(
         "Continue"
       ) }}