Ed: removing unnecessary Bearer and rename token

Author: Ed Fricker

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

@@ -228,21 +228,18 @@ private HttpURLConnection prepareConnection(HttpURLConnection conn) {
 
     private Map<String, String> createAuthorizationHeaders() {
         switch (Intercom.getAuthKeyType()) {
-            case BEARER:
-                headers.put("Authorization", "Bearer " + Intercom.getApiKey());
-                break;
             case API_KEY:
-                headers.put("Authorization", "Basic " + Base64.encodeBase64String(generateAuthString(Intercom.getAppID(),Intercom.getApiKey()).getBytes()));
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getAppID(),Intercom.getApiKey()));
                 break;
-            case PERSONAL_ACCESS_TOKEN:
-                headers.put("Authorization", "Basic " + Base64.encodeBase64String(generateAuthString(Intercom.getPersonalAccessToken(),"").getBytes()));
+            case TOKEN:
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
                 break;
         }
         return headers;
     }
 
     private String generateAuthString(String username, String password) {
-        return username + ":" + password;
+        return Base64.encodeBase64String((username + ":" + password).getBytes());
     }
 
     private Map<String, String> createHeaders() {

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

@@ -12,8 +12,7 @@ public class Intercom {
 
     enum AuthKeyType {
         API_KEY,
-        BEARER,
-        PERSONAL_ACCESS_TOKEN
+        TOKEN
     }
 
     private static final String VERSION = "2.1.0";
@@ -22,7 +21,7 @@ enum AuthKeyType {
 
     private static volatile String apiKey;
 
-    private static volatile String personalAccessToken;
+    private static volatile String token;
 
     private static volatile String appID;
 
@@ -80,9 +79,9 @@ public static void setAppID(String appID) {
         Intercom.appID = appID;
     }
 
-    public static void setPersonalAccessToken(String personalAccessToken) {
-        authKeyType = AuthKeyType.PERSONAL_ACCESS_TOKEN;
-        Intercom.personalAccessToken = personalAccessToken;
+    public static void setToken(String token) {
+        authKeyType = AuthKeyType.TOKEN;
+        Intercom.token = token;
     }
 
     public static String getApiKey() {
@@ -106,8 +105,8 @@ static AuthKeyType getAuthKeyType() {
         return authKeyType;
     }
 
-    public static String getPersonalAccessToken() {
-        return personalAccessToken;
+    public static String getToken() {
+        return token;
     }