automatic reload on lists; new django decorator for ajax request

[osm/LW-UI.git] / authosm / backend.py

diff --git a/authosm/backend.py b/authosm/backend.py
index 6c23e91..628eb6a 100644 (file)
--- a/authosm/backend.py
+++ b/authosm/backend.py
@@ -19,6 +19,7 @@ from .models import OsmUser
 from lib.osm.osmclient.clientv2 import Client
 from .exceptions import OSMAuthException
 
+
 class OsmBackend(object):
 
     def authenticate(self, **kwargs):
@@ -40,20 +41,17 @@ class OsmBackend(object):
                 try:
                     user = OsmUser.objects.get(username=username)
                     user.psw = password
-                    user.token=result['data']['id']
-                    user.project_id=result['data']['project_id']
-                    user.token_expires=result['data']['expires']
-                    user.session = result['data']
+                    user.token = result['data']['id']
+                    user.project_id = result['data']['project_id']
+                    user.token_expires = result['data']['expires']
+                    user.is_admin = bool(result['data']['admin'])
                     user.save()
-
                 except OsmUser.DoesNotExist:
                     user = OsmUser(username=username, psw=password, token=result['data']['id'],
-                                                       project_id=result['data']['project_id'],
-                                                       token_expires=result['data']['expires'])
-                    user.session = result['data']
+                                   project_id=result['data']['project_id'],
+                                   token_expires=result['data']['expires'], is_admin=result['data']['admin'])
                     user.save()
 
-
                 return user
 
         return None
@@ -62,4 +60,4 @@ class OsmBackend(object):
         try:
             return OsmUser.objects.get(pk=user_id)
         except OsmUser.DoesNotExist:
-            return None
\ No newline at end of file
+            return None