Revision 5207c784 kamaki/clients/astakos.py

b/kamaki/clients/astakos.py
49 49
        :returns: (dict) authentication information
50 50
        """
51 51
        self.token = token or self.token
52
        self._cache[token] = self.get('/im/authenticate')
53
        return self._cache[token].json
52
        self._cache[token] = self.get('/im/authenticate').json
53
        return self._cache[token]
54

  
55
    def list(self):
56
        return self._cache.values()
54 57

  
55 58
    def _user_info(self, token=None):
56 59
        token = token or self.token
......
59 62
        except KeyError:
60 63
            return self.authenticate(token)
61 64

  
62
    def uuid(self, token=None):
63
        return self._user_info(token)['uuid'].strip()
64

  
65
    def name(self, token=None):
66
        return self._user_info(token)['name'].strip()
67

  
68
    def username(self, token=None):
69
        return self._user_info(token)['username'].strip()
70

  
71
    def token_created(self, token=None):
72
        return self._user_info(token)['auth_token_created'].strip()
73

  
74
    def token_expires(self, token=None):
75
        return self._user_info(token)['auth_token_expires'].strip()
76

  
77
    def email(self, token=None):
78
        return self._user_info(token)['email'].strip()
79

  
80
    def id(self, token=None):
81
        """Internal reference for Astakos objects (not a unique user id)
82
        For a unique identifier use uuid
83
        """
84
        return self._user_info(token)['id'].strip()
65
    def term(self, key, token=None):
66
        """Get (cached) term, from user credentials"""
67
        return self._user_info(token)[key]

Also available in: Unified diff