From de67331baf9baec7948e6cb913d74ea24d803a60 Mon Sep 17 00:00:00 2001
From: CRoberto1926 <3205022+CRoberto1926@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:56:14 +0200
Subject: [PATCH] Closes #2616 - Make OpenAPI/Swagger UI docs public

---
 .../pro/taskana/example/boot/OpenApiConfiguration.java | 10 +++++++---
 .../boot/security/BootWebSecurityConfigurer.java       |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/OpenApiConfiguration.java b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/OpenApiConfiguration.java
index c18dba37d..40dda5e70 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/OpenApiConfiguration.java
+++ b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/OpenApiConfiguration.java
@@ -1,7 +1,10 @@
 package pro.taskana.example.boot;
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
 import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.security.SecurityScheme;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
@@ -18,8 +21,7 @@ import org.springframework.context.annotation.Configuration;
             title = "TASKANA RESTful API Documentation",
             version = "8.2.0",
             description =
-                ""
-                    + "<h1>Overview</h1>"
+                "<h1>Overview</h1>"
                     + "<p>"
                     + "This is the REST documentation for [TASKANA](http://taskana.pro) - the "
                     + "world’s first open source solution for Enterprise Task Management."
@@ -340,7 +342,9 @@ import org.springframework.context.annotation.Configuration;
                     + "<td>String</td>"
                     + "</tr>"
                     + "</tbody>"
-                    + "</table>"))
+                    + "</table>"),
+    security = {@SecurityRequirement(name = "basicAuth")})
+@SecurityScheme(name = "basicAuth", type = SecuritySchemeType.HTTP, scheme = "basic")
 public class OpenApiConfiguration {
   @Bean
   public OpenApiCustomizer openApiCustomizer() {
diff --git a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/security/BootWebSecurityConfigurer.java b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/security/BootWebSecurityConfigurer.java
index c1d0c8d5a..e7018863e 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/security/BootWebSecurityConfigurer.java
+++ b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/example/boot/security/BootWebSecurityConfigurer.java
@@ -66,8 +66,10 @@ public class BootWebSecurityConfigurer {
                 authorizeHttpRequests
                     .requestMatchers("/css/**", "/img/**")
                     .permitAll()
+                    .requestMatchers(HttpMethod.GET, "/docs/**")
+                    .permitAll()
                     .requestMatchers(
-                        HttpMethod.GET, "/docs/**", "/api-docs*")
+                        HttpMethod.GET, "/api-docs", "/api-docs/**", "swagger-ui", "/swagger-ui/**")
                     .permitAll())
         .cors(Customizer.withDefaults())
         .addFilter(jaasApiIntegrationFilter())