tests and fixies

Signed-off-by: Dmitrii Tikhomirov <[email protected]>

Author: treblereel

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/AccessTokenProvider.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import io.serverlessworkflow.http.jwt.JWT;

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/ClientSecretBasic.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import static io.serverlessworkflow.api.types.OAuth2AutenthicationData.OAuth2AutenthicationDataGrant.CLIENT_CREDENTIALS;

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/ClientSecretPostStep.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import static io.serverlessworkflow.api.types.OAuth2AutenthicationData.OAuth2AutenthicationDataGrant.CLIENT_CREDENTIALS;

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/HttpRequestBuilder.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import static io.serverlessworkflow.api.types.OAuth2TokenRequest.Oauth2TokenRequestEncoding;
@@ -35,8 +34,6 @@
 import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.MediaType;
 import java.net.URI;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -115,21 +112,17 @@ InvocationHolder build(WorkflowContext workflow, TaskContext task, WorkflowModel
       form.param("grant_type", grantType.value());
       queryParams.forEach(
           (key, value) -> {
-            String v = value.apply(workflow, task, model);
-            String encodedKey = URLEncoder.encode(key, StandardCharsets.UTF_8);
-            String encodedValue = URLEncoder.encode(v, StandardCharsets.UTF_8);
-            form.param(encodedKey, encodedValue);
+            String resolved = value.apply(workflow, task, model);
+            form.param(key, resolved);
           });
       entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED);
     } else {
       Map<String, Object> jsonData = new HashMap<>();
       jsonData.put("grant_type", grantType.value());
       queryParams.forEach(
           (key, value) -> {
-            String v = value.apply(workflow, task, model);
-            String encodedKey = URLEncoder.encode(key, StandardCharsets.UTF_8);
-            String encodedValue = URLEncoder.encode(v, StandardCharsets.UTF_8);
-            jsonData.put(encodedKey, encodedValue);
+            String resolved = value.apply(workflow, task, model);
+            jsonData.put(key, resolved);
           });
       entity = Entity.entity(jsonData, MediaType.APPLICATION_JSON);
     }

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/InvocationHolder.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import jakarta.ws.rs.client.Client;

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/OAuthRequestBuilder.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import static io.serverlessworkflow.api.types.OAuth2AutenthicationDataClient.ClientAuthentication.CLIENT_SECRET_POST;
@@ -27,8 +26,11 @@
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 public class OAuthRequestBuilder {
 
@@ -112,9 +114,21 @@ public void audience(HttpRequestBuilder requestBuilder) {
   }
 
   private void scope(HttpRequestBuilder requestBuilder) {
-    if (authenticationData.getScopes() != null && !authenticationData.getScopes().isEmpty()) {
-      String scopes = String.join(" ", authenticationData.getScopes());
-      requestBuilder.addQueryParam("scope", scopes);
+    List<String> scopesList = authenticationData.getScopes();
+    if (scopesList == null || scopesList.isEmpty()) {
+      return;
+    }
+    String scope =
+        scopesList.stream()
+            .filter(Objects::nonNull)
+            .map(String::trim)
+            .filter(s -> !s.isEmpty())
+            .flatMap(s -> Arrays.stream(s.split("\\s+")))
+            .distinct()
+            .collect(Collectors.joining(" "));
+
+    if (!scope.isEmpty()) {
+      requestBuilder.addQueryParam("scope", scope);
     }
   }
 

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/TokenResponseHandler.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.serverlessworkflow.impl.executors.http.oauth;
 
 import io.serverlessworkflow.impl.TaskContext;