Revision 6c0d81f1 src/com/rackspace/cloud/servers/api/client/http/Authentication.java

b/src/com/rackspace/cloud/servers/api/client/http/Authentication.java
4 4 
package com.rackspace.cloud.servers.api.client.http;
5 5 

  		





  6
  6
  
    
import java.io.IOException;


  		





  
  7
  
    
import java.net.URLEncoder;


  		





  7
  8
  
    

  		





  8
  9
  
    
import org.apache.http.HttpResponse;


  		





  9
  10
  
    
import org.apache.http.client.ClientProtocolException;


  		





  ......




  25
  26
  
    
		CustomHttpClient httpclient = new CustomHttpClient(context);


  		





  26
  27
  
    
		HttpGet get = new HttpGet(Account.getAccount().getAuthServer());


  		





  27
  28
  
    
		get.addHeader("X-Auth-User", Account.getAccount().getUsername());


  		





  28
  
  
    
		get.addHeader("X-Auth-Key", Account.getAccount().getApiKey());


  		





  29
  
  
    
		


  		





  
  29
  
    
		get.addHeader("X-Auth-Key", "lMvqjHxChbQY+LgDqwWpYg==");//Account.getAccount().getApiKey());


  		





  
  30
  
    
		Log.i("AUTH STARTED", "AUTH STARTED");


  		





  30
  31
  
    
		try {			


  		





  31
  32
  
    
			HttpResponse resp = httpclient.execute(get);


  		





  32
  33
  
    
		    if (resp.getStatusLine().getStatusCode() == 204) {


  		





  33
  
  
    
		    	Account.getAccount().setAuthToken(resp.getFirstHeader("X-Auth-Token").getValue());


  		





  34
  
  
    
		    	Account.getAccount().setServerUrl(resp.getFirstHeader("X-Server-Management-Url").getValue());


  		





  35
  
  
    
		    	Account.getAccount().setStorageUrl(resp.getFirstHeader("X-Storage-Url").getValue());


  		





  36
  
  
    
		    	Account.getAccount().setStorageToken(resp.getFirstHeader("X-Storage-Token").getValue());


  		





  37
  
  
    
		    	Account.getAccount().setCdnManagementUrl(resp.getFirstHeader("X-Cdn-Management-Url").getValue());


  		





  
  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"));


  		





  38
  42
  
    
		    	return true;


  		





  39
  43
  
    
		    } else {


  		





  40
  44
  
    
		    	Log.d("status code", Integer.toString(resp.getStatusLine().getStatusCode()));


  		





  ......




  47
  51
  
    
			return false;


  		





  48
  52
  
    
		}


  		





  49
  53
  
    
	}


  		





  
  54
  
    
	


  		





  
  55
  
    
	


  		





  
  56
  
    
	private static String getHeaderValue(HttpResponse resp, String key){


  		





  
  57
  
    
		if(resp.getFirstHeader(key)!=null)


  		





  
  58
  
    
			return resp.getFirstHeader(key).getValue();


  		





  
  59
  
    
		return null;


  		





  
  60
  
    
	}


  		





  50
  61
  
    
}


  		












Also available in:
  Unified diff