From 1a41edbef9ce7f16709115994e30949c800160b7 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 24 Mar 2023 10:34:14 +0100 Subject: [PATCH] RED-4515: Changed swagger back to authorizationCode flow --- .../api/impl/swagger/SwaggerAutoConfiguration.java | 4 +--- .../processor/service/TenantManagementService.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java index 55ebb2387..6cd3db109 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java @@ -5,8 +5,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.keycloak.adapters.springboot.KeycloakSpringBootProperties; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; @@ -119,7 +117,7 @@ public class SwaggerAutoConfiguration { OAuthFlow flow = createAuthorizationCodeFlow(); - return new OAuthFlows().implicit(flow); + return new OAuthFlows().authorizationCode(flow); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java index 88fd99f70..31fbd7a98 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java @@ -222,8 +222,19 @@ public class TenantManagementService { redactionClient.setImplicitFlowEnabled(true); redactionClient.setDirectAccessGrantsEnabled(true); + var swaggerClient = new ClientRepresentation(); + swaggerClient.setEnabled(true); + swaggerClient.setName("swagger-ui-client"); + swaggerClient.setClientId("swagger-ui-client"); + swaggerClient.setStandardFlowEnabled(true); + swaggerClient.setImplicitFlowEnabled(false); + swaggerClient.setDirectAccessGrantsEnabled(false); + swaggerClient.setServiceAccountsEnabled(true); + swaggerClient.setAuthorizationServicesEnabled(true); + swaggerClient.setSecret("OsloImWinter!23"); - redaction.setClients(List.of(redactionClient)); + + redaction.setClients(List.of(redactionClient, swaggerClient)); var redUserRole = new RoleRepresentation(); redUserRole.setComposite(true); redUserRole.setName(RED_USER_ROLE);