From 50d771fa59c114c1b44f3f28c1e0b2a6de140bf0 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 26 Jul 2018 15:29:17 +0100
Subject: [PATCH] Redirect new users to the account page and dont use next on
 login

---
 opentech/apply/users/templates/users/login.html | 2 +-
 opentech/settings/base.py                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opentech/apply/users/templates/users/login.html b/opentech/apply/users/templates/users/login.html
index 5f542f6ea..e80099f53 100644
--- a/opentech/apply/users/templates/users/login.html
+++ b/opentech/apply/users/templates/users/login.html
@@ -13,7 +13,7 @@
     </form>
 
     <div class="wrapper wrapper--inner-space-large">
-      <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}?next={% url "users:account" %}">Log in with your OTF email</a>
+      <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}">Log in with your OTF email</a>
     </div>
   </div>
 {% endblock %}
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 1e475ef6f..4171f5bcf 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -318,7 +318,7 @@ SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = ''
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = ''
 
 SOCIAL_AUTH_LOGIN_ERROR_URL = 'users:login'
-SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL = 'users:dashboard'
+SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL = 'users:account'
 
 # For pipelines, see http://python-social-auth.readthedocs.io/en/latest/pipeline.html?highlight=pipelines#authentication-pipeline
 # Create / associate accounts (including by email)
-- 
GitLab