Skip to content

Commit 00b697b

Browse files
committed
Extract OAuthPolicyData to a top-level file with a from() factory method
Move OAuthPolicyData out of OAuthUtils into its own file so integrations can reference it directly, and add a static from(AuthenticationPolicyUnion) convenience factory that delegates to OAuthUtils.from(). Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com>
1 parent 5bfd5e9 commit 00b697b

5 files changed

Lines changed: 32 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class OAuth2AuthProvider extends CommonOAuthProvider {
2222

2323
public OAuth2AuthProvider(
24-
WorkflowApplication application, Workflow workflow, OAuthUtils.OAuthPolicyData policyData) {
24+
WorkflowApplication application, Workflow workflow, OAuthPolicyData policyData) {
2525
super(
2626
accessToken(
2727
workflow,
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2020-Present The Serverless Workflow Specification Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.serverlessworkflow.impl.auth;
17+
18+
import io.serverlessworkflow.api.types.AuthenticationPolicyUnion;
19+
import io.serverlessworkflow.api.types.OAuth2AuthenticationData;
20+
import io.serverlessworkflow.api.types.SecretBasedAuthenticationPolicy;
21+
import java.util.Optional;
22+
23+
public record OAuthPolicyData(
24+
OAuth2AuthenticationData data, SecretBasedAuthenticationPolicy secret, OAuthScheme scheme) {
25+
26+
public static Optional<OAuthPolicyData> from(AuthenticationPolicyUnion policy) {
27+
return OAuthUtils.from(policy);
28+
}
29+
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
package io.serverlessworkflow.impl.auth;
1717

1818
import io.serverlessworkflow.api.types.AuthenticationPolicyUnion;
19-
import io.serverlessworkflow.api.types.OAuth2AuthenticationData;
2019
import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicy;
2120
import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicyConfiguration;
2221
import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicy;
2322
import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicyConfiguration;
2423
import io.serverlessworkflow.api.types.ReferenceableAuthenticationPolicy;
25-
import io.serverlessworkflow.api.types.SecretBasedAuthenticationPolicy;
2624
import io.serverlessworkflow.api.types.Use;
2725
import io.serverlessworkflow.api.types.Workflow;
2826
import java.util.Optional;
@@ -31,9 +29,6 @@ public class OAuthUtils {
3129

3230
private OAuthUtils() {}
3331

34-
public record OAuthPolicyData(
35-
OAuth2AuthenticationData data, SecretBasedAuthenticationPolicy secret, OAuthScheme scheme) {}
36-
3732
public static Optional<OAuthPolicyData> from(AuthenticationPolicyUnion policy) {
3833
if (policy == null) {
3934
return Optional.empty();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class OpenIdAuthProvider extends CommonOAuthProvider {
2222

2323
public OpenIdAuthProvider(
24-
WorkflowApplication application, Workflow workflow, OAuthUtils.OAuthPolicyData policyData) {
24+
WorkflowApplication application, Workflow workflow, OAuthPolicyData policyData) {
2525
super(
2626
accessToken(
2727
workflow,

impl/test/src/test/java/io/serverlessworkflow/impl/test/OAuthUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicy;
2929
import io.serverlessworkflow.api.types.OpenIdConnectAuthenticationPolicyConfiguration;
3030
import io.serverlessworkflow.api.types.SecretBasedAuthenticationPolicy;
31+
import io.serverlessworkflow.impl.auth.OAuthPolicyData;
3132
import io.serverlessworkflow.impl.auth.OAuthScheme;
3233
import io.serverlessworkflow.impl.auth.OAuthUtils;
33-
import io.serverlessworkflow.impl.auth.OAuthUtils.OAuthPolicyData;
3434
import java.util.Optional;
3535
import org.junit.jupiter.api.Test;
3636

0 commit comments

Comments
 (0)