Revision 038ac9a4 src/com/rackspace/cloud/servers/api/client/http/Authentication.java
b/src/com/rackspace/cloud/servers/api/client/http/Authentication.java | ||
---|---|---|
18 | 18 |
|
19 | 19 |
/** |
20 | 20 |
* @author Mike Mayo - mike.mayo@rackspace.com - twitter.com/greenisus |
21 |
* |
|
21 |
*
|
|
22 | 22 |
*/ |
23 | 23 |
public class Authentication { |
24 | 24 |
|
... | ... | |
26 | 26 |
CustomHttpClient httpclient = new CustomHttpClient(context); |
27 | 27 |
HttpGet get = new HttpGet(Account.getAccount().getAuthServer()); |
28 | 28 |
get.addHeader("X-Auth-User", Account.getAccount().getUsername()); |
29 |
get.addHeader("X-Auth-Key", "lMvqjHxChbQY+LgDqwWpYg==");//Account.getAccount().getApiKey()); |
|
29 |
get.addHeader("X-Auth-Key", "lMvqjHxChbQY+LgDqwWpYg==");// Account.getAccount().getApiKey());
|
|
30 | 30 |
Log.i("AUTH STARTED", "AUTH STARTED"); |
31 |
try {
|
|
31 |
try { |
|
32 | 32 |
HttpResponse resp = httpclient.execute(get); |
33 |
if (resp.getStatusLine().getStatusCode() == 204) { |
|
34 |
|
|
35 |
Account.getAccount().setAuthToken(getHeaderValue(resp, "X-Auth-Token")); |
|
36 |
Account.getAccount().setServerUrl(getHeaderValue(resp, "X-Server-Management-Url")); |
|
37 |
Account.getAccount().setStorageUrl(getHeaderValue(resp, "X-Storage-Url")); |
|
38 |
Account.getAccount().setStorageToken(getHeaderValue(resp, "X-Storage-Token")); |
|
39 |
if(Account.getAccount().getStorageToken()==null) |
|
40 |
Account.getAccount().setStorageToken(Account.getAccount().getAuthToken()); |
|
41 |
Account.getAccount().setCdnManagementUrl(getHeaderValue(resp, "X-Cdn-Management-Url")); |
|
42 |
return true; |
|
43 |
} else { |
|
44 |
Log.d("status code", Integer.toString(resp.getStatusLine().getStatusCode())); |
|
45 |
return false; |
|
46 |
} |
|
33 |
if (resp.getStatusLine().getStatusCode() == 204) { |
|
34 |
|
|
35 |
Account.getAccount().setAuthToken( |
|
36 |
getHeaderValue(resp, "X-Auth-Token")); |
|
37 |
Account.getAccount().setServerUrl( |
|
38 |
getHeaderValue(resp, "X-Server-Management-Url")); |
|
39 |
Account.getAccount().setStorageUrl( |
|
40 |
getHeaderValue(resp, "X-Storage-Url")); |
|
41 |
Account.getAccount().setStorageToken( |
|
42 |
getHeaderValue(resp, "X-Storage-Token")); |
|
43 |
if (Account.getAccount().getStorageToken() == null) |
|
44 |
Account.getAccount().setStorageToken( |
|
45 |
Account.getAccount().getAuthToken()); |
|
46 |
Account.getAccount().setCdnManagementUrl( |
|
47 |
getHeaderValue(resp, "X-Cdn-Management-Url")); |
|
48 |
return true; |
|
49 |
} else { |
|
50 |
Log.d("status code", |
|
51 |
Integer.toString(resp.getStatusLine().getStatusCode())); |
|
52 |
return false; |
|
53 |
} |
|
47 | 54 |
} catch (ClientProtocolException cpe) { |
48 | 55 |
return false; |
49 | 56 |
} catch (IOException e) { |
... | ... | |
51 | 58 |
return false; |
52 | 59 |
} |
53 | 60 |
} |
54 |
|
|
55 |
|
|
56 |
private static String getHeaderValue(HttpResponse resp, String key){ |
|
57 |
if(resp.getFirstHeader(key)!=null) |
|
61 |
|
|
62 |
private static String getHeaderValue(HttpResponse resp, String key) { |
|
63 |
if (resp.getFirstHeader(key) != null) |
|
58 | 64 |
return resp.getFirstHeader(key).getValue(); |
59 | 65 |
return null; |
60 | 66 |
} |
Also available in: Unified diff