git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
registrationview
[myslice.git]
/
auth
/
manifoldbackend.py
diff --git
a/auth/manifoldbackend.py
b/auth/manifoldbackend.py
index
2b1bde5
..
529ef0f
100644
(file)
--- a/
auth/manifoldbackend.py
+++ b/
auth/manifoldbackend.py
@@
-3,6
+3,7
@@
import time
from django.contrib.auth.models import User
from manifold.manifoldapi import ManifoldAPI, ManifoldResult
from django.contrib.auth.models import User
from manifold.manifoldapi import ManifoldAPI, ManifoldResult
+from manifold.core.query import Query
# Name my backend 'ManifoldBackend'
class ManifoldBackend:
# Name my backend 'ManifoldBackend'
class ManifoldBackend:
@@
-20,32
+21,36
@@
class ManifoldBackend:
auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
api = ManifoldAPI(auth)
auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
api = ManifoldAPI(auth)
- # Authenticate user and get session key
- session_result = api.GetSession()
- session = session_result.ok_value()
- if not session:
- print "GetSession failed",session_result.error()
+ sessions_result = api.forward(Query.create('local:session').to_dict())
+ print "result"
+ sessions = sessions_result.ok_value()
+ print "ok"
+ if not sessions:
+ print "GetSession failed", sessions_result.error()
return
return
-
- print 'DEALING with session',session
- #self.session = session
- # Change GetSession() at some point to return expires as well
- expires = time.time() + (24 * 60 * 60)
+ print "first", sessions
+ session = sessions[0]
+ print "SESSION=", session
# Change to session authentication
# Change to session authentication
- api.auth = {'AuthMethod': 'session', 'session': session}
+ api.auth = {'AuthMethod': 'session', 'session': session
['session']
}
self.api = api
# Get account details
self.api = api
# Get account details
- persons_result = api.GetPersons(auth)
+ # the new API would expect Get('local:user') instead
+ persons_result = api.forward(Query.get('local:user').to_dict())
persons = persons_result.ok_value()
if not persons:
print "GetPersons failed",persons_result.error()
return
person = persons[0]
persons = persons_result.ok_value()
if not persons:
print "GetPersons failed",persons_result.error()
return
person = persons[0]
+ print "PERSON=", person
- request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': expires}
- except:
+ request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
+ except Exception, e:
+ print "E: manifoldbackend", e
+ import traceback
+ traceback.print_exc()
return None
try:
return None
try:
@@
-54,8
+59,8
@@
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 = person['first_name']
- user.last_name = person['last_name']
+ user.first_name =
"DUMMY_FIRST_NAME" #
person['first_name']
+ user.last_name =
"DUMMY LAST NAME" #
person['last_name']
user.email = person['email']
return user
user.email = person['email']
return user