Skip to content

Commit 211e8dd

Browse files
tanya732tanya732
authored
Fix: URL Encodings (#766)
1 parent cec49b2 commit 211e8dd

File tree

3 files changed

+36
-28
lines changed

3 files changed

+36
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Request<Object> getCustomText(String prompt, String language) {
7272
.addPathSegments(ORGS_PATH)
7373
.addPathSegment(prompt)
7474
.addPathSegment("custom-text")
75-
.addPathSegments(language);
75+
.addPathSegment(language);
7676

7777
String url = builder.build().toString();
7878

@@ -99,7 +99,7 @@ public Request<Void> setCustomText(String prompt, String language, Object custom
9999
.addPathSegments(ORGS_PATH)
100100
.addPathSegment(prompt)
101101
.addPathSegment("custom-text")
102-
.addPathSegments(language);
102+
.addPathSegment(language);
103103

104104
String url = builder.build().toString();
105105

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Request<Role> get(String roleId) {
6969
HttpUrl.Builder builder = baseUrl
7070
.newBuilder()
7171
.addEncodedPathSegments("api/v2/roles")
72-
.addEncodedPathSegments(roleId);
72+
.addEncodedPathSegment(roleId);
7373

7474
String url = builder.build().toString();
7575
return new BaseRequest<>(this.client, tokenProvider, url, HttpMethod.GET, new TypeReference<Role>() {});
@@ -111,7 +111,7 @@ public Request<Void> delete(String roleId) {
111111
final String url = baseUrl
112112
.newBuilder()
113113
.addEncodedPathSegments("api/v2/roles")
114-
.addEncodedPathSegments(roleId)
114+
.addEncodedPathSegment(roleId)
115115
.build()
116116
.toString();
117117
return new VoidRequest(this.client, tokenProvider, url, HttpMethod.DELETE);
@@ -133,7 +133,7 @@ public Request<Role> update(String roleId, Role role) {
133133
String url = baseUrl
134134
.newBuilder()
135135
.addEncodedPathSegments("api/v2/roles")
136-
.addEncodedPathSegments(roleId)
136+
.addEncodedPathSegment(roleId)
137137
.build()
138138
.toString();
139139
BaseRequest<Role> request = new BaseRequest<>(this.client, tokenProvider, url, HttpMethod.PATCH, new TypeReference<Role>() {});
@@ -156,8 +156,8 @@ public Request<UsersPage> listUsers(String roleId, PageFilter filter) {
156156
HttpUrl.Builder builder = baseUrl
157157
.newBuilder()
158158
.addEncodedPathSegments("api/v2/roles")
159-
.addEncodedPathSegments(roleId)
160-
.addEncodedPathSegments("users");
159+
.addEncodedPathSegment(roleId)
160+
.addEncodedPathSegment("users");
161161
if (filter != null) {
162162
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
163163
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -186,8 +186,8 @@ public Request<Void> assignUsers(String roleId, List<String> userIds) {
186186
String url = baseUrl
187187
.newBuilder()
188188
.addEncodedPathSegments("api/v2/roles")
189-
.addEncodedPathSegments(roleId)
190-
.addEncodedPathSegments("users")
189+
.addEncodedPathSegment(roleId)
190+
.addEncodedPathSegment("users")
191191
.build()
192192
.toString();
193193
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.POST);
@@ -210,8 +210,8 @@ public Request<PermissionsPage> listPermissions(String roleId, PageFilter filter
210210
HttpUrl.Builder builder = baseUrl
211211
.newBuilder()
212212
.addEncodedPathSegments("api/v2/roles")
213-
.addEncodedPathSegments(roleId)
214-
.addEncodedPathSegments("permissions");
213+
.addEncodedPathSegment(roleId)
214+
.addEncodedPathSegment("permissions");
215215
if (filter != null) {
216216
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
217217
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -240,8 +240,8 @@ public Request<Void> removePermissions(String roleId, List<Permission> permissio
240240
final String url = baseUrl
241241
.newBuilder()
242242
.addEncodedPathSegments("api/v2/roles")
243-
.addEncodedPathSegments(roleId)
244-
.addEncodedPathSegments("permissions")
243+
.addEncodedPathSegment(roleId)
244+
.addEncodedPathSegment("permissions")
245245
.build()
246246
.toString();
247247
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.DELETE);
@@ -269,8 +269,8 @@ public Request<Void> addPermissions(String roleId, List<Permission> permissions)
269269
final String url = baseUrl
270270
.newBuilder()
271271
.addEncodedPathSegments("api/v2/roles")
272-
.addEncodedPathSegments(roleId)
273-
.addEncodedPathSegments("permissions")
272+
.addEncodedPathSegment(roleId)
273+
.addEncodedPathSegment("permissions")
274274
.build()
275275
.toString();
276276
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.POST);

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,17 @@ public Request<LogEventsPage> getLogEvents(String userId, LogEventFilter filter)
244244
* @return a Request to execute.
245245
*/
246246
public Request<Void> deleteAllAuthenticators(String userId) {
247+
247248
Asserts.assertNotNull(userId, "user id");
248249

249-
return voidRequest(HttpMethod.DELETE, builder -> builder.withPathSegments(String.format("api/v2/users/%s/authenticators", userId)));
250+
String url = baseUrl
251+
.newBuilder()
252+
.addPathSegments("api/v2/users")
253+
.addPathSegment(userId)
254+
.addPathSegment("authenticators")
255+
.build()
256+
.toString();
257+
return new VoidRequest(client, tokenProvider, url, HttpMethod.DELETE);
250258
}
251259

252260
/**
@@ -424,8 +432,8 @@ public Request<PermissionsPage> listPermissions(String userId, PageFilter filter
424432
HttpUrl.Builder builder = baseUrl
425433
.newBuilder()
426434
.addPathSegments("api/v2/users")
427-
.addPathSegments(userId)
428-
.addPathSegments("permissions");
435+
.addPathSegment(userId)
436+
.addPathSegment("permissions");
429437
if (filter != null) {
430438
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
431439
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -456,8 +464,8 @@ public Request<Void> removePermissions(String userId, List<Permission> permissio
456464
final String url = baseUrl
457465
.newBuilder()
458466
.addPathSegments("api/v2/users")
459-
.addPathSegments(userId)
460-
.addPathSegments("permissions")
467+
.addPathSegment(userId)
468+
.addPathSegment("permissions")
461469
.build()
462470
.toString();
463471
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.DELETE);
@@ -484,8 +492,8 @@ public Request<Void> addPermissions(String userId, List<Permission> permissions)
484492
final String url = baseUrl
485493
.newBuilder()
486494
.addPathSegments("api/v2/users")
487-
.addPathSegments(userId)
488-
.addPathSegments("permissions")
495+
.addPathSegment(userId)
496+
.addPathSegment("permissions")
489497
.build()
490498
.toString();
491499
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.POST);
@@ -507,8 +515,8 @@ public Request<RolesPage> listRoles(String userId, PageFilter filter) {
507515
HttpUrl.Builder builder = baseUrl
508516
.newBuilder()
509517
.addPathSegments("api/v2/users")
510-
.addPathSegments(userId)
511-
.addPathSegments("roles");
518+
.addPathSegment(userId)
519+
.addPathSegment("roles");
512520
if (filter != null) {
513521
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
514522
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -539,8 +547,8 @@ public Request<Void> removeRoles(String userId, List<String> roleIds) {
539547
final String url = baseUrl
540548
.newBuilder()
541549
.addPathSegments("api/v2/users")
542-
.addPathSegments(userId)
543-
.addPathSegments("roles")
550+
.addPathSegment(userId)
551+
.addPathSegment("roles")
544552
.build()
545553
.toString();
546554
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.DELETE);
@@ -567,8 +575,8 @@ public Request<Void> addRoles(String userId, List<String> roleIds) {
567575
final String url = baseUrl
568576
.newBuilder()
569577
.addPathSegments("api/v2/users")
570-
.addPathSegments(userId)
571-
.addPathSegments("roles")
578+
.addPathSegment(userId)
579+
.addPathSegment("roles")
572580
.build()
573581
.toString();
574582
VoidRequest request = new VoidRequest(this.client, tokenProvider, url, HttpMethod.POST);

0 commit comments

Comments
 (0)