Skip to content

Commit 478c790

Browse files
ivicacivicac
committed
2916 - Reorganize
1 parent e65e52a commit 478c790

File tree

22 files changed

+195
-121
lines changed

22 files changed

+195
-121
lines changed

‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/authentication/ApiClientAuthenticationProvider.java renamed to ‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/authentication/ApiPlatformAuthenticationProvider.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
*
2323
* @author Ivica Cardic
2424
*/
25-
public class ApiClientAuthenticationProvider implements AuthenticationProvider {
25+
public class ApiPlatformAuthenticationProvider implements AuthenticationProvider {
2626

2727
private final ApiClientService apiClientService;
2828

2929
@SuppressFBWarnings("EI")
30-
public ApiClientAuthenticationProvider(ApiClientService apiClientService) {
30+
public ApiPlatformAuthenticationProvider(ApiClientService apiClientService) {
3131
this.apiClientService = apiClientService;
3232
}
3333

3434
@Override
3535
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
36-
ApiClientKeyAuthenticationToken apiClientKeyAuthenticationToken =
37-
(ApiClientKeyAuthenticationToken) authentication;
36+
ApiPlatformKeyAuthenticationToken apiPlatformKeyAuthenticationToken =
37+
(ApiPlatformKeyAuthenticationToken) authentication;
3838

3939
Optional<ApiClient> apiClientOptional = apiClientService.fetchApiClient(
40-
apiClientKeyAuthenticationToken.getSecretKey());
40+
apiPlatformKeyAuthenticationToken.getSecretKey());
4141

4242
if (apiClientOptional.isEmpty()) {
4343
throw new BadCredentialsException("Unknown API secret key");
4444
}
4545

4646
ApiClient apiClient = apiClientOptional.get();
4747

48-
return new ApiClientKeyAuthenticationToken(createSpringSecurityUser(apiClient.getName()));
48+
return new ApiPlatformKeyAuthenticationToken(createSpringSecurityUser(apiClient.getName()));
4949
}
5050

5151
@Override
5252
public boolean supports(Class<?> authentication) {
53-
return authentication.equals(ApiClientKeyAuthenticationToken.class);
53+
return authentication.equals(ApiPlatformKeyAuthenticationToken.class);
5454
}
5555

5656
private org.springframework.security.core.userdetails.User createSpringSecurityUser(String secretKey) {

‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/authentication/ApiClientKeyAuthenticationToken.java renamed to ‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/authentication/ApiPlatformKeyAuthenticationToken.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
*
1717
* @author Ivica Cardic
1818
*/
19-
public class ApiClientKeyAuthenticationToken extends AbstractPublicApiAuthenticationToken {
19+
public class ApiPlatformKeyAuthenticationToken extends AbstractPublicApiAuthenticationToken {
2020

2121
private String secretKey;
2222

23-
public ApiClientKeyAuthenticationToken(String secretKey, String tenantId) {
23+
public ApiPlatformKeyAuthenticationToken(String secretKey, String tenantId) {
2424
super(tenantId);
2525

2626
this.secretKey = secretKey;
2727
}
2828

2929
@SuppressFBWarnings("EI")
30-
public ApiClientKeyAuthenticationToken(User user) {
30+
public ApiPlatformKeyAuthenticationToken(User user) {
3131
super(user);
3232
}
3333

‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/filter/ApiClientAuthenticationFilterBeforeContributor.java renamed to ‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/config/ApiPlatformApiAuthenticationFilterBeforeContributor.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* you may not use this file except in compliance with the Enterprise License.
66
*/
77

8-
package com.bytechef.ee.automation.apiplatform.handler.security.web.filter;
8+
package com.bytechef.ee.automation.apiplatform.handler.security.web.config;
99

10-
import com.bytechef.platform.security.web.filter.FilterBeforeContributor;
10+
import com.bytechef.ee.automation.apiplatform.handler.security.web.filter.ApiPlatformApiAuthenticationFilter;
11+
import com.bytechef.platform.security.web.config.FilterBeforeContributor;
1112
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1213
import jakarta.servlet.Filter;
1314
import org.springframework.security.authentication.AuthenticationManager;
@@ -20,12 +21,12 @@
2021
* @author Ivica Cardic
2122
*/
2223
@Component
23-
public class ApiClientAuthenticationFilterBeforeContributor implements FilterBeforeContributor {
24+
public class ApiPlatformApiAuthenticationFilterBeforeContributor implements FilterBeforeContributor {
2425

2526
@Override
2627
@SuppressFBWarnings("EI")
2728
public Filter getFilter(AuthenticationManager authenticationManager) {
28-
return new ApiClientAuthenticationFilter(authenticationManager);
29+
return new ApiPlatformApiAuthenticationFilter(authenticationManager);
2930
}
3031

3132
@Override

‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/authentication/ApiClientAuthenticationProviderContributor.java renamed to ‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/config/ApiPlatformAuthenticationProviderContributor.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
* you may not use this file except in compliance with the Enterprise License.
66
*/
77

8-
package com.bytechef.ee.automation.apiplatform.handler.security.web.authentication;
8+
package com.bytechef.ee.automation.apiplatform.handler.security.web.config;
99

1010
import com.bytechef.ee.automation.apiplatform.configuration.service.ApiClientService;
11-
import com.bytechef.platform.security.web.authentication.AuthenticationProviderContributor;
11+
import com.bytechef.ee.automation.apiplatform.handler.security.web.authentication.ApiPlatformAuthenticationProvider;
12+
import com.bytechef.platform.security.web.config.AuthenticationProviderContributor;
1213
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1314
import org.springframework.security.authentication.AuthenticationProvider;
1415
import org.springframework.stereotype.Component;
@@ -19,17 +20,17 @@
1920
* @author Ivica Cardic
2021
*/
2122
@Component
22-
public class ApiClientAuthenticationProviderContributor implements AuthenticationProviderContributor {
23+
public class ApiPlatformAuthenticationProviderContributor implements AuthenticationProviderContributor {
2324

2425
private final ApiClientService apiClientService;
2526

2627
@SuppressFBWarnings("EI")
27-
public ApiClientAuthenticationProviderContributor(ApiClientService apiClientService) {
28+
public ApiPlatformAuthenticationProviderContributor(ApiClientService apiClientService) {
2829
this.apiClientService = apiClientService;
2930
}
3031

3132
@Override
3233
public AuthenticationProvider getAuthenticationProvider() {
33-
return new ApiClientAuthenticationProvider(apiClientService);
34+
return new ApiPlatformAuthenticationProvider(apiClientService);
3435
}
3536
}

‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/filter/ApiClientAuthenticationFilter.java renamed to ‎server/ee/libs/automation/automation-api-platform/automation-api-platform-handler/automation-api-platform-handler-security-web/automation-api-platform-handler-security-web-impl/src/main/java/com/bytechef/ee/automation/apiplatform/handler/security/web/filter/ApiPlatformApiAuthenticationFilter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
package com.bytechef.ee.automation.apiplatform.handler.security.web.filter;
99

10-
import com.bytechef.ee.automation.apiplatform.handler.security.web.authentication.ApiClientKeyAuthenticationToken;
11-
import com.bytechef.platform.security.web.filter.AbstractPublicApiAuthenticationFilter;
10+
import com.bytechef.ee.automation.apiplatform.handler.security.web.authentication.ApiPlatformKeyAuthenticationToken;
11+
import com.bytechef.platform.security.web.filter.AbstractApiAuthenticationFilter;
1212
import com.bytechef.tenant.domain.TenantKey;
1313
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1414
import jakarta.servlet.http.HttpServletRequest;
@@ -20,10 +20,10 @@
2020
*
2121
* @author Ivica Cardic
2222
*/
23-
public class ApiClientAuthenticationFilter extends AbstractPublicApiAuthenticationFilter {
23+
public class ApiPlatformApiAuthenticationFilter extends AbstractApiAuthenticationFilter {
2424

2525
@SuppressFBWarnings("EI")
26-
public ApiClientAuthenticationFilter(AuthenticationManager authenticationManager) {
26+
public ApiPlatformApiAuthenticationFilter(AuthenticationManager authenticationManager) {
2727
super("^/api/o/.+", authenticationManager);
2828
}
2929

@@ -32,6 +32,6 @@ protected Authentication getAuthentication(HttpServletRequest request) {
3232

3333
TenantKey tenantKey = TenantKey.parse(token);
3434

35-
return new ApiClientKeyAuthenticationToken(token, tenantKey.getTenantId());
35+
return new ApiPlatformKeyAuthenticationToken(token, tenantKey.getTenantId());
3636
}
3737
}

‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/filter/ConnectedUserFilterBeforeContributor.java renamed to ‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/config/ConnectedUserApiAuthenticationFilterBeforeContributor.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* you may not use this file except in compliance with the Enterprise License.
66
*/
77

8-
package com.bytechef.ee.embedded.security.web.filter;
8+
package com.bytechef.ee.embedded.security.web.config;
99

10-
import com.bytechef.platform.security.web.filter.FilterBeforeContributor;
10+
import com.bytechef.ee.embedded.security.web.filter.ConnectedUserApiAuthenticationFilter;
11+
import com.bytechef.platform.security.web.config.FilterBeforeContributor;
1112
import com.bytechef.platform.user.service.SigningKeyService;
1213
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1314
import jakarta.servlet.Filter;
@@ -21,19 +22,19 @@
2122
* @author Ivica Cardic
2223
*/
2324
@Component
24-
public class ConnectedUserFilterBeforeContributor implements FilterBeforeContributor {
25+
public class ConnectedUserApiAuthenticationFilterBeforeContributor implements FilterBeforeContributor {
2526

2627
private final SigningKeyService signingKeyService;
2728

2829
@SuppressFBWarnings("EI")
29-
public ConnectedUserFilterBeforeContributor(SigningKeyService signingKeyService) {
30+
public ConnectedUserApiAuthenticationFilterBeforeContributor(SigningKeyService signingKeyService) {
3031
this.signingKeyService = signingKeyService;
3132
}
3233

3334
@Override
3435
@SuppressFBWarnings("EI")
3536
public Filter getFilter(AuthenticationManager authenticationManager) {
36-
return new ConnectedUserAuthenticationFilter(authenticationManager, signingKeyService);
37+
return new ConnectedUserApiAuthenticationFilter(authenticationManager, signingKeyService);
3738
}
3839

3940
@Override

‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/authentication/ConnectedUserAuthenticationProviderContributor.java renamed to ‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/config/ConnectedUserAuthenticationProviderContributor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
* you may not use this file except in compliance with the Enterprise License.
66
*/
77

8-
package com.bytechef.ee.embedded.security.web.authentication;
8+
package com.bytechef.ee.embedded.security.web.config;
99

1010
import com.bytechef.ee.embedded.connected.user.service.ConnectedUserService;
11-
import com.bytechef.platform.security.web.authentication.AuthenticationProviderContributor;
11+
import com.bytechef.ee.embedded.security.web.authentication.ConnectedUserAuthenticationProvider;
12+
import com.bytechef.platform.security.web.config.AuthenticationProviderContributor;
1213
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1314
import org.springframework.security.authentication.AuthenticationProvider;
1415
import org.springframework.stereotype.Component;

‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/filter/ConnectedUserAuthenticationFilter.java renamed to ‎server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/filter/ConnectedUserApiAuthenticationFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package com.bytechef.ee.embedded.security.web.filter;
99

1010
import com.bytechef.ee.embedded.security.web.authentication.ConnectedUserAuthenticationToken;
11-
import com.bytechef.platform.security.web.filter.AbstractPublicApiAuthenticationFilter;
11+
import com.bytechef.platform.security.web.filter.AbstractApiAuthenticationFilter;
1212
import com.bytechef.platform.user.service.SigningKeyService;
1313
import com.bytechef.tenant.domain.TenantKey;
1414
import com.bytechef.tenant.util.TenantUtils;
@@ -31,7 +31,7 @@
3131
*
3232
* @author Ivica Cardic
3333
*/
34-
public class ConnectedUserAuthenticationFilter extends AbstractPublicApiAuthenticationFilter {
34+
public class ConnectedUserApiAuthenticationFilter extends AbstractApiAuthenticationFilter {
3535

3636
private static final Pattern EXTERNAL_USER_ID_PATTERN = Pattern.compile(".*/v\\d+/([^/]+)/.*");
3737
private static final Pattern JWT_TOKEN_PATTERN =
@@ -40,7 +40,7 @@ public class ConnectedUserAuthenticationFilter extends AbstractPublicApiAuthenti
4040
private final SigningKeyService signingKeyService;
4141

4242
@SuppressFBWarnings("EI")
43-
public ConnectedUserAuthenticationFilter(
43+
public ConnectedUserApiAuthenticationFilter(
4444
AuthenticationManager authenticationManager, SigningKeyService signingKeyService) {
4545

4646
super("^/api/embedded/v[0-9]+/.+|^/api/(?:automation|embedded|platform)/internal/.+", authenticationManager);

‎server/libs/automation/automation-security-web/automation-security-web-impl/src/main/java/com/bytechef/automation/security/web/filter/ApiKeyAuthenticationFilterBeforeContributor.java renamed to ‎server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/security/web/config/McpServerApiAuthenticationFilterBeforeContributor.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.bytechef.automation.security.web.filter;
17+
package com.bytechef.ai.mcp.server.security.web.config;
1818

19-
import com.bytechef.platform.security.web.filter.FilterBeforeContributor;
19+
import com.bytechef.ai.mcp.server.security.web.filter.McpServerApiAuthenticationFilter;
20+
import com.bytechef.platform.security.web.config.FilterBeforeContributor;
2021
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2122
import jakarta.servlet.Filter;
2223
import org.springframework.security.authentication.AuthenticationManager;
@@ -26,13 +27,13 @@
2627
/**
2728
* @author Ivica Cardic
2829
*/
29-
@Component("com.bytechef.automation.security.web.filter.ApiKeyAuthenticationFilterBeforeContributor")
30-
public class ApiKeyAuthenticationFilterBeforeContributor implements FilterBeforeContributor {
30+
@Component
31+
public class McpServerApiAuthenticationFilterBeforeContributor implements FilterBeforeContributor {
3132

3233
@Override
3334
@SuppressFBWarnings("EI")
3435
public Filter getFilter(AuthenticationManager authenticationManager) {
35-
return new ApiKeyAuthenticationFilter(authenticationManager);
36+
return new McpServerApiAuthenticationFilter(authenticationManager);
3637
}
3738

3839
@Override

‎server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/security/web/filter/ApiKeyAuthenticationFilter.java renamed to ‎server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/security/web/filter/McpServerApiAuthenticationFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616

1717
package com.bytechef.ai.mcp.server.security.web.filter;
1818

19-
import com.bytechef.platform.security.web.filter.AbstractPublicApiAuthenticationFilter;
19+
import com.bytechef.platform.security.web.filter.AbstractApiAuthenticationFilter;
2020
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2121
import org.springframework.security.authentication.AuthenticationManager;
2222

2323
/**
2424
* @author Ivica Cardic
2525
*/
26-
public class ApiKeyAuthenticationFilter extends AbstractPublicApiAuthenticationFilter {
26+
public class McpServerApiAuthenticationFilter extends AbstractApiAuthenticationFilter {
2727

2828
@SuppressFBWarnings("EI")
29-
public ApiKeyAuthenticationFilter(AuthenticationManager authenticationManager) {
29+
public McpServerApiAuthenticationFilter(AuthenticationManager authenticationManager) {
3030
super("^/api/v[0-9]+/mcp/.+", authenticationManager);
3131
}
3232
}

0 commit comments

Comments
 (0)