Skip to content

Commit d3a36b5

Browse files
authored
Bump scalecube-security (#936)
1 parent 9751f04 commit d3a36b5

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<properties>
6060
<scalecube-cluster.version>2.7.4</scalecube-cluster.version>
61-
<scalecube-security.version>1.1.7</scalecube-security.version>
61+
<scalecube-security.version>1.1.8</scalecube-security.version>
6262

6363
<reactor.version>2024.0.8</reactor.version>
6464
<netty.version>4.2.6.Final</netty.version>
@@ -95,7 +95,7 @@
9595
<!-- Scalecube-Security -->
9696
<dependency>
9797
<groupId>io.scalecube</groupId>
98-
<artifactId>scalecube-security-tokens</artifactId>
98+
<artifactId>scalecube-security-jwt</artifactId>
9999
<version>${scalecube-security.version}</version>
100100
</dependency>
101101
<dependency>

services-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>io.scalecube</groupId>
22-
<artifactId>scalecube-security-tokens</artifactId>
22+
<artifactId>scalecube-security-jwt</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>io.scalecube</groupId>

services-security/src/main/java/io/scalecube/services/security/ServiceTokenAuthenticator.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.scalecube.services.security;
22

3-
import io.scalecube.security.tokens.jwt.JwtToken;
4-
import io.scalecube.security.tokens.jwt.JwtTokenResolver;
5-
import io.scalecube.security.tokens.jwt.JwtUnavailableException;
3+
import io.scalecube.security.jwt.JwksTokenResolver;
4+
import io.scalecube.security.jwt.JwtToken;
5+
import io.scalecube.security.jwt.JwtUnavailableException;
66
import io.scalecube.services.auth.Authenticator;
77
import io.scalecube.services.auth.Principal;
88
import io.scalecube.services.auth.ServicePrincipal;
@@ -18,15 +18,15 @@
1818
*/
1919
public class ServiceTokenAuthenticator implements Authenticator {
2020

21-
private final JwtTokenResolver tokenResolver;
21+
private final JwksTokenResolver tokenResolver;
2222
private final Retry retryStrategy;
2323

2424
/**
2525
* Constructor with defaults.
2626
*
2727
* @param tokenResolver token resolver
2828
*/
29-
public ServiceTokenAuthenticator(JwtTokenResolver tokenResolver) {
29+
public ServiceTokenAuthenticator(JwksTokenResolver tokenResolver) {
3030
this(tokenResolver, 5, Duration.ofSeconds(3));
3131
}
3232

@@ -38,7 +38,7 @@ public ServiceTokenAuthenticator(JwtTokenResolver tokenResolver) {
3838
* @param retryFixedDelay delay between retry attempts
3939
*/
4040
public ServiceTokenAuthenticator(
41-
JwtTokenResolver tokenResolver, int retryMaxAttempts, Duration retryFixedDelay) {
41+
JwksTokenResolver tokenResolver, int retryMaxAttempts, Duration retryFixedDelay) {
4242
this.tokenResolver = tokenResolver;
4343
this.retryStrategy =
4444
Retry.fixedDelay(retryMaxAttempts, retryFixedDelay)

services-security/src/test/java/io/scalecube/services/security/ServiceTokenTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

6-
import io.scalecube.security.tokens.jwt.JsonwebtokenResolver;
7-
import io.scalecube.security.tokens.jwt.JwksKeyLocator;
6+
import io.scalecube.security.jwt.JwksKeyProvider;
7+
import io.scalecube.security.jwt.JwksTokenResolver;
88
import io.scalecube.services.methods.ServiceRoleDefinition;
99
import io.scalecube.services.security.environment.IntegrationEnvironmentFixture;
1010
import io.scalecube.services.security.environment.VaultEnvironment;
@@ -38,8 +38,8 @@ void shouldAuthenticateSuccessfully(SuccessArgs args, VaultEnvironment vaultEnvi
3838

3939
final var authenticator =
4040
new ServiceTokenAuthenticator(
41-
new JsonwebtokenResolver(
42-
JwksKeyLocator.builder().jwksUri(vaultEnvironment.jwksUri()).build()));
41+
new JwksTokenResolver(
42+
JwksKeyProvider.builder().jwksUri(vaultEnvironment.jwksUri()).build()));
4343

4444
// Install service roles
4545

0 commit comments

Comments
 (0)