Fix bearer token issue on requests interceptor

uphold · Dec 12, 2017 · 1f31da2 · 1f31da2
1 parent 78139d7
commit 1f31da2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/app/src/androidTest/java/com/uphold/uphold_android_sdk/test/util/MockRestAdapter.java b/src/app/src/androidTest/java/com/uphold/uphold_android_sdk/test/util/MockRestAdapter.java
@@ -32,13 +32,13 @@ public class MockRestAdapter<T> {
     private UpholdRestAdapter mockRestAdapter;
     private RestAdapter restAdapter;
 
-    public MockRestAdapter(String token, final String responseString, final HashMap<String, String> headers) {
+    public MockRestAdapter(final String responseString, final HashMap<String, String> headers) {
         this.exceptionReference = new AtomicReference<>();
         this.requestReference = new AtomicReference<>();
         this.resultReference = new AtomicReference<>();
         this.mockRestAdapter = new UpholdRestAdapter();
         this.restAdapter = new RestAdapter.Builder().setEndpoint(BuildConfig.API_SERVER_URL)
-            .setRequestInterceptor(this.mockRestAdapter.getUpholdRequestInterceptor(token))
+            .setRequestInterceptor(this.mockRestAdapter.getUpholdRequestInterceptor())
             .setClient(new Client() {
                 @Override
                 public Response execute(Request request) throws IOException {

diff --git a/...app/src/main/java/com/uphold/uphold_android_sdk/client/restadapter/UpholdRestAdapter.java b/...app/src/main/java/com/uphold/uphold_android_sdk/client/restadapter/UpholdRestAdapter.java
@@ -1,13 +1,13 @@
 package com.uphold.uphold_android_sdk.client.restadapter;
 
+import android.text.TextUtils;
+
 import com.squareup.okhttp.OkHttpClient;
 import com.uphold.uphold_android_sdk.BuildConfig;
 import com.uphold.uphold_android_sdk.client.errorhandling.UpholdRetrofitErrorHandling;
 import com.uphold.uphold_android_sdk.client.session.SessionManager;
 import com.uphold.uphold_android_sdk.util.Header;
 
-import android.text.TextUtils;
-
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
@@ -42,7 +42,7 @@ public UpholdRestAdapter() {
             .setClient(new OkClient(okHttpClient))
             .setErrorHandler(new UpholdRetrofitErrorHandling())
             .setLogLevel(BuildConfig.DEBUG ? RestAdapter.LogLevel.FULL : RestAdapter.LogLevel.NONE)
-            .setRequestInterceptor(getUpholdRequestInterceptor(SessionManager.INSTANCE.getBearerToken()))
+            .setRequestInterceptor(getUpholdRequestInterceptor())
             .build();
     }
 
@@ -72,16 +72,14 @@ public RestAdapter getAdapter() {
     /**
      * Gets the {@link RequestInterceptor}.
      *
-     * @param token The token (if available) of the user.
-     *
      * @return the {@link RequestInterceptor}.
      */
 
-    public RequestInterceptor getUpholdRequestInterceptor(final String token) {
+    public RequestInterceptor getUpholdRequestInterceptor() {
         return new RequestInterceptor() {
             @Override
             public void intercept(RequestFacade request) {
-                HashMap<String, String> map = Header.getHeaders();
+                final HashMap<String, String> map = Header.getHeaders();
 
                 for (Map.Entry<String, String> entry : map.entrySet()) {
                     String key = entry.getKey();
@@ -90,7 +88,9 @@ public void intercept(RequestFacade request) {
                     request.addHeader(key, value);
                 }
 
-                if (token != null && !TextUtils.isEmpty(token)) {
+                final String token = SessionManager.INSTANCE.getBearerToken();
+
+                if (!TextUtils.isEmpty(token)) {
                     request.addHeader("Authorization", String.format("Bearer %s", token));
                 }
             }