X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=authosm%2Fmodels.py;fp=authosm%2Fmodels.py;h=f968dfaf416805450b0045be030e17edd45554ef;hb=e5a130af55131c3437fe3e2b7bb7cdacd0b22add;hp=d03e6d25b15f314be7a1ff8f26b971fe9ca77fca;hpb=114c5a12dd39efa0a1aedb9296021e2975340106;p=osm%2FLW-UI.git diff --git a/authosm/models.py b/authosm/models.py index d03e6d2..f968dfa 100644 --- a/authosm/models.py +++ b/authosm/models.py @@ -69,6 +69,7 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin): psw = models.CharField(_('psw'), max_length=36) token = models.CharField(_('token'), max_length=255) project_id = models.CharField(_('project_id'), max_length=36) + project_name = models.CharField(_('project_name'), max_length=36, default='') token_expires = models.FloatField(_('token_expires'), max_length=36) objects = OsmUserManager() @@ -91,11 +92,12 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin): def get_projects(self): client = Client() - result = client.get_user_info(self.get_token(), self.username) - if 'error' in result and result['error'] is True: + user_info = client.get_user_info(self.get_token(), self.username) + projects = client.get_projects(self.get_token(), user_info['data']['projects']) + if 'error' in projects and projects['error'] is True: return [] else: - return result['data']['projects'] + return projects['data'] def switch_project(self, project_id): client = Client() @@ -105,6 +107,7 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin): else: self.token = result['data']['id'] self.project_id = result['data']['project_id'] + self.project_name = result['data']['project_name'] self.token_expires = result['data']['expires'] self.save() return True