X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=authosm%2Fbackend.py;h=9c316a93152b5c6ead7a99525056e17cb30c2bbb;hb=835a0b7c317c0ad76a15f90acd01571cb1f62eb3;hp=6c23e91cb0230b07dbe1418ab67593ffe65690d4;hpb=2ad37de399d1f309e265c060349ce44f80d8f480;p=osm%2FLW-UI.git diff --git a/authosm/backend.py b/authosm/backend.py index 6c23e91..9c316a9 100644 --- a/authosm/backend.py +++ b/authosm/backend.py @@ -19,8 +19,8 @@ from .models import OsmUser from lib.osm.osmclient.clientv2 import Client from .exceptions import OSMAuthException -class OsmBackend(object): +class OsmBackend(object): def authenticate(self, **kwargs): ''' kwargs will receive the python dict that may contain @@ -40,20 +40,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 +59,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