git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jfed: help text added
[unfold.git]
/
auth
/
manifoldbackend.py
diff --git
a/auth/manifoldbackend.py
b/auth/manifoldbackend.py
index
529ef0f
..
afb8782
100644
(file)
--- a/
auth/manifoldbackend.py
+++ b/
auth/manifoldbackend.py
@@
-2,7
+2,7
@@
import time
from django.contrib.auth.models import User
from django.contrib.auth.models import User
-from manifold
.manifoldapi import ManifoldAPI
, ManifoldResult
+from manifold
api.manifoldapi import ManifoldAPI, ManifoldException
, ManifoldResult
from manifold.core.query import Query
# Name my backend 'ManifoldBackend'
from manifold.core.query import Query
# Name my backend 'ManifoldBackend'
@@
-30,7
+30,6
@@
class ManifoldBackend:
return
print "first", sessions
session = sessions[0]
return
print "first", sessions
session = sessions[0]
- print "SESSION=", session
# Change to session authentication
api.auth = {'AuthMethod': 'session', 'session': session['session']}
# Change to session authentication
api.auth = {'AuthMethod': 'session', 'session': session['session']}
@@
-47,6
+46,9
@@
class ManifoldBackend:
print "PERSON=", person
request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
print "PERSON=", person
request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
+ except ManifoldException, e:
+ print "ManifoldBackend.authenticate caught ManifoldException, returning corresponding ManifoldResult"
+ return e.manifold_result
except Exception, e:
print "E: manifoldbackend", e
import traceback
except Exception, e:
print "E: manifoldbackend", e
import traceback
@@
-59,9
+61,13
@@
class ManifoldBackend:
except User.DoesNotExist:
# Create a user in Django's local database
user = User.objects.create_user(username, username, 'passworddoesntmatter')
except User.DoesNotExist:
# Create a user in Django's local database
user = User.objects.create_user(username, username, 'passworddoesntmatter')
- user.first_name = "DUMMY_FIRST_NAME" #person['first_name']
- user.last_name = "DUMMY LAST NAME" # person['last_name']
user.email = person['email']
user.email = person['email']
+
+ if 'firstname' in person:
+ user.first_name = person['firstname']
+ if 'lastname' in person:
+ user.last_name = person['lastname']
+
return user
# Required for your backend to work properly - unchanged in most scenarios
return user
# Required for your backend to work properly - unchanged in most scenarios