Bump scalecube-security -> 1.1.0.RC3 (#880)

artem-v · web-flow · commit 9c0acf7ba29b · 2025-02-04T09:58:41.000+02:00
* Bump scalecube-security -&gt; 1.1.0.X
* Fixed ServiceTokenAuthenticator
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 
   <properties>
     <scalecube-cluster.version>2.6.18.RC12</scalecube-cluster.version>
-    <scalecube-security.version>1.0.33.RC3</scalecube-security.version>
+    <scalecube-security.version>1.1.0.RC3</scalecube-security.version>
 
     <reactor.version>2020.0.32</reactor.version>
     <jackson.version>2.18.2</jackson.version>
diff --git a/services-security/src/main/java/io/scalecube/services/security/RetryStrategies.java b/services-security/src/main/java/io/scalecube/services/security/RetryStrategies.java
diff --git a/services-security/src/main/java/io/scalecube/services/security/ServiceTokenAuthenticator.java b/services-security/src/main/java/io/scalecube/services/security/ServiceTokenAuthenticator.java
@@ -21,7 +21,7 @@ public final class ServiceTokenAuthenticator<T> implements Authenticator<T> {
   private JwtTokenResolver tokenResolver;
   private ServiceTokenMapper tokenMapper;
   private AuthDataMapper<T> authDataMapper;
-  private Retry retryStrategy = RetryStrategies.noRetriesRetryStrategy();
+  private Retry retryStrategy = Retry.max(0);
 
   public ServiceTokenAuthenticator() {}
 
@@ -88,15 +88,14 @@ public ServiceTokenAuthenticator<T> retryStrategy(Retry retryStrategy) {
   public Mono<T> apply(Map<String, String> credentials) {
     return Mono.defer(
         () -> {
-          String serviceToken = tokenMapper.map(credentials);
+          final var serviceToken = tokenMapper.map(credentials);
 
           if (serviceToken == null) {
             throw new UnauthorizedException("Authentication failed");
           }
 
-          return tokenResolver
-              .resolve(serviceToken)
-              .map(authDataMapper::map)
+          return Mono.fromFuture(tokenResolver.resolve(serviceToken))
+              .map(token -> authDataMapper.map(token.payload()))
               .retryWhen(retryStrategy)
               .doOnError(th -> LOGGER.error("Failed to authenticate, cause: {}", th.toString()))
               .onErrorMap(th -> new UnauthorizedException("Authentication failed"))
