Skip to content

Commit f116600

Browse files
committed
Made JwtToken parse(String token) as static method, + renamings
1 parent 1080098 commit f116600

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

tests/src/test/java/io/scalecube/security/tokens/jwt/JsonwebtokenResolverTests.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
public class JsonwebtokenResolverTests {
2525

2626
@Test
27-
void testResolveTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exception {
27+
void testResolveTokenTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exception {
2828
final var token = vaultEnvironment.newServiceToken();
2929

3030
final var jwtToken =
@@ -35,7 +35,7 @@ void testResolveTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exce
3535
.requestTimeout(Duration.ofSeconds(3))
3636
.keyTtl(1000)
3737
.build())
38-
.resolve(token)
38+
.resolveToken(token)
3939
.get(3, TimeUnit.SECONDS);
4040

4141
assertNotNull(jwtToken, "jwtToken");
@@ -47,15 +47,7 @@ void testResolveTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exce
4747
void testParseTokenSuccessfully(VaultEnvironment vaultEnvironment) {
4848
final var token = vaultEnvironment.newServiceToken();
4949

50-
final var jwtToken =
51-
new JsonwebtokenResolver(
52-
JwksKeyLocator.builder()
53-
.jwksUri(vaultEnvironment.jwksUri())
54-
.connectTimeout(Duration.ofSeconds(3))
55-
.requestTimeout(Duration.ofSeconds(3))
56-
.keyTtl(1000)
57-
.build())
58-
.parse(token);
50+
final var jwtToken = JwtToken.parseToken(token);
5951

6052
assertNotNull(jwtToken, "jwtToken");
6153
assertTrue(jwtToken.header().size() > 0, "jwtToken.header: " + jwtToken.header());
@@ -70,7 +62,7 @@ void testJwksKeyLocatorThrowsError(VaultEnvironment vaultEnvironment) {
7062
when(keyLocator.locate(any())).thenThrow(new RuntimeException("Cannot get key"));
7163

7264
try {
73-
new JsonwebtokenResolver(keyLocator).resolve(token).get(3, TimeUnit.SECONDS);
65+
new JsonwebtokenResolver(keyLocator).resolveToken(token).get(3, TimeUnit.SECONDS);
7466
fail("Expected exception");
7567
} catch (Exception e) {
7668
final var ex = getRootCause(e);
@@ -87,7 +79,7 @@ void testJwksKeyLocatorThrowsRetryableError(VaultEnvironment vaultEnvironment) {
8779
when(keyLocator.locate(any())).thenThrow(new JwtUnavailableException("JWKS timeout"));
8880

8981
try {
90-
new JsonwebtokenResolver(keyLocator).resolve(token).get(3, TimeUnit.SECONDS);
82+
new JsonwebtokenResolver(keyLocator).resolveToken(token).get(3, TimeUnit.SECONDS);
9183
fail("Expected exception");
9284
} catch (Exception e) {
9385
final var ex = getRootCause(e);

tests/src/test/java/io/scalecube/security/vault/VaultServiceTokenTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws E
143143
final var jwtToken =
144144
new JsonwebtokenResolver(
145145
JwksKeyLocator.builder().jwksUri(vaultEnvironment.jwksUri()).build())
146-
.resolve(serviceToken)
146+
.resolveToken(serviceToken)
147147
.get(3, TimeUnit.SECONDS);
148148

149149
assertNotNull(jwtToken, "jwtToken");

tokens/src/main/java/io/scalecube/security/tokens/jwt/JsonwebtokenResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public JsonwebtokenResolver(Locator<Key> keyLocator) {
1919
}
2020

2121
@Override
22-
public CompletableFuture<JwtToken> resolve(String token) {
22+
public CompletableFuture<JwtToken> resolveToken(String token) {
2323
return CompletableFuture.supplyAsync(
2424
() -> {
2525
final var claimsJws =

tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public record JwtToken(Map<String, Object> header, Map<String, Object> payload)
1414
* @param token jwt token
1515
* @return parsed token
1616
*/
17-
public static JwtToken parse(String token) {
17+
public static JwtToken parseToken(String token) {
1818
String[] parts = token.split("\\.");
1919
if (parts.length != 3) {
2020
throw new JwtTokenException("Invalid JWT format");

tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ public interface JwtTokenResolver {
1010
* @param token jwt token
1111
* @return async result with {@link JwtToken}, or error
1212
*/
13-
CompletableFuture<JwtToken> resolve(String token);
13+
CompletableFuture<JwtToken> resolveToken(String token);
1414
}

0 commit comments

Comments
 (0)