Implement securitySchemeName

Author: SebastianLopezO

.env.example

@@ -50,6 +50,7 @@ SECURITY_JWT_SECRET_KEY=<JWT_SECRET_KEY>  # Secret key for signing JWT tokens
 SECURITY_JWT_EXPIRATION=<JWT_EXPIRATION>  # JWT expiration time (in ms)
 SECURITY_PUBLIC_ROUTES=<PUBLIC_ROUTES>    # Public routes that do not require authentication (e.g., /auth/login)
 SECURITY_AES_KEY=<AES_KEY>              # AES encryption key for sensitive data
+SECURITY_SCHEME_NAME=<NAME_SECURITY_SCHEMA>  # Name of the security scheme used in API documentation
 
 # Rate Limiting Config
 # Settings for API rate limiting

src/main/java/smartpot/com/api/Documentation/SwaggerConfig.java

@@ -1,10 +1,10 @@
 package smartpot.com.api.Documentation;
 
+import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,10 +26,11 @@ public class SwaggerConfig {
     @Value("${DESCRIPTION}")
     private String description;
 
+    @Value("${SECURITY_SCHEME_NAME}")
+    private String securitySchemeName;
 
     @Bean
     public OpenAPI customOpenAPI() {
-        final String securitySchemeName = "BearerAuth";
 
         return new OpenAPI()
                 .info(new Info()
@@ -44,10 +45,11 @@ public OpenAPI customOpenAPI() {
                 .components(new Components()
                         .addSecuritySchemes(securitySchemeName,
                                 new SecurityScheme()
-                                        .name(securitySchemeName)
-                                        .type(SecurityScheme.Type.HTTP)
-                                        .scheme("bearer")
-                                        .bearerFormat("JWT"))
+                                        .name("Authorization")
+                                        .type(SecurityScheme.Type.APIKEY)
+                                        .in(SecurityScheme.In.HEADER)
+                                        .description("Usar el formato: " + securitySchemeName + " <token>")
+                        )
                 );
 
 

src/main/java/smartpot/com/api/Security/Config/Filters/JwtAuthFilter.java

@@ -38,7 +38,8 @@ protected void doFilterInternal(
                     user, user.getPassword(), null /* user.getAuthorities() */);
             authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
             SecurityContextHolder.getContext().setAuthentication(authToken);
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+        }
         filterChain.doFilter(request, response);
     }
 }

src/main/java/smartpot/com/api/Security/Config/SecurityConfiguration.java

@@ -10,7 +10,6 @@
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;

src/main/java/smartpot/com/api/Security/Controller/AuthController.java

@@ -81,6 +81,7 @@ public ResponseEntity<?> register(@RequestBody UserDTO reqUser) {
             );
         }
     }
+
     @PostMapping("/password/forgot")
     @Operation(
             summary = "Solicitud de recuperación de contraseña",

src/main/java/smartpot/com/api/Security/Service/AESEncryptionService.java

@@ -20,7 +20,8 @@ public class AESEncryptionService implements EncryptionServiceI {
     @Value("${application.security.aes.key}")
     private String aesKey;
 
-    public AESEncryptionService() {}
+    public AESEncryptionService() {
+    }
 
     private SecretKey getSecretKey() {
         byte[] decoded = Base64.getDecoder().decode(aesKey);
@@ -50,7 +51,8 @@ public String encrypt(String data) throws EncryptionException {
             System.arraycopy(iv, 0, output, 0, iv.length);
             System.arraycopy(encrypted, 0, output, iv.length, encrypted.length);
             return Base64.getUrlEncoder().encodeToString(output);
-        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | // if you need more specific errors, catch each one separately
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                 // if you need more specific errors, catch each one separately
                  InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
             throw new EncryptionException("Error while encrypting data");
         }
@@ -74,7 +76,8 @@ public String decrypt(String encryptedData) throws EncryptionException {
 
             // remove salt
             return result.split(":", 2)[1];
-        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | // if you need more specific errors, catch each one separately
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                 // if you need more specific errors, catch each one separately
                  InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
             throw new EncryptionException("Error while decrypting data");
         }

src/main/java/smartpot/com/api/Security/Service/EncryptionServiceI.java

@@ -11,5 +11,6 @@
 
 public interface EncryptionServiceI {
     String encrypt(String plainText) throws EncryptionException, NoSuchPaddingException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException, InvalidKeyException;
+
     String decrypt(String cipherText) throws EncryptionException;
 }

src/main/java/smartpot/com/api/Security/Service/JwtService.java

@@ -18,8 +18,12 @@
 import smartpot.com.api.Security.Model.DTO.ResetTokenDTO;
 import smartpot.com.api.Users.Model.DTO.UserDTO;
 import smartpot.com.api.Users.Service.SUserI;
+
 import javax.crypto.SecretKey;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 @Service
 public class JwtService implements JwtServiceI {
@@ -142,7 +146,7 @@ public Boolean forgotPassword(String email) throws Exception {
                         throw new ValidationException(e);
                     }
                 })
-                .map(token -> new ResetTokenDTO(token, "reset", new Date(System.currentTimeMillis() + expiration) ))
+                .map(token -> new ResetTokenDTO(token, "reset", new Date(System.currentTimeMillis() + expiration)))
                 .map(token -> {
                     try {
                         return encryptionService.encrypt(ResetTokenDTO.convertToJson(token));