more oauth fixes

Author: ckoegel

custom_templates/libraries/okhttp-gson/auth/RetryingOAuth.mustache

@@ -25,12 +25,16 @@ import java.net.HttpURLConnection;
 import java.net.URI;
 import java.util.Map;
 import java.util.List;
+import java.util.Base64;
 
 public class RetryingOAuth extends OAuth implements Interceptor {
     private OAuthClient oAuthClient;
 
     private TokenRequestBuilder tokenRequestBuilder;
 
+    private String clientId;
+    private String clientSecret;
+
     /**
      * @param client An OkHttp client
      * @param tokenRequestBuilder A token request builder
@@ -63,9 +67,9 @@ public class RetryingOAuth extends OAuth implements Interceptor {
             String clientSecret,
             Map<String, String> parameters
     ) {
-        this(OAuthClientRequest.tokenLocation(tokenUrl)
-                .setClientId(clientId)
-                .setClientSecret(clientSecret));
+        this(OAuthClientRequest.tokenLocation(tokenUrl));
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
         setFlow(flow);
         if (parameters != null) {
             for (Map.Entry<String, String> entry : parameters.entrySet()) {
@@ -175,7 +179,8 @@ public class RetryingOAuth extends OAuth implements Interceptor {
         if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
             try {
                 OAuthClientRequest req = tokenRequestBuilder.buildBodyMessage();
-                req.setHeader("Authorization", "Basic ZGURuOTM=");
+                String credentials = Base64.getEncoder().encodeToString((clientId + ":" + clientSecret).getBytes());
+                req.setHeader("Authorization", "Basic " + credentials);
                 OAuthJSONAccessTokenResponse accessTokenResponse = oAuthClient.accessToken(req);
                 if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
                     setAccessToken(accessTokenResponse.getAccessToken());

src/main/java/com/bandwidth/sdk/auth/RetryingOAuth.java

@@ -35,12 +35,16 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.List;
+import java.util.Base64;
 
 public class RetryingOAuth extends OAuth implements Interceptor {
     private OAuthClient oAuthClient;
 
     private TokenRequestBuilder tokenRequestBuilder;
 
+    private String clientId;
+    private String clientSecret;
+
     /**
      * @param client An OkHttp client
      * @param tokenRequestBuilder A token request builder
@@ -73,9 +77,9 @@ public RetryingOAuth(
             String clientSecret,
             Map<String, String> parameters
     ) {
-        this(OAuthClientRequest.tokenLocation(tokenUrl)
-                .setClientId(clientId)
-                .setClientSecret(clientSecret));
+        this(OAuthClientRequest.tokenLocation(tokenUrl));
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
         setFlow(flow);
         if (parameters != null) {
             for (Map.Entry<String, String> entry : parameters.entrySet()) {
@@ -185,7 +189,8 @@ public synchronized boolean updateAccessToken(String requestAccessToken) throws
         if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
             try {
                 OAuthClientRequest req = tokenRequestBuilder.buildBodyMessage();
-                req.setHeader("Authorization", "Basic ZGURuOTM=");
+                String credentials = Base64.getEncoder().encodeToString((clientId + ":" + clientSecret).getBytes());
+                req.setHeader("Authorization", "Basic " + credentials);
                 OAuthJSONAccessTokenResponse accessTokenResponse = oAuthClient.accessToken(req);
                 if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
                     setAccessToken(accessTokenResponse.getAccessToken());

src/test/java/com/bandwidth/sdk/smoke/StatisticsApiTest.java

@@ -1,5 +1,6 @@
 package com.bandwidth.sdk.smoke;
 
+import com.bandwidth.sdk.api.MessagesApi;
 import com.bandwidth.sdk.api.StatisticsApi;
 import com.bandwidth.sdk.auth.HttpBasicAuth;
 import com.bandwidth.sdk.ApiClient;
@@ -17,10 +18,8 @@
  * API tests for StatisticsApi
  */
 public class StatisticsApiTest {
-    public ApiClient defaultClient = Configuration.getDefaultApiClient();
-    public HttpBasicAuth Basic = (HttpBasicAuth) defaultClient.getAuthentication("Basic");
-    private final StatisticsApi api = new StatisticsApi(defaultClient);
-
+    ApiClient oauthClient = new ApiClient(BW_USERNAME, BW_PASSWORD, null);
+    private final StatisticsApi api = new StatisticsApi(oauthClient);
     /**
      * Get Account Statistics
      *
@@ -30,8 +29,6 @@ public class StatisticsApiTest {
      */
     @Test
     public void getStatisticsTest() throws ApiException {
-        Basic.setUsername(BW_USERNAME);
-        Basic.setPassword(BW_PASSWORD);
 
         AccountStatistics response = api.getStatistics(BW_ACCOUNT_ID);