Created
May 11, 2015 06:34
-
-
Save loic/c4ad0728e97e4c0638d1 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/crowd/backends.py b/crowd/backends.py | |
index 3b6bb7f..b854ddf 100644 | |
--- a/crowd/backends.py | |
+++ b/crowd/backends.py | |
@@ -21,12 +21,15 @@ class CrowdBackend(ModelBackend): | |
myCookie = '' | |
theip = '' | |
+ @staticmethod | |
def get_cookie(): | |
return CrowdBackend.myCookie | |
+ @staticmethod | |
def destroy_cookie(): | |
CrowdBackend.myCookie = '' | |
+ @staticmethod | |
def set_cookie(cookie): | |
s = SessionStore() | |
s['CrowdToken'] = cookie | |
@@ -51,6 +54,7 @@ class CrowdBackend(ModelBackend): | |
if not user: | |
logger.debug("Create User") | |
user = self._create_user_from_crowd(username, crowd_config) | |
+ user.crowdtoken = session_crowd | |
return user | |
else: | |
return None | |
diff --git a/crowd/middleware.py b/crowd/middleware.py | |
index 29cdde0..ca763e4 100644 | |
--- a/crowd/middleware.py | |
+++ b/crowd/middleware.py | |
@@ -48,14 +48,13 @@ class CookieMiddleware(object): | |
if username: | |
logger.debug("Check if User already there") | |
try: | |
- user = User.objects.filter(username=username)[0] | |
- user.backend = CRCN | |
- except: | |
+ user = User.objects.get(username=username) | |
+ except User.DoesNotExist: | |
logger.debug("User not yet imported") | |
crowd_config = CrowdBackend._get_crowd_config(self) | |
user = CrowdBackend._create_user_from_crowd( | |
CrowdBackend, username, crowd_config) | |
- user.backend = CRCN | |
+ user.backend = CRCN | |
request.user = user | |
else: | |
return |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment