x/python-surveilclient
Code Issues Proposed changes

Fixed issue where get_auth_token wouldn't return the id

Browse Source 
Change-Id: I9372d6760b6269767d1dc324a3f937d1da2e3578
This commit is contained in:
aviau 2015-05-04 11:23:16 -04:00
parent 7735b77610
commit d5b1607482
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
surveilclient/common/http.py
View File

@ -58,7 +58,7 @@ class HTTPClient(object):
"""Returns an auth token.""" """Returns an auth token."""
if self._token_valid(): if self._token_valid():
return self.auth_token return self.auth_token['id']
auth_url = self.auth_url + '/tokens' auth_url = self.auth_url + '/tokens'
credentials = {} credentials = {}
@ -85,8 +85,7 @@ class HTTPClient(object):
kwargs['headers'].setdefault('User-Agent', USER_AGENT) kwargs['headers'].setdefault('User-Agent', USER_AGENT)
if self.authenticated: if self.authenticated:
kwargs['headers'].setdefault('X-Auth-Token', kwargs['headers']['X-Auth-Token'] = self._get_auth_token()
self._get_auth_token())
conn = self.get_connection() conn = self.get_connection()
conn.request(method, self.endpoint_path + url, **kwargs) conn.request(method, self.endpoint_path + url, **kwargs)