Skip to content

Commit 0df0db7

Browse files
jimmyjamesjimmyjames
authored
Use TokenProvider instead of plain string token (#486)
* Use TokenProvider instead of plain string token * entity cleanup * whitespace cleanup
1 parent 29b14ed commit 0df0db7

44 files changed

Lines changed: 509 additions & 601 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/auth0/client/auth/AuthAPI.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public Request<UserInfo> userInfo(String accessToken) {
249249
.addPathSegment("userinfo")
250250
.build()
251251
.toString();
252-
BaseRequest<UserInfo> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<UserInfo>() {
252+
BaseRequest<UserInfo> request = new BaseRequest<>(client, null, url, HttpMethod.GET, new TypeReference<UserInfo>() {
253253
});
254254
request.addHeader("Authorization", "Bearer " + accessToken);
255255
return request;
@@ -284,7 +284,7 @@ public Request<Void> resetPassword(String email, String connection) {
284284
.addPathSegment("change_password")
285285
.build()
286286
.toString();
287-
VoidRequest request = new VoidRequest(client, url, HttpMethod.POST);
287+
VoidRequest request = new VoidRequest(client, null, url, HttpMethod.POST);
288288
request.addParameter(KEY_CLIENT_ID, clientId);
289289
request.addParameter(KEY_EMAIL, email);
290290
request.addParameter(KEY_CONNECTION, connection);
@@ -659,7 +659,7 @@ public Request<Void> revokeToken(String refreshToken) {
659659
.addPathSegment(PATH_REVOKE)
660660
.build()
661661
.toString();
662-
VoidRequest request = new VoidRequest(client, url, HttpMethod.POST);
662+
VoidRequest request = new VoidRequest(client, null, url, HttpMethod.POST);
663663
request.addParameter(KEY_CLIENT_ID, clientId);
664664
request.addParameter(KEY_TOKEN, refreshToken);
665665
addSecret(request, false);
@@ -809,7 +809,7 @@ public BaseRequest<PasswordlessEmailResponse> startPasswordlessEmailFlow(String
809809
.build()
810810
.toString();
811811

812-
BaseRequest<PasswordlessEmailResponse> request = new BaseRequest<>(client, url, HttpMethod.POST, new TypeReference<PasswordlessEmailResponse>() {
812+
BaseRequest<PasswordlessEmailResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<PasswordlessEmailResponse>() {
813813
});
814814
request.addParameter(KEY_CLIENT_ID, clientId);
815815
request.addParameter(KEY_CONNECTION, "email");
@@ -851,7 +851,7 @@ public BaseRequest<PasswordlessSmsResponse> startPasswordlessSmsFlow(String phon
851851
.build()
852852
.toString();
853853

854-
BaseRequest<PasswordlessSmsResponse> request = new BaseRequest<>(client, url, HttpMethod.POST, new TypeReference<PasswordlessSmsResponse>() {
854+
BaseRequest<PasswordlessSmsResponse> request = new BaseRequest<>(client, null, url, HttpMethod.POST, new TypeReference<PasswordlessSmsResponse>() {
855855
});
856856
request.addParameter(KEY_CLIENT_ID, clientId);
857857
request.addParameter(KEY_CONNECTION, "sms");

‎src/main/java/com/auth0/client/mgmt/ActionsEntity.java‎

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ public class ActionsEntity extends BaseManagementEntity {
3333
private final static String EXECUTIONS_PATH = "executions";
3434
private final static String BINDINGS_PATH = "bindings";
3535

36-
private final static String AUTHORIZATION_HEADER = "Authorization";
37-
38-
ActionsEntity(Auth0HttpClient client, HttpUrl baseUrl, String apiToken) {
39-
super(client, baseUrl, apiToken);
36+
ActionsEntity(Auth0HttpClient client, HttpUrl baseUrl, TokenProvider tokenProvider) {
37+
super(client, baseUrl, tokenProvider);
4038
}
4139

4240
/**
@@ -57,10 +55,9 @@ public Request<Action> create(Action action) {
5755

5856
String url = builder.build().toString();
5957

60-
BaseRequest<Action> request = new BaseRequest<>(client, url, HttpMethod.POST, new TypeReference<Action>() {
58+
BaseRequest<Action> request = new BaseRequest<>(client, tokenProvider, url, HttpMethod.POST, new TypeReference<Action>() {
6159
});
6260

63-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
6461
request.setBody(action);
6562
return request;
6663
}
@@ -84,11 +81,8 @@ public Request<Action> get(String actionId) {
8481
.build()
8582
.toString();
8683

87-
BaseRequest<Action> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<Action>() {
84+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<Action>() {
8885
});
89-
90-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
91-
return request;
9286
}
9387

9488
/**
@@ -125,9 +119,7 @@ public Request<Void> delete(String actionId, boolean force) {
125119
.build()
126120
.toString();
127121

128-
VoidRequest voidRequest = new VoidRequest(client, url, HttpMethod.DELETE);
129-
voidRequest.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
130-
return voidRequest;
122+
return new VoidRequest(client, tokenProvider, url, HttpMethod.DELETE);
131123
}
132124

133125
/**
@@ -144,11 +136,8 @@ public Request<Triggers> getTriggers() {
144136
.build()
145137
.toString();
146138

147-
BaseRequest<Triggers> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<Triggers>() {
139+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<Triggers>() {
148140
});
149-
150-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
151-
return request;
152141
}
153142

154143
/**
@@ -173,11 +162,10 @@ public Request<Action> update(String actionId, Action action) {
173162
.build()
174163
.toString();
175164

176-
BaseRequest<Action> request = new BaseRequest<>(client, url, HttpMethod.PATCH, new TypeReference<Action>() {
165+
BaseRequest<Action> request = new BaseRequest<>(client, tokenProvider, url, HttpMethod.PATCH, new TypeReference<Action>() {
177166
});
178167

179168
request.setBody(action);
180-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
181169
return request;
182170
}
183171

@@ -204,11 +192,8 @@ public Request<Version> deploy(String actionId) {
204192
.build()
205193
.toString();
206194

207-
EmptyBodyRequest<Version> request = new EmptyBodyRequest<>(client, url, HttpMethod.POST, new TypeReference<Version>() {
195+
return new EmptyBodyRequest<>(client, tokenProvider, url, HttpMethod.POST, new TypeReference<Version>() {
208196
});
209-
210-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
211-
return request;
212197
}
213198

214199
/**
@@ -235,11 +220,8 @@ public Request<Version> getVersion(String actionId, String actionVersionId) {
235220
.build()
236221
.toString();
237222

238-
BaseRequest<Version> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<Version>() {
223+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<Version>() {
239224
});
240-
241-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
242-
return request;
243225
}
244226

245227
/**
@@ -269,11 +251,9 @@ public Request<Version> rollBackToVersion(String actionId, String actionVersionI
269251
.toString();
270252

271253
// Needed to successfully call the roll-back endpoint until DXEX-1738 is resolved.
272-
EmptyObjectRequest<Version> request = new EmptyObjectRequest<>(client, url, HttpMethod.POST, new TypeReference<Version>() {
273-
});
274254

275-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
276-
return request;
255+
return new EmptyObjectRequest<>(client, tokenProvider, url, HttpMethod.POST, new TypeReference<Version>() {
256+
});
277257
}
278258

279259
/**
@@ -297,11 +277,8 @@ public Request<Execution> getExecution(String executionId) {
297277
.build()
298278
.toString();
299279

300-
BaseRequest<Execution> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<Execution>() {
280+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<Execution>() {
301281
});
302-
303-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
304-
return request;
305282
}
306283

307284
/**
@@ -321,11 +298,9 @@ public Request<ActionsPage> list(ActionsFilter filter) {
321298
applyFilter(filter, builder);
322299

323300
String url = builder.build().toString();
324-
BaseRequest<ActionsPage> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<ActionsPage>() {
325-
});
326301

327-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
328-
return request;
302+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<ActionsPage>() {
303+
});
329304
}
330305

331306
/**
@@ -353,11 +328,9 @@ public Request<VersionsPage> getVersions(String actionId, PageFilter filter) {
353328
applyFilter(filter, builder);
354329

355330
String url = builder.build().toString();
356-
BaseRequest<VersionsPage> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<VersionsPage>() {
357-
});
358331

359-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
360-
return request;
332+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<VersionsPage>() {
333+
});
361334
}
362335

363336
/**
@@ -386,11 +359,9 @@ public Request<BindingsPage> getTriggerBindings(String triggerId, PageFilter fil
386359
applyFilter(filter, builder);
387360

388361
String url = builder.build().toString();
389-
BaseRequest<BindingsPage> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<BindingsPage>() {
390-
});
391362

392-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
393-
return request;
363+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<BindingsPage>() {
364+
});
394365
}
395366

396367
/**
@@ -418,11 +389,10 @@ public Request<BindingsPage> updateTriggerBindings(String triggerId, BindingsUpd
418389
.build()
419390
.toString();
420391

421-
BaseRequest<BindingsPage> request = new BaseRequest<>(client, url, HttpMethod.PATCH, new TypeReference<BindingsPage>() {
392+
BaseRequest<BindingsPage> request = new BaseRequest<>(client, tokenProvider, url, HttpMethod.PATCH, new TypeReference<BindingsPage>() {
422393
});
423394

424395
request.setBody(bindingsUpdateRequest);
425-
request.addHeader(AUTHORIZATION_HEADER, "Bearer " + apiToken);
426396
return request;
427397
}
428398

@@ -434,8 +404,8 @@ private void applyFilter(BaseFilter filter, HttpUrl.Builder builder) {
434404

435405
// Temporary request implementation to send an empty json object on the request body.
436406
private static class EmptyObjectRequest<T> extends EmptyBodyRequest<T> {
437-
EmptyObjectRequest(Auth0HttpClient client, String url, HttpMethod method, TypeReference<T> tType) {
438-
super(client, url, method, tType);
407+
EmptyObjectRequest(Auth0HttpClient client, TokenProvider tokenProvider, String url, HttpMethod method, TypeReference<T> tType) {
408+
super(client, tokenProvider, url, method, tType);
439409
}
440410

441411
@Override

‎src/main/java/com/auth0/client/mgmt/AttackProtectionEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* @see ManagementAPI
1616
*/
1717
public class AttackProtectionEntity extends BaseManagementEntity {
18-
AttackProtectionEntity(Auth0HttpClient client, HttpUrl baseUrl, String apiToken) {
19-
super(client, baseUrl, apiToken);
18+
AttackProtectionEntity(Auth0HttpClient client, HttpUrl baseUrl, TokenProvider tokenProvider) {
19+
super(client, baseUrl, tokenProvider);
2020
}
2121

2222
/**

‎src/main/java/com/auth0/client/mgmt/BaseManagementEntity.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,31 @@
1010

1111
abstract class BaseManagementEntity {
1212
protected final Auth0HttpClient client;
13-
// TODO decouple from OkHttp!!
1413
protected final HttpUrl baseUrl;
15-
protected final String apiToken;
14+
protected final TokenProvider tokenProvider;
1615

17-
BaseManagementEntity(Auth0HttpClient client, HttpUrl baseUrl, String apiToken) {
16+
BaseManagementEntity(Auth0HttpClient client, HttpUrl baseUrl, TokenProvider tokenProvider) {
1817
this.client = client;
1918
this.baseUrl = baseUrl;
20-
this.apiToken = apiToken;
19+
this.tokenProvider = tokenProvider;
2120
}
2221

2322
protected Request<Void> voidRequest(HttpMethod method, Consumer<RequestBuilder<Void>> customizer) {
2423
return customizeRequest(
25-
new RequestBuilder<>(client, method, baseUrl, new TypeReference<Void>() {
24+
new RequestBuilder<>(client, tokenProvider, method, baseUrl, new TypeReference<Void>() {
2625
}),
2726
customizer
2827
);
2928
}
3029

3130
protected <T> Request<T> request(HttpMethod method, TypeReference<T> target, Consumer<RequestBuilder<T>> customizer) {
3231
return customizeRequest(
33-
new RequestBuilder<>(client, method, baseUrl, target),
32+
new RequestBuilder<>(client, tokenProvider, method, baseUrl, target),
3433
customizer
3534
);
3635
}
3736

3837
private <T> Request<T> customizeRequest(RequestBuilder<T> builder, Consumer<RequestBuilder<T>> customizer) {
39-
builder.withHeader("Authorization", "Bearer " + apiToken);
4038
customizer.accept(builder);
4139
return builder.build();
4240
}

‎src/main/java/com/auth0/client/mgmt/BlacklistsEntity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
@SuppressWarnings("WeakerAccess")
2323
public class BlacklistsEntity extends BaseManagementEntity {
2424

25-
BlacklistsEntity(Auth0HttpClient client, HttpUrl baseUrl, String apiToken) {
26-
super(client, baseUrl, apiToken);
25+
BlacklistsEntity(Auth0HttpClient client, HttpUrl baseUrl, TokenProvider tokenProvider) {
26+
super(client, baseUrl, tokenProvider);
2727
}
2828

2929
/**
@@ -42,10 +42,8 @@ public Request<List<Token>> getBlacklist(String audience) {
4242
.addQueryParameter("aud", audience)
4343
.build()
4444
.toString();
45-
BaseRequest<List<Token>> request = new BaseRequest<>(client, url, HttpMethod.GET, new TypeReference<List<Token>>() {
45+
return new BaseRequest<>(client, tokenProvider, url, HttpMethod.GET, new TypeReference<List<Token>>() {
4646
});
47-
request.addHeader("Authorization", "Bearer " + apiToken);
48-
return request;
4947
}
5048

5149
/**
@@ -63,8 +61,7 @@ public Request<Void> blacklistToken(Token token) {
6361
.addPathSegments("api/v2/blacklists/tokens")
6462
.build()
6563
.toString();
66-
VoidRequest request = new VoidRequest(client, url, HttpMethod.POST);
67-
request.addHeader("Authorization", "Bearer " + apiToken);
64+
VoidRequest request = new VoidRequest(client, tokenProvider, url, HttpMethod.POST);
6865
request.setBody(token);
6966
return request;
7067
}

‎src/main/java/com/auth0/client/mgmt/BrandingEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@SuppressWarnings("WeakerAccess")
2121
public class BrandingEntity extends BaseManagementEntity {
2222

23-
BrandingEntity(Auth0HttpClient client, HttpUrl baseUrl, String apiToken) {
24-
super(client, baseUrl, apiToken);
23+
BrandingEntity(Auth0HttpClient client, HttpUrl baseUrl, TokenProvider tokenProvider) {
24+
super(client, baseUrl, tokenProvider);
2525
}
2626

2727
/**

0 commit comments

Comments
 (0)