Merge pull request #121 from intercom/ed/support-PAT

Support PAT

Author: mmartinic

README.md

@@ -95,14 +95,22 @@ Resources this API supports:
 
 ## Authorization
 
-You can set the app's id and api key via the `Intercom` object -  
+
+If you're using a Personal Access Token (PAT) you can just use the following helper method, which will automatically set up the authentication scheme for you -
+
+```java
+Intercom.setToken("da39a3ee5e6b4b0d3255bfef95601890afd80709");
+```
+
+If you're still using API Keys (now deprecated), you can set up your App ID and API Key using the following methods -
 
 ```java
 Intercom.setAppID("pi3243fa");
 Intercom.setApiKey("da39a3ee5e6b4b0d3255bfef95601890afd80709");
 ```
 
 
+
 ## Usage
 
 ### Users

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,21 @@ 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.getAuthKeyType()) {
+            case API_KEY:
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getAppID(),Intercom.getApiKey()));
+                break;
+            case TOKEN:
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
+                break;
         }
         return headers;
     }
 
+    private String generateAuthString(String username, String password) {
+        return Base64.encodeBase64String((username + ":" + password).getBytes());
+    }
+
     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,21 @@ public class Intercom {
 
     private static volatile URI apiBaseURI = API_BASE_URI;
 
-    static final String AUTH_BASIC = "Basic";
+    private static volatile AuthKeyType authKeyType = AuthKeyType.API_KEY;
 
-    private static final String AUTH_SCHEME = AUTH_BASIC;
-
-    static final String AUTH_BEARER = "Bearer";
+    enum AuthKeyType {
+        API_KEY,
+        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 token;
+
     private static volatile String appID;
 
     private static volatile int connectionTimeout = 3 * 1000;
@@ -76,11 +79,17 @@ public static void setAppID(String appID) {
         Intercom.appID = appID;
     }
 
+    public static void setToken(String token) {
+        authKeyType = AuthKeyType.TOKEN;
+        Intercom.token = token;
+    }
+
     public static String getApiKey() {
         return Intercom.apiKey;
     }
 
     public static void setApiKey(String apiKey) {
+        authKeyType = AuthKeyType.API_KEY;
         Intercom.apiKey = apiKey;
     }
 
@@ -92,8 +101,13 @@ public static void setApiBaseURI(URI apiBaseURI) {
         Intercom.apiBaseURI = apiBaseURI;
     }
 
-    static String getAuthScheme() {
-        return AUTH_SCHEME;
+    static AuthKeyType getAuthKeyType() {
+        return authKeyType;
+    }
+
+    public static String getToken() {
+        return token;
     }
 
+
 }