Stop client credentials token from being retrieved twice; Give SSL checking flag to codekit

Author: mattcobb

sdk/server/java/lib/codekit-1.0.jar

@@ -82,6 +82,14 @@ public ClientCredentialsManager(String host, String apiKey,
         if (timedFetch) {
             this.timer = new Timer();
             this.timer.schedule(new FetchToken(), 0);
+        } else {
+        	try {
+        		fetchOAuthToken();
+        	} catch (ApiRequestException fex) {
+        		log.info("CCM fetch failed: " + fex.toString());
+        	} catch (Exception fex) {
+        		log.info("CCM fetch failed: " + fex.toString());
+        	}        	
         }
     }
 
@@ -98,13 +106,15 @@ public OAuthToken fetchOAuthToken() throws ApiRequestException {
             return this.currentOAuthToken;
         }
         try {
-        	// TODO: This URL should come from properties
-            //OAuthService svc = new OAuthService("https://api-uat.mars.bf.sl.attcompute.com",
-            OAuthService svc = new OAuthService("https://api.att.com",
+            log.info("ClientCredentialsManager.fetchOAuthToken: Fetching new token from " + this.host + " for client " + this.apiKey);
+            OAuthService svc = new OAuthService(this.host,            		
                     this.apiKey, this.apiSecret);
             this.currentOAuthToken = svc.getToken(this.scope);
+            log.info("ClientCredentialsManager.fetchOAuthToken successful: " +
+                currentOAuthToken.getAccessToken());
             return this.currentOAuthToken;
         } catch (RESTException ex) {
+        	log.info("ClientCredentialsManager.fetchOAuthToken failed. " + ex.toString());
             throw new ApiRequestException("could not get oauth token", 403,
                     "{\"error\":\"could not get oauth token\"}", ex);
         }
@@ -215,7 +225,7 @@ class FetchToken extends TimerTask {
         public void run() {
             try {
                 fetchOAuthToken();
-                fetchToken(false);
+                //fetchToken(false);
 
             } catch (Exception e) {
                 log.severe("Could not fetch auth token" + e.getMessage());
@@ -236,5 +246,6 @@ public void run() {
     public String getCurrentToken() {
         return currentAuthToken;
     }
+    
 
-}
+}

sdk/server/java/src/com/html5sdk/att/provider/ClientCredentialsManager.java

@@ -39,6 +39,7 @@ abstract class ServiceServletBase extends HttpServlet {
     public ServiceServletBase() {
         super();
     	RESTConfig.setDefaultClientSdk(AttConstants.XARG_CLIENT_SDK);
+    	RESTConfig.setDefaultTrustAllCerts( ! AttConstants.ENABLE_SSL_CHECK);
     }
 
     /**