redirect to profile page from twitter

Refs: #1584

diff --git a/pithos/im/target/invitation.py b/pithos/im/target/invitation.py
index 2901534..f4e1cd8 100644 (file)
--- a/pithos/im/target/invitation.py
+++ b/pithos/im/target/invitation.py
@@ -64,9 +64,8 @@ def login(request):
     
     next = request.GET.get('next')
     if settings.FORCE_PROFILE_UPDATE and not user.is_verified:
-        profile_url = reverse('pithos.im.views.users_profile', args=(user.id,))
-        next = urlencode({'next': next})
-        profile_url = profile_url + '?' + next
-        return prepare_response(request, user, profile_url)
+        params = urlencode({'next': next})
+        next = reverse('pithos.im.views.users_profile', args=(user.id,))
+        next = next + '?' + params
     
     return prepare_response(request, user, next, 'renew' in request.GET)

diff --git a/pithos/im/target/local.py b/pithos/im/target/local.py
index 29b6b4e..4e8bea7 100644 (file)
--- a/pithos/im/target/local.py
+++ b/pithos/im/target/local.py
@@ -65,10 +65,9 @@ def login(request):
     
     next = request.POST.get('next')
     if settings.FORCE_PROFILE_UPDATE and not user.is_verified:
-        profile_url = reverse('pithos.im.views.users_profile', args=(user.id,))
-        next = urlencode({'next': next})
-        profile_url = profile_url + '?' + next
-        return prepare_response(request, user, profile_url)
+        params = urlencode({'next': next})
+        next = reverse('pithos.im.views.users_profile', args=(user.id,))
+        next = next + '?' + params
     
     return prepare_response(request, user, next)
 

diff --git a/pithos/im/target/shibboleth.py b/pithos/im/target/shibboleth.py
index d9c62d7..8779876 100644 (file)
--- a/pithos/im/target/shibboleth.py
+++ b/pithos/im/target/shibboleth.py
@@ -72,10 +72,9 @@ def login(request):
     user = get_or_create_user(eppn, realname, affiliation, 0)
     next = request.GET.get('next')
     if settings.FORCE_PROFILE_UPDATE and not user.is_verified:
-        profile_url = reverse('pithos.im.views.users_profile', args=(user.id,))
-        next = urlencode({'next': next})
-        profile_url = profile_url + '?' + next
-        return prepare_response(request, user, profile_url)
+        params = urlencode({'next': next})
+        next = reverse('pithos.im.views.users_profile', args=(user.id,))
+        next = next + '?' + params
     
     return prepare_response(request,
                             user,

diff --git a/pithos/im/target/twitter.py b/pithos/im/target/twitter.py
index 4831ab6..01bd42a 100644 (file)
--- a/pithos/im/target/twitter.py
+++ b/pithos/im/target/twitter.py
@@ -115,6 +115,11 @@ def authenticated(request):
     uniq = '%s@twitter.com' % access_token['screen_name']
     realname = access_token['user_id']
     
-    return prepare_response(request,
-                            get_or_create_user(uniq, realname, 'Twitter', 0),
-                            request_token.get('next'))
+    user = get_or_create_user(uniq, realname, 'Twitter', 0)
+    next = request_token.get('next')
+    if settings.FORCE_PROFILE_UPDATE and not user.is_verified:
+        params = urlencode({'next': next})
+        next = reverse('pithos.im.views.users_profile', args=(user.id,))
+        next = next + '?' + params
+    
+    return prepare_response(request, user, next)