Skip to content

Remove API Key references #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmartinic merged 1 commit into from
Oct 24, 2018
Merged

Remove API Key references #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions intercom-java/src/main/java/io/intercom/api/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,7 @@ private HttpURLConnection prepareConnection(HttpURLConnection conn) {
}

private Map<String, String> createAuthorizationHeaders() {
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;
}
headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
return headers;
}

Expand Down
33 changes: 0 additions & 33 deletions intercom-java/src/main/java/io/intercom/api/Intercom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
public class Intercom {

static class Context {
private volatile AuthKeyType authKeyType = AuthKeyType.API_KEY;
private volatile String apiKey;
private volatile String token;
private volatile String appID;
private volatile int connectionTimeout = 3 * 1000;
private volatile int requestTimeout = 60 * 1000;
private volatile boolean requestUsingCaches = false;
Expand All @@ -20,11 +17,6 @@ static class Context {

private static volatile URI apiBaseURI = API_BASE_URI;

enum AuthKeyType {
API_KEY,
TOKEN
}

private static final String VERSION = "2.7.0";

public static final String USER_AGENT = "intercom-java/" + Intercom.VERSION;
Expand Down Expand Up @@ -80,30 +72,9 @@ public static void setHttpConnectorSupplier(HttpConnectorSupplier supplier) {
Intercom.httpConnectorSupplier = supplier;
}

public static String getAppID() {
return getContext().appID;
}

public static void setAppID(String appID) {
getContext().appID = appID;
}

public static void setToken(String token) {
Context context = getContext();
context.authKeyType = AuthKeyType.TOKEN;
context.token = token;
context.apiKey = null;
}

public static String getApiKey() {
return getContext().apiKey;
}

public static void setApiKey(String apiKey) {
Context context = getContext();
context.authKeyType = AuthKeyType.API_KEY;
context.apiKey = apiKey;
context.token = null;
}

public static URI getApiBaseURI() {
Expand All @@ -114,10 +85,6 @@ public static void setApiBaseURI(URI apiBaseURI) {
Intercom.apiBaseURI = apiBaseURI;
}

static AuthKeyType getAuthKeyType() {
return getContext().authKeyType;
}

public static String getToken() {
return getContext().token;
}
Expand Down
62 changes: 16 additions & 46 deletions intercom-java/src/test/java/io/intercom/api/IntercomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,16 @@ public void testUseThreadLocal() {
assertEquals("tx", Intercom.getToken());
}

@Test
public void testApiKey() {
Intercom.setApiKey("k1");
assertEquals("k1", Intercom.getApiKey());
assertEquals(Intercom.AuthKeyType.API_KEY, Intercom.getAuthKeyType());
assertNull(Intercom.getToken());
}

@Test
public void testToken() {
Intercom.setToken("t1");
assertEquals("t1", Intercom.getToken());
assertEquals(Intercom.AuthKeyType.TOKEN, Intercom.getAuthKeyType());
assertNull(Intercom.getApiKey());
}

@Test
public void testStaticContext() throws Exception {
Intercom.setApiKey("k1");
assertEquals("k1", Intercom.getApiKey());
assertNull(Intercom.getToken());
assertEquals(Intercom.AuthKeyType.API_KEY, Intercom.getAuthKeyType());
Intercom.setAppID("app1");
assertEquals("app1", Intercom.getAppID());
Intercom.setToken("t1");
assertEquals("t1", Intercom.getToken());
Intercom.setConnectionTimeout(98765);
assertEquals(98765, Intercom.getConnectionTimeout());
Intercom.setRequestTimeout(12345);
Expand All @@ -66,15 +52,11 @@ public void testStaticContext() throws Exception {
tt1.waitUntilComplete();
tt2.waitUntilComplete();

assertEquals(Intercom.getApiKey(), tt1.apiKey);
assertEquals(Intercom.getAuthKeyType(), tt1.authKeyType);
assertEquals(Intercom.getToken(), tt1.token);
assertEquals(Intercom.getConnectionTimeout(), tt1.connectionTimeout);
assertEquals(Intercom.getRequestTimeout(), tt1.requestTimeout);
assertEquals(Intercom.isRequestUsingCaches(), tt1.requestUsingCaches);

assertEquals(Intercom.getApiKey(), tt2.apiKey);
assertEquals(Intercom.getAuthKeyType(), tt2.authKeyType);
assertEquals(Intercom.getToken(), tt2.token);
assertEquals(Intercom.getConnectionTimeout(), tt2.connectionTimeout);
assertEquals(Intercom.getRequestTimeout(), tt2.requestTimeout);
Expand All @@ -93,15 +75,11 @@ public void testThreadLocalContext() throws Exception {
tt2.waitUntilComplete();

assertEquals(tt1.localToken, tt1.token);
assertNull(tt1.apiKey);
assertEquals(Intercom.AuthKeyType.TOKEN, tt1.authKeyType);
assertEquals(tt1.localConnectionTimeout, tt1.connectionTimeout);
assertEquals(tt1.localRequestTimeout, tt1.requestTimeout);
assertEquals(tt1.localRequestUsingCaches, tt1.requestUsingCaches);

assertEquals(tt2.localApiKey, tt2.apiKey);
assertNull(tt2.token);
assertEquals(Intercom.AuthKeyType.API_KEY, tt2.authKeyType);
assertEquals(tt2.localToken, tt2.token);
assertEquals(tt2.localConnectionTimeout, tt2.connectionTimeout);
assertEquals(tt2.localRequestTimeout, tt2.requestTimeout);
assertEquals(tt2.localRequestUsingCaches, tt2.requestUsingCaches);
Expand All @@ -111,44 +89,40 @@ public void testThreadLocalContext() throws Exception {
public void testClearThreadLocalContexts() throws Exception {
Intercom.setUseThreadLocal(true);

Intercom.setApiKey("testKey");
assertEquals("testKey", Intercom.getApiKey());
Intercom.setToken("testToken");
assertEquals("testToken", Intercom.getToken());

Intercom.clearThreadLocalContexts();
assertNull(Intercom.getApiKey());
assertNull(Intercom.getToken());

Intercom.setApiKey("testKey2");
assertEquals("testKey2", Intercom.getApiKey());
Intercom.setToken("testToken2");
assertEquals("testToken2", Intercom.getToken());
}

@Test
public void testClearThreadLocalContext() throws Exception {
Intercom.setUseThreadLocal(true);

Intercom.setApiKey("testKey");
assertEquals("testKey", Intercom.getApiKey());
Intercom.setToken("testToken");
assertEquals("testToken", Intercom.getToken());

Intercom.clearThreadLocalContext();
assertNull(Intercom.getApiKey());
assertNull(Intercom.getToken());

Intercom.setApiKey("testKey2");
assertEquals("testKey2", Intercom.getApiKey());
Intercom.setToken("testToken2");
assertEquals("testToken2", Intercom.getToken());
}

class ThreadTester implements Runnable {
String apiKey, appId, token;
Intercom.AuthKeyType authKeyType;
String token;
int connectionTimeout = -1;
int requestTimeout = -1;
Boolean requestUsingCaches;
boolean completed = false;

@Override
public void run() {
apiKey = Intercom.getApiKey();
authKeyType = Intercom.getAuthKeyType();
token = Intercom.getToken();
appId = Intercom.getAppID();
connectionTimeout = Intercom.getConnectionTimeout();
requestTimeout = Intercom.getRequestTimeout();
requestUsingCaches = Intercom.isRequestUsingCaches();
Expand All @@ -170,7 +144,6 @@ void waitUntilComplete() throws InterruptedException {
class ThreadLocalTester1 extends ThreadTester {
final Random rnd = new Random();
final String localToken = "tx";
final String localAppId = "appx";
final int localConnectionTimeout = rnd.nextInt();
final int localRequestTimeout = rnd.nextInt();
final boolean localRequestUsingCaches = rnd.nextBoolean();
Expand All @@ -179,7 +152,6 @@ class ThreadLocalTester1 extends ThreadTester {
public void run() {
Intercom.clearThreadLocalContext();
Intercom.setToken(localToken);
Intercom.setAppID(localAppId);
Intercom.setConnectionTimeout(localConnectionTimeout);
Intercom.setRequestTimeout(localRequestTimeout);
Intercom.setRequestUsingCaches(localRequestUsingCaches);
Expand All @@ -189,17 +161,15 @@ public void run() {

class ThreadLocalTester2 extends ThreadTester {
final Random rnd = new Random();
final String localApiKey = "api";
final String localAppId = "appId";
final String localToken = "t2";
final int localConnectionTimeout = rnd.nextInt();
final int localRequestTimeout = rnd.nextInt();
final boolean localRequestUsingCaches = rnd.nextBoolean();

@Override
public void run() {
Intercom.clearThreadLocalContext();
Intercom.setApiKey(localApiKey);
Intercom.setAppID(localAppId);
Intercom.setToken(localToken);
Intercom.setConnectionTimeout(localConnectionTimeout);
Intercom.setRequestTimeout(localRequestTimeout);
Intercom.setRequestUsingCaches(localRequestUsingCaches);
Expand Down