Skip to content

Commit da620e9

Browse files
tanya732tanya732
committed
Updated time attribute to resetAfter
1 parent 3fe4657 commit da620e9

File tree

4 files changed

+132
-13
lines changed

4 files changed

+132
-13
lines changed

‎src/main/java/com/auth0/net/TokenQuotaLimit.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
public class TokenQuotaLimit {
99
private int quota;
1010
private int remaining;
11-
private int time;
11+
private int resetAfter;
1212

13-
public TokenQuotaLimit(int quota, int remaining, int time) {
13+
public TokenQuotaLimit(int quota, int remaining, int resetAfter) {
1414
this.quota = quota;
1515
this.remaining = remaining;
16-
this.time = time;
16+
this.resetAfter = resetAfter;
1717
}
1818

1919
public int getQuota() {
@@ -24,7 +24,7 @@ public int getRemaining() {
2424
return remaining;
2525
}
2626

27-
public int getTime() {
28-
return time;
27+
public int getResetAfter() {
28+
return resetAfter;
2929
}
3030
}

‎src/test/java/com/auth0/net/BaseRequestTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,13 +494,13 @@ public String getTokenQuotaString() {
494494
StringBuilder builder = new StringBuilder();
495495

496496
builder.append(String.format("b=per_hour;q=%d;r=%d;t=%d",
497-
perHourLimit.getQuota(), perHourLimit.getRemaining(), perHourLimit.getTime()));
497+
perHourLimit.getQuota(), perHourLimit.getRemaining(), perHourLimit.getResetAfter()));
498498

499499
if (builder.length() > 0) {
500500
builder.append(",");
501501
}
502502
builder.append(String.format("b=per_day;q=%d;r=%d;t=%d",
503-
perDayLimit.getQuota(), perDayLimit.getRemaining(), perDayLimit.getTime()));
503+
perDayLimit.getQuota(), perDayLimit.getRemaining(), perDayLimit.getResetAfter()));
504504

505505
return builder.toString();
506506
}

‎src/test/java/com/auth0/net/MultipartRequestTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,19 +391,19 @@ public void shouldParseRateLimitsWithAllHeaders() throws Exception {
391391
assertThat(rateLimitException.getClientQuotaLimit().getPerDay(), is(notNullValue()));
392392
assertThat(rateLimitException.getClientQuotaLimit().getPerHour().getQuota(), is(100));
393393
assertThat(rateLimitException.getClientQuotaLimit().getPerHour().getRemaining(), is(80));
394-
assertThat(rateLimitException.getClientQuotaLimit().getPerHour().getTime(), is(3600));
394+
assertThat(rateLimitException.getClientQuotaLimit().getPerHour().getResetAfter(), is(3600));
395395
assertThat(rateLimitException.getClientQuotaLimit().getPerDay().getQuota(), is(100));
396396
assertThat(rateLimitException.getClientQuotaLimit().getPerDay().getRemaining(), is(90));
397-
assertThat(rateLimitException.getClientQuotaLimit().getPerDay().getTime(), is(86400));
397+
assertThat(rateLimitException.getClientQuotaLimit().getPerDay().getResetAfter(), is(86400));
398398
assertThat(rateLimitException.getOrganizationQuotaLimit(), is(notNullValue()));
399399
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerHour(), is(notNullValue()));
400400
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerDay(), is(notNullValue()));
401401
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerHour().getQuota(), is(100));
402402
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerHour().getRemaining(), is(80));
403-
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerHour().getTime(), is(3600));
403+
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerHour().getResetAfter(), is(3600));
404404
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerDay().getQuota(), is(100));
405405
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerDay().getRemaining(), is(90));
406-
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerDay().getTime(), is(86400));
406+
assertThat(rateLimitException.getOrganizationQuotaLimit().getPerDay().getResetAfter(), is(86400));
407407
}
408408

409409
@Test
@@ -442,15 +442,15 @@ public String getTokenQuotaString() {
442442

443443
if (perHourLimit != null) {
444444
builder.append(String.format("b=per_hour;q=%d;r=%d;t=%d",
445-
perHourLimit.getQuota(), perHourLimit.getRemaining(), perHourLimit.getTime()));
445+
perHourLimit.getQuota(), perHourLimit.getRemaining(), perHourLimit.getResetAfter()));
446446
}
447447

448448
if (perDayLimit != null) {
449449
if (builder.length() > 0) {
450450
builder.append(",");
451451
}
452452
builder.append(String.format("b=per_day;q=%d;r=%d;t=%d",
453-
perDayLimit.getQuota(), perDayLimit.getRemaining(), perDayLimit.getTime()));
453+
perDayLimit.getQuota(), perDayLimit.getRemaining(), perDayLimit.getResetAfter()));
454454
}
455455

456456
return builder.toString();

‎src/test/java/com/auth0/utils/HttpResponseHeadersUtilsTest.java‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
package com.auth0.utils;
2+
3+
import com.auth0.net.TokenQuotaBucket;
4+
import com.auth0.net.TokenQuotaLimit;
5+
import org.junit.jupiter.api.Test;
6+
7+
import java.util.HashMap;
8+
import java.util.Map;
9+
10+
import static org.junit.jupiter.api.Assertions.*;
11+
import static org.junit.jupiter.api.Assertions.assertNull;
12+
13+
public class HttpResponseHeadersUtilsTest {
14+
15+
@Test
16+
public void testGetClientQuotaLimitWithValidHeader() {
17+
Map<String, String> headers = new HashMap<>();
18+
headers.put("auth0-client-quota-limit", "per_hour;q=100;r=50;t=3600,per_day;q=1000;r=500;t=86400");
19+
20+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.getClientQuotaLimit(headers);
21+
22+
assertNotNull(quotaBucket);
23+
assertNotNull(quotaBucket.getPerHour());
24+
assertEquals(100, quotaBucket.getPerHour().getQuota());
25+
assertEquals(50, quotaBucket.getPerHour().getRemaining());
26+
assertEquals(3600, quotaBucket.getPerHour().getResetAfter());
27+
28+
assertNotNull(quotaBucket.getPerDay());
29+
assertEquals(1000, quotaBucket.getPerDay().getQuota());
30+
assertEquals(500, quotaBucket.getPerDay().getRemaining());
31+
assertEquals(86400, quotaBucket.getPerDay().getResetAfter());
32+
}
33+
34+
@Test
35+
public void testGetClientQuotaLimitWithMissingHeader() {
36+
Map<String, String> headers = new HashMap<>();
37+
38+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.getClientQuotaLimit(headers);
39+
40+
assertNull(quotaBucket);
41+
}
42+
43+
@Test
44+
public void testGetClientQuotaLimitWithOneBucketHeader() {
45+
Map<String, String> headers = new HashMap<>();
46+
headers.put("auth0-client-quota-limit", "per_hour;q=200;r=100;t=3600");
47+
48+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.getClientQuotaLimit(headers);
49+
50+
assertNotNull(quotaBucket);
51+
assertNotNull(quotaBucket.getPerHour());
52+
assertEquals(200, quotaBucket.getPerHour().getQuota());
53+
assertEquals(100, quotaBucket.getPerHour().getRemaining());
54+
assertEquals(3600, quotaBucket.getPerHour().getResetAfter());
55+
56+
assertNull(quotaBucket.getPerDay());
57+
}
58+
59+
@Test
60+
public void testGetOrganizationQuotaLimitWithValidHeader() {
61+
Map<String, String> headers = new HashMap<>();
62+
headers.put("auth0-organization-quota-limit", "per_hour;q=200;r=100;t=3600");
63+
64+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.getOrganizationQuotaLimit(headers);
65+
66+
assertNotNull(quotaBucket);
67+
assertNotNull(quotaBucket.getPerHour());
68+
assertEquals(200, quotaBucket.getPerHour().getQuota());
69+
assertEquals(100, quotaBucket.getPerHour().getRemaining());
70+
assertEquals(3600, quotaBucket.getPerHour().getResetAfter());
71+
72+
assertNull(quotaBucket.getPerDay());
73+
}
74+
75+
@Test
76+
public void testGetOrganizationQuotaLimitWithMissingHeader() {
77+
Map<String, String> headers = new HashMap<>();
78+
79+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.getOrganizationQuotaLimit(headers);
80+
81+
assertNull(quotaBucket);
82+
}
83+
84+
@Test
85+
public void testParseQuotaWithValidInput() {
86+
String quotaHeader = "per_hour;q=300;r=150;t=3600,per_day;q=3000;r=1500;t=86400";
87+
88+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.parseQuota(quotaHeader);
89+
90+
assertNotNull(quotaBucket);
91+
assertNotNull(quotaBucket.getPerHour());
92+
assertEquals(300, quotaBucket.getPerHour().getQuota());
93+
assertEquals(150, quotaBucket.getPerHour().getRemaining());
94+
assertEquals(3600, quotaBucket.getPerHour().getResetAfter());
95+
96+
assertNotNull(quotaBucket.getPerDay());
97+
assertEquals(3000, quotaBucket.getPerDay().getQuota());
98+
assertEquals(1500, quotaBucket.getPerDay().getRemaining());
99+
assertEquals(86400, quotaBucket.getPerDay().getResetAfter());
100+
}
101+
102+
@Test
103+
public void testParseQuotaWithInvalidInput() {
104+
String quotaHeader = "invalid_format";
105+
106+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.parseQuota(quotaHeader);
107+
108+
assertNull(quotaBucket);
109+
}
110+
111+
@Test
112+
public void testParseQuotaWithEmptyInput() {
113+
String quotaHeader = "";
114+
115+
TokenQuotaBucket quotaBucket = HttpResponseHeadersUtils.parseQuota(quotaHeader);
116+
117+
assertNull(quotaBucket);
118+
}
119+
}

0 commit comments

Comments
 (0)