projects
/
osm
/
LW-UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working on client v2
[osm/LW-UI.git]
/
authosm
/
backend.py
diff --git
a/authosm/backend.py
b/authosm/backend.py
index
1b92156
..
4bf9e72
100644
(file)
--- a/
authosm/backend.py
+++ b/
authosm/backend.py
@@
-14,7
+14,7
@@
# limitations under the License.
#
from .models import OsmUser
# limitations under the License.
#
from .models import OsmUser
-
+from lib.osm.osmclient.clientv2 import Client
class OsmBackend(object):
class OsmBackend(object):
@@
-28,18
+28,25
@@
class OsmBackend(object):
password = kwargs['password']
project_id = kwargs['project_id']
password = kwargs['password']
project_id = kwargs['project_id']
- print username
- print password
- print project_id
+ client = Client()
+ result = client.auth(kwargs)
+ print "######"
+ print result
+
+ if 'error' in result and result['error'] == True:
+ return None
+ else:
+
+ try:
+ user = OsmUser.objects.get(username=username)
- try:
+ except OsmUser.DoesNotExist:
+ # Create a new user. There's no need to set a password
+ # we will keep just some preferences
+ user = OsmUser(username=username)
- return OsmUser.objects.get(username=username)
- except OsmUser.DoesNotExist:
- # Create a new user. There's no need to set a password
- # we will keep just some preferences
- user = OsmUser(username=username)
- user.save()
+ user.save()
+ user.session = result['data']
return user
return None
return user
return None