From 522d8f04dd19e787d02b02311b849dcbeb83fa5f Mon Sep 17 00:00:00 2001
From: "antonio.torre" <antonio.torre@pagopa.it>
Date: Sun, 5 Jan 2025 18:28:10 +0100
Subject: [PATCH] Security configuration

---
 openapi/generated.openapi.json                  |  5 ++++-
 .../pu/organization/config/SwaggerConfig.java   | 14 ++++++++++++--
 .../{security => config}/WebSecurityConfig.java |  2 +-
 .../security/SwaggerSecurityConfiguration.java  | 17 -----------------
 .../WebSecurityConfigTest.java                  |  2 +-
 5 files changed, 18 insertions(+), 22 deletions(-)
 rename src/main/java/it/gov/pagopa/pu/organization/{security => config}/WebSecurityConfig.java (98%)
 delete mode 100644 src/main/java/it/gov/pagopa/pu/organization/security/SwaggerSecurityConfiguration.java
 rename src/test/java/it/gov/pagopa/pu/organization/{security => config}/WebSecurityConfigTest.java (98%)

diff --git a/openapi/generated.openapi.json b/openapi/generated.openapi.json
index 83b13ac..c8fb36f 100644
--- a/openapi/generated.openapi.json
+++ b/openapi/generated.openapi.json
@@ -9,6 +9,9 @@
     "url" : "http://localhost",
     "description" : "Generated server url"
   } ],
+  "security" : [ {
+    "BearerAuth" : [ ]
+  } ],
   "tags" : [ {
     "name" : "Broker",
     "description" : "the Broker API"
@@ -1190,7 +1193,7 @@
       }
     },
     "securitySchemes" : {
-      "BearerAuthentication" : {
+      "BearerAuth" : {
         "type" : "http",
         "scheme" : "bearer",
         "bearerFormat" : "JWT"
diff --git a/src/main/java/it/gov/pagopa/pu/organization/config/SwaggerConfig.java b/src/main/java/it/gov/pagopa/pu/organization/config/SwaggerConfig.java
index 930ed21..582e376 100644
--- a/src/main/java/it/gov/pagopa/pu/organization/config/SwaggerConfig.java
+++ b/src/main/java/it/gov/pagopa/pu/organization/config/SwaggerConfig.java
@@ -1,7 +1,10 @@
 package it.gov.pagopa.pu.organization.config;
 
 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 org.springframework.context.annotation.Configuration;
 
 /**
@@ -9,11 +12,18 @@
  */
 @Configuration
 @OpenAPIDefinition(
-  info =@Info(
+  info = @Info(
     title = "${spring.application.name}",
     version = "${spring.application.version}",
     description = "Api and Models"
-  )
+  ),
+  security = @SecurityRequirement(name = "BearerAuth")
+)
+@SecurityScheme(
+  name = "BearerAuth",
+  type = SecuritySchemeType.HTTP,
+  bearerFormat = "JWT",
+  scheme = "bearer"
 )
 public class SwaggerConfig {
 }
diff --git a/src/main/java/it/gov/pagopa/pu/organization/security/WebSecurityConfig.java b/src/main/java/it/gov/pagopa/pu/organization/config/WebSecurityConfig.java
similarity index 98%
rename from src/main/java/it/gov/pagopa/pu/organization/security/WebSecurityConfig.java
rename to src/main/java/it/gov/pagopa/pu/organization/config/WebSecurityConfig.java
index d6952a7..7398061 100644
--- a/src/main/java/it/gov/pagopa/pu/organization/security/WebSecurityConfig.java
+++ b/src/main/java/it/gov/pagopa/pu/organization/config/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package it.gov.pagopa.pu.organization.security;
+package it.gov.pagopa.pu.organization.config;
 
 import com.nimbusds.jose.JOSEObjectType;
 import com.nimbusds.jose.proc.DefaultJOSEObjectTypeVerifier;
diff --git a/src/main/java/it/gov/pagopa/pu/organization/security/SwaggerSecurityConfiguration.java b/src/main/java/it/gov/pagopa/pu/organization/security/SwaggerSecurityConfiguration.java
deleted file mode 100644
index 14d43b5..0000000
--- a/src/main/java/it/gov/pagopa/pu/organization/security/SwaggerSecurityConfiguration.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package it.gov.pagopa.pu.organization.security;
-
-import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.security.SecurityScheme;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@SecurityScheme(
-  name = "BearerAuthentication",
-  type = SecuritySchemeType.HTTP,
-  bearerFormat = "JWT",
-  scheme = "bearer"
-)
-@SecurityRequirement(name = "BearerAuthentication")
-public class SwaggerSecurityConfiguration {
-}
diff --git a/src/test/java/it/gov/pagopa/pu/organization/security/WebSecurityConfigTest.java b/src/test/java/it/gov/pagopa/pu/organization/config/WebSecurityConfigTest.java
similarity index 98%
rename from src/test/java/it/gov/pagopa/pu/organization/security/WebSecurityConfigTest.java
rename to src/test/java/it/gov/pagopa/pu/organization/config/WebSecurityConfigTest.java
index 6dc299e..24976ab 100644
--- a/src/test/java/it/gov/pagopa/pu/organization/security/WebSecurityConfigTest.java
+++ b/src/test/java/it/gov/pagopa/pu/organization/config/WebSecurityConfigTest.java
@@ -1,4 +1,4 @@
-package it.gov.pagopa.pu.organization.security;
+package it.gov.pagopa.pu.organization.config;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;