From d5b1607482b61eb41f71a86f52b2f7cfd9952e92 Mon Sep 17 00:00:00 2001 From: aviau Date: Mon, 4 May 2015 11:23:16 -0400 Subject: [PATCH] Fixed issue where get_auth_token wouldn't return the id Change-Id: I9372d6760b6269767d1dc324a3f937d1da2e3578 --- surveilclient/common/http.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/surveilclient/common/http.py b/surveilclient/common/http.py index 794631a..d4707f3 100644 --- a/surveilclient/common/http.py +++ b/surveilclient/common/http.py @@ -58,7 +58,7 @@ class HTTPClient(object): """Returns an auth token.""" if self._token_valid(): - return self.auth_token + return self.auth_token['id'] auth_url = self.auth_url + '/tokens' credentials = {} @@ -85,8 +85,7 @@ class HTTPClient(object): kwargs['headers'].setdefault('User-Agent', USER_AGENT) if self.authenticated: - kwargs['headers'].setdefault('X-Auth-Token', - self._get_auth_token()) + kwargs['headers']['X-Auth-Token'] = self._get_auth_token() conn = self.get_connection() conn.request(method, self.endpoint_path + url, **kwargs)