login preaccepted user

Refs: #1913

diff --git a/astakos/im/admin/views.py b/astakos/im/admin/views.py
index 94ed117..e67c16b 100644 (file)
--- a/astakos/im/admin/views.py
+++ b/astakos/im/admin/views.py
@@ -59,7 +59,7 @@ from django.contrib.auth.models import AnonymousUser
 from django.contrib.sites.models import Site
 
 from astakos.im.models import AstakosUser, Invitation
-from astakos.im.util import isoformat, get_or_create_user, get_context
+from astakos.im.util import isoformat, get_context
 from astakos.im.forms import *
 from astakos.im.backends import get_backend
 from astakos.im.views import render_response, index

diff --git a/astakos/im/backends/__init__.py b/astakos/im/backends/__init__.py
index 2b3b03a..8594761 100644 (file)
--- a/astakos/im/backends/__init__.py
+++ b/astakos/im/backends/__init__.py
@@ -37,6 +37,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _
+from django.contrib.auth import authenticate, login
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.sites.models import Site
 from django.contrib import messages
@@ -45,7 +46,6 @@ from django.shortcuts import redirect
 from smtplib import SMTPException
 from urllib import quote
 
-from astakos.im.util import get_or_create_user
 from astakos.im.models import AstakosUser, Invitation
 from astakos.im.forms import ExtendedUserCreationForm, InvitedExtendedUserCreationForm
 
@@ -150,6 +150,10 @@ class InvitationsBackend(object):
             if self._is_preaccepted(user):
                 user.is_active = True
                 user.save()
+                # get the raw password from the form
+                password = form.cleaned_data['password1']
+                user = authenticate(username=user.email, password=password)
+                login(self.request, user)
                 message = _('Registration completed. You can now login.')
             else:
                 message = _('Registration completed. You will receive an email upon your account\'s activation')

diff --git a/astakos/im/forms.py b/astakos/im/forms.py
index 0f4644b..49be632 100644 (file)
--- a/astakos/im/forms.py
+++ b/astakos/im/forms.py
@@ -41,7 +41,6 @@ from django.conf import settings
 from hashlib import new as newhasher
 
 from astakos.im.models import AstakosUser
-from astakos.im.util import get_or_create_user
 
 import logging
 import uuid

diff --git a/astakos/im/target/invitation.py b/astakos/im/target/invitation.py
index 5ea5d15..317caef 100644 (file)
--- a/astakos/im/target/invitation.py
+++ b/astakos/im/target/invitation.py
@@ -32,6 +32,7 @@
 # or implied, of GRNET S.A.
 
 import logging
+import uuid
 
 from datetime import datetime
 
@@ -56,10 +57,11 @@ def login(request):
         invitation.save()
         logging.info('Accepted invitation %s', invitation)
     
-    user = get_or_create_user(invitation.uniq,
-                              invitation.realname,
-                              'Invitation',
-                              invitation.inviter.level + 1)
+    user = get_or_create_user(username = uuid.uuid4().hex[:30],
+                              realname = invitation.realname,
+                              affiliation = 'Invitation',
+                              level = invitation.inviter.level + 1,
+                              email = invitation.uniq)
     
     # in order to login the user we must call authenticate first 
     authenticate(email=user.email, auth_token=user.auth_token)

diff --git a/astakos/im/target/local.py b/astakos/im/target/local.py
index 87e0247..d4a7970 100644 (file)
--- a/astakos/im/target/local.py
+++ b/astakos/im/target/local.py
@@ -83,4 +83,5 @@ def activate(request):
     
     user.is_active = True
     user.save()
-    return prepare_response(request, user, next, renew=True, skip_login=True)
+    user = authenticate(email=user.email, auth_token=user.auth_token)
+    return prepare_response(request, user, next, renew=True)

diff --git a/astakos/im/target/shibboleth.py b/astakos/im/target/shibboleth.py
index 18be14e..9e2d8eb 100644 (file)
--- a/astakos/im/target/shibboleth.py
+++ b/astakos/im/target/shibboleth.py
@@ -38,6 +38,7 @@ from django.contrib.auth import authenticate
 from astakos.im.target.util import prepare_response
 from astakos.im.util import get_or_create_user
 
+import uuid
 
 class Tokens:
     # these are mapped by the Shibboleth SP software
@@ -69,9 +70,10 @@ def login(request):
     
     affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, '')
     
-    user = get_or_create_user(eppn, realname=realname, affiliation=affiliation, level=0, email=eppn)
+    username = uuid.uuid4().hex[:30]
+    user = get_or_create_user(username, realname=realname, affiliation=affiliation, level=0, email=eppn)
     # in order to login the user we must call authenticate first
-    user = authenticate(username=user.username, auth_token=user.auth_token)
+    user = authenticate(email=user.email, auth_token=user.auth_token)
     return prepare_response(request,
                             user,
                             request.GET.get('next'),

diff --git a/astakos/im/target/twitter.py b/astakos/im/target/twitter.py
index 065c59e..710d274 100644 (file)
--- a/astakos/im/target/twitter.py
+++ b/astakos/im/target/twitter.py
@@ -35,6 +35,7 @@
 
 import oauth2 as oauth
 import urlparse
+import uuid
 
 from django.conf import settings
 from django.http import HttpResponse
@@ -114,12 +115,12 @@ def authenticated(request):
     # These two things will likely never be used. Alternatively, you 
     # can prompt them for their email here. Either way, the password 
     # should never be used.
-    username = '%s@twitter.com' % access_token['screen_name']
+    email = '%s@twitter.com' % access_token['screen_name']
     realname = access_token['screen_name']
-    
-    user = get_or_create_user(username, realname=realname, affiliation='Twitter', level=0, email=username)
+    username = uuid.uuid4().hex[:30]
+    user = get_or_create_user(username, realname=realname, affiliation='Twitter', level=0, email=email)
     # in order to login the user we must call authenticate first
-    user = authenticate(username=user.username, auth_token=user.auth_token)
+    user = authenticate(email=user.email, auth_token=user.auth_token)
     return prepare_response(request,
                             user,
                             request_token.get('next'))

diff --git a/astakos/im/views.py b/astakos/im/views.py
index 438e12d..b3327f9 100644 (file)
--- a/astakos/im/views.py
+++ b/astakos/im/views.py
@@ -63,7 +63,7 @@ from django.contrib.auth.forms import UserCreationForm
 
 #from astakos.im.openid_store import PithosOpenIDStore
 from astakos.im.models import AstakosUser, Invitation
-from astakos.im.util import isoformat, get_or_create_user, get_context
+from astakos.im.util import isoformat, get_context
 from astakos.im.backends import get_backend
 from astakos.im.forms import ProfileForm, FeedbackForm, LoginForm