[Fix #1544] auth Content to be completable future

Signed-off-by: fjtirado <ftirados@ibm.com>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/auth/AccessTokenProvider.java

@@ -18,7 +18,9 @@
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
+import java.util.concurrent.CompletableFuture;
 
 public interface AccessTokenProvider {
-  JWT validateAndGet(WorkflowContext workflow, TaskContext context, WorkflowModel model);
+  CompletableFuture<JWT> validateAndGet(
+      WorkflowContext workflow, TaskContext context, WorkflowModel model);
 }

impl/core/src/main/java/io/serverlessworkflow/impl/auth/AuthProvider.java

@@ -19,10 +19,12 @@
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import java.net.URI;
+import java.util.concurrent.CompletableFuture;
 
 public interface AuthProvider {
 
   String scheme();
 
-  String content(WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri);
+  CompletableFuture<String> content(
+      WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri);
 }

impl/core/src/main/java/io/serverlessworkflow/impl/auth/BasicAuthProvider.java

@@ -30,6 +30,7 @@
 import io.serverlessworkflow.impl.WorkflowValueResolver;
 import java.net.URI;
 import java.util.Base64;
+import java.util.concurrent.CompletableFuture;
 
 class BasicAuthProvider implements AuthProvider {
 
@@ -58,15 +59,17 @@ public BasicAuthProvider(
   }
 
   @Override
-  public String content(WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
-    return new String(
-        Base64.getEncoder()
-            .encode(
-                String.format(
-                        USER_PASSWORD,
-                        userFilter.apply(workflow, task, model),
-                        passwordFilter.apply(workflow, task, model))
-                    .getBytes()));
+  public CompletableFuture<String> content(
+      WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
+    return CompletableFuture.completedFuture(
+        new String(
+            Base64.getEncoder()
+                .encode(
+                    String.format(
+                            USER_PASSWORD,
+                            userFilter.apply(workflow, task, model),
+                            passwordFilter.apply(workflow, task, model))
+                        .getBytes())));
   }
 
   @Override

impl/core/src/main/java/io/serverlessworkflow/impl/auth/BearerAuthProvider.java

@@ -29,6 +29,7 @@
 import io.serverlessworkflow.impl.WorkflowUtils;
 import io.serverlessworkflow.impl.WorkflowValueResolver;
 import java.net.URI;
+import java.util.concurrent.CompletableFuture;
 
 class BearerAuthProvider implements AuthProvider {
 
@@ -49,8 +50,9 @@ public BearerAuthProvider(
   }
 
   @Override
-  public String content(WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
-    return tokenFilter.apply(workflow, task, model);
+  public CompletableFuture<String> content(
+      WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
+    return CompletableFuture.completedFuture(tokenFilter.apply(workflow, task, model));
   }
 
   @Override

impl/core/src/main/java/io/serverlessworkflow/impl/auth/CommonOAuthProvider.java

@@ -29,8 +29,9 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
-abstract class CommonOAuthProvider implements AuthProvider {
+public abstract class CommonOAuthProvider implements AuthProvider {
 
   private final WorkflowValueResolver<AccessTokenProvider> tokenProvider;
 
@@ -47,8 +48,12 @@ protected CommonOAuthProvider(WorkflowValueResolver<AccessTokenProvider> tokenPr
   }
 
   @Override
-  public String content(WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
-    return tokenProvider.apply(workflow, task, model).validateAndGet(workflow, task, model).token();
+  public CompletableFuture<String> content(
+      WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
+    return tokenProvider
+        .apply(workflow, task, model)
+        .validateAndGet(workflow, task, model)
+        .thenApply(JWT::token);
   }
 
   @Override

impl/core/src/main/java/io/serverlessworkflow/impl/auth/DigestAuthProvider.java

@@ -31,14 +31,14 @@
 import io.serverlessworkflow.impl.WorkflowValueResolver;
 import io.serverlessworkflow.impl.utils.RandomFactory;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Optional;
 import java.util.Random;
 import java.util.StringTokenizer;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -146,7 +146,8 @@ public String scheme() {
   }
 
   @Override
-  public String content(WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
+  public CompletableFuture<String> content(
+      WorkflowContext workflow, TaskContext task, WorkflowModel model, URI uri) {
     try {
       HttpURLConnection connection = (HttpURLConnection) uri.toURL().openConnection();
       connection.setRequestMethod(method);
@@ -186,17 +187,19 @@ public String content(WorkflowContext workflow, TaskContext task, WorkflowModel
                             ha2))
                 .orElseGet(() -> calculateHash(ha1, serverInfo.nonce, ha2));
 
-        return buildResponseInfo(serverInfo, userName, path, clientNonce, nonceCount, response);
+        return CompletableFuture.completedFuture(
+            buildResponseInfo(serverInfo, userName, path, clientNonce, nonceCount, response));
       } else {
-        throw new IllegalStateException(
-            "URI "
-                + uri
-                + " is not digest protected, it returned code "
-                + responseCode
-                + " when invoked without authentication header, but it should have returned 401 as per RFC 2617");
+        return CompletableFuture.failedFuture(
+            new IllegalStateException(
+                "URI "
+                    + uri
+                    + " is not digest protected, it returned code "
+                    + responseCode
+                    + " when invoked without authentication header, but it should have returned 401 as per RFC 2617"));
       }
     } catch (IOException io) {
-      throw new UncheckedIOException(io);
+      return CompletableFuture.failedFuture(io);
     }
   }
 

impl/core/src/main/java/io/serverlessworkflow/impl/auth/JWT.java

@@ -16,29 +16,75 @@
 package io.serverlessworkflow.impl.auth;
 
 import java.time.Instant;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public interface JWT {
+public record JWT(String token, Map<String, Object> header, Map<String, Object> claims) {
 
-  String token();
+  public Optional<Instant> expiresAt() {
+    return toInstant(claims.get("exp"));
+  }
 
-  List<String> audience();
+  public Optional<Instant> issuedAt() {
+    return toInstant(claims.get("iat"));
+  }
 
-  Map<String, Object> claims();
+  public Collection<String> audience() {
+    return toCollection(claims.get("aud"), String.class);
+  }
 
-  <T> Optional<T> claim(String name, Class<T> type);
+  public Optional<String> issuer() {
+    return Optional.ofNullable((String) claims.get("iss"));
+  }
 
-  Optional<Instant> expiresAt();
+  public Optional<String> subject() {
+    return Optional.ofNullable((String) claims.get("sub"));
+  }
 
-  Map<String, Object> header();
+  public Optional<String> type() {
+    return header.containsKey("typ")
+        ? Optional.of((String) header.get("typ"))
+        : Optional.ofNullable((String) claims.get("typ"));
+  }
 
-  Optional<Instant> issuedAt();
+  private static Optional<Instant> toInstant(Object v) {
+    if (v instanceof Instant i) {
+      return Optional.of(i);
+    }
+    if (v instanceof Number n) {
+      return Optional.of(Instant.ofEpochSecond((n.longValue())));
+    }
+    if (v instanceof String s) {
+      try {
+        long sec = Long.parseLong(s.trim());
+        return Optional.of(Instant.ofEpochSecond((sec)));
+      } catch (NumberFormatException ignored) {
+        try {
+          return Optional.of(Instant.parse(s.trim()));
+        } catch (DateTimeParseException ex) {
+        }
+      }
+    }
+    return Optional.empty();
+  }
 
-  Optional<String> issuer();
-
-  Optional<String> subject();
-
-  Optional<String> type();
+  private static <T> Collection toCollection(Object v, Class<T> clazz) {
+    if (v == null) {
+      return List.of();
+    }
+    if (clazz.isInstance(v)) {
+      return List.of(clazz.cast(v));
+    }
+    if (v instanceof Collection col) {
+      return col;
+    }
+    if (v.getClass().isArray() && v.getClass().getComponentType().equals(clazz)) {
+      return Arrays.asList(v);
+    }
+    return List.of();
+  }
 }

impl/core/src/main/java/io/serverlessworkflow/impl/auth/OAuth2AuthProvider.java

@@ -18,7 +18,7 @@
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.WorkflowApplication;
 
-class OAuth2AuthProvider extends CommonOAuthProvider {
+public class OAuth2AuthProvider extends CommonOAuthProvider {
 
   public OAuth2AuthProvider(
       WorkflowApplication application, Workflow workflow, OAuthPolicyData policyData) {

impl/core/src/main/java/io/serverlessworkflow/impl/auth/OpenIdAuthProvider.java

@@ -18,7 +18,7 @@
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.WorkflowApplication;
 
-class OpenIdAuthProvider extends CommonOAuthProvider {
+public class OpenIdAuthProvider extends CommonOAuthProvider {
 
   public OpenIdAuthProvider(
       WorkflowApplication application, Workflow workflow, OAuthPolicyData policyData) {

impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunScriptExecutor.java

@@ -56,32 +56,31 @@ public RunScriptExecutor(
   @Override
   public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
-    ScriptContext scriptContext =
-        new ScriptContext(
-            argumentExpr.map(m -> m.apply(workflowContext, taskContext, input)).orElse(Map.of()),
-            environmentExpr.map(m -> m.apply(workflowContext, taskContext, input)).orElse(Map.of()),
-            codeSupplier.apply(workflowContext, taskContext, input),
-            returnType);
     if (isAwait) {
       return CompletableFuture.supplyAsync(
-          () -> runScript(scriptContext, workflowContext, taskContext, input),
+          () -> runScript(workflowContext, taskContext, input),
           workflowContext.definition().application().executorService());
     } else {
       workflowContext
           .definition()
           .application()
           .executorService()
-          .submit(() -> runScript(scriptContext, workflowContext, taskContext, input));
+          .submit(() -> runScript(workflowContext, taskContext, input));
       return CompletableFuture.completedFuture(input);
     }
   }
 
   private WorkflowModel runScript(
-      ScriptContext scriptContext,
-      WorkflowContext workflowContext,
-      TaskContext taskContext,
-      WorkflowModel input) {
+      WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
     try {
+      ScriptContext scriptContext =
+          new ScriptContext(
+              argumentExpr.map(m -> m.apply(workflowContext, taskContext, input)).orElse(Map.of()),
+              environmentExpr
+                  .map(m -> m.apply(workflowContext, taskContext, input))
+                  .orElse(Map.of()),
+              codeSupplier.apply(workflowContext, taskContext, input),
+              returnType);
       return taskRunner.runScript(scriptContext, workflowContext, taskContext, input);
     } catch (Exception ex) {
       throw new WorkflowException(WorkflowError.runtime(taskContext, ex).build());