Ed: some better refactoring for future proofing of other auth schemes

Author: Ed Fricker

intercom-java/src/main/java/io/intercom/api/HttpClient.java

@@ -59,8 +59,6 @@ private static String clientAgentDetails() {
 
     private final Map<String, String> headers;
 
-    private final String apiKey = Intercom.getApiKey();
-
     private final HttpConnectorSupplier connection = Intercom.getHttpConnectorSupplier();
 
     public HttpClient(URI uri) {
@@ -229,15 +227,24 @@ private HttpURLConnection prepareConnection(HttpURLConnection conn) {
     }
 
     private Map<String, String> createAuthorizationHeaders() {
-        if (Intercom.getAuthScheme().equals(Intercom.AUTH_BEARER)) {
-            headers.put("Authorization", "Bearer " + apiKey);
-        } else if (Intercom.getAuthScheme().equals(Intercom.AUTH_BASIC)) {
-            final String authString = Intercom.getAppID() + ":" + Intercom.getApiKey();
-            headers.put("Authorization", "Basic " + Base64.encodeBase64String(authString.getBytes()));
+        switch (Intercom.getAuthScheme()) {
+            case BEARER:
+                headers.put("Authorization", "Bearer " + Intercom.getApiKey());
+                break;
+            case API_KEY:
+                headers.put("Authorization", "Basic " + Base64.encodeBase64String(generateAuthString(Intercom.getAppID(),Intercom.getApiKey()).getBytes()));
+                break;
+            case PERSONAL_ACCESS_TOKEN:
+                headers.put("Authorization", "Basic " + Base64.encodeBase64String(generateAuthString(Intercom.getPersonalAccessToken(),"").getBytes()));
+                break;
         }
         return headers;
     }
 
+    private String generateAuthString(String username, String password) {
+        return username + ":" + password;
+    }
+
     private Map<String, String> createHeaders() {
         headers.put("User-Agent", USER_AGENT);
         headers.put("X-Client-Platform-Details", CLIENT_AGENT_DETAILS);

intercom-java/src/main/java/io/intercom/api/Intercom.java

@@ -8,18 +8,22 @@ public class Intercom {
 
     private static volatile URI apiBaseURI = API_BASE_URI;
 
-    static final String AUTH_BASIC = "Basic";
+    private static volatile AuthenticationSchemes authenticationScheme = AuthenticationSchemes.API_KEY;
 
-    private static final String AUTH_SCHEME = AUTH_BASIC;
-
-    static final String AUTH_BEARER = "Bearer";
+    enum AuthenticationSchemes {
+        API_KEY,
+        BEARER,
+        PERSONAL_ACCESS_TOKEN
+    }
 
     private static final String VERSION = "2.1.0";
 
     public static final String USER_AGENT = "intercom-java/" + Intercom.VERSION;
 
     private static volatile String apiKey;
 
+    private static volatile String personalAccessToken;
+
     private static volatile String appID;
 
     private static volatile int connectionTimeout = 3 * 1000;
@@ -77,15 +81,16 @@ public static void setAppID(String appID) {
     }
 
     public static void setPersonalAccessToken(String personalAccessToken) {
-        Intercom.appID = personalAccessToken;
-        Intercom.apiKey = "";
+        authenticationScheme = AuthenticationSchemes.PERSONAL_ACCESS_TOKEN;
+        Intercom.personalAccessToken = personalAccessToken;
     }
 
     public static String getApiKey() {
         return Intercom.apiKey;
     }
 
     public static void setApiKey(String apiKey) {
+        authenticationScheme = AuthenticationSchemes.API_KEY;
         Intercom.apiKey = apiKey;
     }
 
@@ -97,8 +102,13 @@ public static void setApiBaseURI(URI apiBaseURI) {
         Intercom.apiBaseURI = apiBaseURI;
     }
 
-    static String getAuthScheme() {
-        return AUTH_SCHEME;
+    static AuthenticationSchemes getAuthScheme() {
+        return authenticationScheme;
     }
 
+    public static String getPersonalAccessToken() {
+        return personalAccessToken;
+    }
+
+
 }