Skip to content

Commit 0ec97e7

Browse files
thewheatmmartinic
thewheat
authored and
mmartinic
committed
Remove API Key references (#230)
1 parent 224cefb commit 0ec97e7

File tree

3 files changed

+17
-87
lines changed

3 files changed

+17
-87
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,7 @@ private HttpURLConnection prepareConnection(HttpURLConnection conn) {
236236
}
237237

238238
private Map<String, String> createAuthorizationHeaders() {
239-
switch (Intercom.getAuthKeyType()) {
240-
case API_KEY:
241-
headers.put("Authorization", "Basic " + generateAuthString(Intercom.getAppID(),Intercom.getApiKey()));
242-
break;
243-
case TOKEN:
244-
headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
245-
break;
246-
}
239+
headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
247240
return headers;
248241
}
249242

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
public class Intercom {
66

77
static class Context {
8-
private volatile AuthKeyType authKeyType = AuthKeyType.API_KEY;
9-
private volatile String apiKey;
108
private volatile String token;
11-
private volatile String appID;
129
private volatile int connectionTimeout = 3 * 1000;
1310
private volatile int requestTimeout = 60 * 1000;
1411
private volatile boolean requestUsingCaches = false;
@@ -20,11 +17,6 @@ static class Context {
2017

2118
private static volatile URI apiBaseURI = API_BASE_URI;
2219

23-
enum AuthKeyType {
24-
API_KEY,
25-
TOKEN
26-
}
27-
2820
private static final String VERSION = "2.7.0";
2921

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

83-
public static String getAppID() {
84-
return getContext().appID;
85-
}
86-
87-
public static void setAppID(String appID) {
88-
getContext().appID = appID;
89-
}
90-
9175
public static void setToken(String token) {
9276
Context context = getContext();
93-
context.authKeyType = AuthKeyType.TOKEN;
9477
context.token = token;
95-
context.apiKey = null;
96-
}
97-
98-
public static String getApiKey() {
99-
return getContext().apiKey;
100-
}
101-
102-
public static void setApiKey(String apiKey) {
103-
Context context = getContext();
104-
context.authKeyType = AuthKeyType.API_KEY;
105-
context.apiKey = apiKey;
106-
context.token = null;
10778
}
10879

10980
public static URI getApiBaseURI() {
@@ -114,10 +85,6 @@ public static void setApiBaseURI(URI apiBaseURI) {
11485
Intercom.apiBaseURI = apiBaseURI;
11586
}
11687

117-
static AuthKeyType getAuthKeyType() {
118-
return getContext().authKeyType;
119-
}
120-
12188
public static String getToken() {
12289
return getContext().token;
12390
}

‎intercom-java/src/test/java/io/intercom/api/IntercomTest.java‎

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,16 @@ public void testUseThreadLocal() {
2828
assertEquals("tx", Intercom.getToken());
2929
}
3030

31-
@Test
32-
public void testApiKey() {
33-
Intercom.setApiKey("k1");
34-
assertEquals("k1", Intercom.getApiKey());
35-
assertEquals(Intercom.AuthKeyType.API_KEY, Intercom.getAuthKeyType());
36-
assertNull(Intercom.getToken());
37-
}
38-
3931
@Test
4032
public void testToken() {
4133
Intercom.setToken("t1");
4234
assertEquals("t1", Intercom.getToken());
43-
assertEquals(Intercom.AuthKeyType.TOKEN, Intercom.getAuthKeyType());
44-
assertNull(Intercom.getApiKey());
4535
}
4636

4737
@Test
4838
public void testStaticContext() throws Exception {
49-
Intercom.setApiKey("k1");
50-
assertEquals("k1", Intercom.getApiKey());
51-
assertNull(Intercom.getToken());
52-
assertEquals(Intercom.AuthKeyType.API_KEY, Intercom.getAuthKeyType());
53-
Intercom.setAppID("app1");
54-
assertEquals("app1", Intercom.getAppID());
39+
Intercom.setToken("t1");
40+
assertEquals("t1", Intercom.getToken());
5541
Intercom.setConnectionTimeout(98765);
5642
assertEquals(98765, Intercom.getConnectionTimeout());
5743
Intercom.setRequestTimeout(12345);
@@ -66,15 +52,11 @@ public void testStaticContext() throws Exception {
6652
tt1.waitUntilComplete();
6753
tt2.waitUntilComplete();
6854

69-
assertEquals(Intercom.getApiKey(), tt1.apiKey);
70-
assertEquals(Intercom.getAuthKeyType(), tt1.authKeyType);
7155
assertEquals(Intercom.getToken(), tt1.token);
7256
assertEquals(Intercom.getConnectionTimeout(), tt1.connectionTimeout);
7357
assertEquals(Intercom.getRequestTimeout(), tt1.requestTimeout);
7458
assertEquals(Intercom.isRequestUsingCaches(), tt1.requestUsingCaches);
7559

76-
assertEquals(Intercom.getApiKey(), tt2.apiKey);
77-
assertEquals(Intercom.getAuthKeyType(), tt2.authKeyType);
7860
assertEquals(Intercom.getToken(), tt2.token);
7961
assertEquals(Intercom.getConnectionTimeout(), tt2.connectionTimeout);
8062
assertEquals(Intercom.getRequestTimeout(), tt2.requestTimeout);
@@ -93,15 +75,11 @@ public void testThreadLocalContext() throws Exception {
9375
tt2.waitUntilComplete();
9476

9577
assertEquals(tt1.localToken, tt1.token);
96-
assertNull(tt1.apiKey);
97-
assertEquals(Intercom.AuthKeyType.TOKEN, tt1.authKeyType);
9878
assertEquals(tt1.localConnectionTimeout, tt1.connectionTimeout);
9979
assertEquals(tt1.localRequestTimeout, tt1.requestTimeout);
10080
assertEquals(tt1.localRequestUsingCaches, tt1.requestUsingCaches);
10181

102-
assertEquals(tt2.localApiKey, tt2.apiKey);
103-
assertNull(tt2.token);
104-
assertEquals(Intercom.AuthKeyType.API_KEY, tt2.authKeyType);
82+
assertEquals(tt2.localToken, tt2.token);
10583
assertEquals(tt2.localConnectionTimeout, tt2.connectionTimeout);
10684
assertEquals(tt2.localRequestTimeout, tt2.requestTimeout);
10785
assertEquals(tt2.localRequestUsingCaches, tt2.requestUsingCaches);
@@ -111,44 +89,40 @@ public void testThreadLocalContext() throws Exception {
11189
public void testClearThreadLocalContexts() throws Exception {
11290
Intercom.setUseThreadLocal(true);
11391

114-
Intercom.setApiKey("testKey");
115-
assertEquals("testKey", Intercom.getApiKey());
92+
Intercom.setToken("testToken");
93+
assertEquals("testToken", Intercom.getToken());
11694

11795
Intercom.clearThreadLocalContexts();
118-
assertNull(Intercom.getApiKey());
96+
assertNull(Intercom.getToken());
11997

120-
Intercom.setApiKey("testKey2");
121-
assertEquals("testKey2", Intercom.getApiKey());
98+
Intercom.setToken("testToken2");
99+
assertEquals("testToken2", Intercom.getToken());
122100
}
123101

124102
@Test
125103
public void testClearThreadLocalContext() throws Exception {
126104
Intercom.setUseThreadLocal(true);
127105

128-
Intercom.setApiKey("testKey");
129-
assertEquals("testKey", Intercom.getApiKey());
106+
Intercom.setToken("testToken");
107+
assertEquals("testToken", Intercom.getToken());
130108

131109
Intercom.clearThreadLocalContext();
132-
assertNull(Intercom.getApiKey());
110+
assertNull(Intercom.getToken());
133111

134-
Intercom.setApiKey("testKey2");
135-
assertEquals("testKey2", Intercom.getApiKey());
112+
Intercom.setToken("testToken2");
113+
assertEquals("testToken2", Intercom.getToken());
136114
}
137115

138116
class ThreadTester implements Runnable {
139-
String apiKey, appId, token;
140-
Intercom.AuthKeyType authKeyType;
117+
String token;
141118
int connectionTimeout = -1;
142119
int requestTimeout = -1;
143120
Boolean requestUsingCaches;
144121
boolean completed = false;
145122

146123
@Override
147124
public void run() {
148-
apiKey = Intercom.getApiKey();
149-
authKeyType = Intercom.getAuthKeyType();
150125
token = Intercom.getToken();
151-
appId = Intercom.getAppID();
152126
connectionTimeout = Intercom.getConnectionTimeout();
153127
requestTimeout = Intercom.getRequestTimeout();
154128
requestUsingCaches = Intercom.isRequestUsingCaches();
@@ -170,7 +144,6 @@ void waitUntilComplete() throws InterruptedException {
170144
class ThreadLocalTester1 extends ThreadTester {
171145
final Random rnd = new Random();
172146
final String localToken = "tx";
173-
final String localAppId = "appx";
174147
final int localConnectionTimeout = rnd.nextInt();
175148
final int localRequestTimeout = rnd.nextInt();
176149
final boolean localRequestUsingCaches = rnd.nextBoolean();
@@ -179,7 +152,6 @@ class ThreadLocalTester1 extends ThreadTester {
179152
public void run() {
180153
Intercom.clearThreadLocalContext();
181154
Intercom.setToken(localToken);
182-
Intercom.setAppID(localAppId);
183155
Intercom.setConnectionTimeout(localConnectionTimeout);
184156
Intercom.setRequestTimeout(localRequestTimeout);
185157
Intercom.setRequestUsingCaches(localRequestUsingCaches);
@@ -189,17 +161,15 @@ public void run() {
189161

190162
class ThreadLocalTester2 extends ThreadTester {
191163
final Random rnd = new Random();
192-
final String localApiKey = "api";
193-
final String localAppId = "appId";
164+
final String localToken = "t2";
194165
final int localConnectionTimeout = rnd.nextInt();
195166
final int localRequestTimeout = rnd.nextInt();
196167
final boolean localRequestUsingCaches = rnd.nextBoolean();
197168

198169
@Override
199170
public void run() {
200171
Intercom.clearThreadLocalContext();
201-
Intercom.setApiKey(localApiKey);
202-
Intercom.setAppID(localAppId);
172+
Intercom.setToken(localToken);
203173
Intercom.setConnectionTimeout(localConnectionTimeout);
204174
Intercom.setRequestTimeout(localRequestTimeout);
205175
Intercom.setRequestUsingCaches(localRequestUsingCaches);

0 commit comments

Comments
 (0)