Merge pull request #936 from alphagov/fix-forgot-password-empty-user-issue

Fix exception raised when a pending user attempts to complete 'forgotten password' flow

app/main/views/sign_in.py

@@ -28,7 +28,6 @@ from app.main.forms import LoginForm
 
 @main.route('/sign-in', methods=(['GET', 'POST']))
 def sign_in():
-
     if current_user and current_user.is_authenticated:
         return redirect(url_for('main.choose_service'))
 

app/main/views/two_factor.py

@@ -32,7 +32,8 @@ def two_factor():
                 user.set_password(session['user_details']['password'])
                 user.reset_failed_login_count()
                 user_api_client.update_user(user)
-            login_user(user, remember=True)
+            activated_user = user_api_client.activate_user(user)
+            login_user(activated_user, remember=True)
         finally:
             del session['user_details']
 

app/notify_client/user_api_client.py

@@ -122,5 +122,8 @@ class UserApiClient(BaseAPIClient):
         return True
 
     def activate_user(self, user):
-        user.state = 'active'
-        return self.update_user(user)
+        if user.state == 'pending':
+            user.state = 'active'
+            return self.update_user(user)
+        else:
+            return user