Clean

Author: NeftaliYagua

src/main/java/net/coderic/core/api/ApiRestServerApplication.java

@@ -2,9 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @SpringBootApplication
 public class ApiRestServerApplication  {

src/main/java/net/coderic/core/api/RestExceptionHandler.java

@@ -1,7 +1,6 @@
 package net.coderic.core.api.config;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.config.annotation.*;
 
 

src/main/java/net/coderic/core/api/config/MvcConfig.java

@@ -23,7 +23,7 @@
 )
 @Configuration
 public class OpenApi30Config {
-    String schemeName = "bearerAuth";
+    String schemeName = "Bearer Token";
     String bearerFormat = "JWT";
     String scheme = "bearer";
     @Bean

src/main/java/net/coderic/core/api/config/OpenApi30Config.java

@@ -1,37 +1,15 @@
 package net.coderic.core.api.config;
 
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.jwk.JWK;
-import com.nimbusds.jose.jwk.JWKSet;
-import com.nimbusds.jose.jwk.RSAKey;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.Customizer;
 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.oauth2.jwt.JwtDecoder;
-import org.springframework.security.oauth2.jwt.JwtDecoders;
-import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler;
-import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter;
 import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import javax.crypto.spec.SecretKeySpec;
-import java.io.IOException;
-import java.net.URL;
-import java.security.PublicKey;
-import java.security.interfaces.RSAPublicKey;
-import java.text.ParseException;
-import java.util.Arrays;
 
 @Configuration
 @EnableWebSecurity
@@ -86,22 +64,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
         );
         return http.build();
     }
-    @Bean
-    public CorsConfigurationSource corsConfigurationSource() {
-        CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(Arrays.asList("https://example.com", "http://localhost:4200"));
-        configuration.setAllowedMethods(Arrays.asList("GET","POST","PUT","PATCH","HEAD","OPTIONS"));
-        configuration.addAllowedHeader("Content-Type");
-        configuration.addAllowedHeader("Authorization");
-        configuration.getMaxAge();
-        configuration.setAllowCredentials(true);
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", configuration); // allow all paths
-        return source;
-    }
 
     private JwtAuthenticationConverter jwtAuthenticationConverter() {
-        JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
-        return converter;
+        return new JwtAuthenticationConverter();
     }
 }

src/main/java/net/coderic/core/api/config/SecurityConfiguration.java

@@ -15,21 +15,11 @@
 public class HelloController {
     SecurityContextLogoutHandler logoutHandler = new SecurityContextLogoutHandler();
     @GetMapping("/user")
-    public ResponseEntity<Principal> getUser(@AuthenticationPrincipal Principal principal) {
+    public ResponseEntity<Principal> getUser(Principal principal) {
         return new ResponseEntity<Principal>(principal, HttpStatus.OK);
     }
     @GetMapping("/hello")
     public String hello(Principal principal) {
         return "Hello, " + principal.getName() + "!";
     }
-    /*
-    @GetMapping("/logout")
-    public ResponseEntity<Boolean> getLogout(Authentication authentication, HttpServletRequest request, HttpServletResponse response) {
-
-        this.logoutHandler.logout(request, response, authentication);
-
-        return new ResponseEntity<Boolean>(true, HttpStatus.UNAUTHORIZED);
-    }
-
-    */
 }

src/main/java/net/coderic/core/api/config/ThymeleafConfig.java

@@ -6,7 +6,6 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
-
 @Controller
 public class IndexController {
     @GetMapping("/")

src/main/java/net/coderic/core/api/controllers/HelloController.java

@@ -1,4 +1,4 @@
-package net.coderic.core.api;
+package net.coderic.core.api.errors;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/net/coderic/core/api/controllers/IndexController.java

@@ -1,16 +1,11 @@
-package net.coderic.core.api;
+package net.coderic.core.api.errors;
 /**
  * <p>RecordNotSuchElementException class.</p>
  *
  * @author <a href="mailto:[email protected]">Neftalí Yagua</a>
  * @version $Id: $Id
  */
 public class RecordNotSuchElementException extends NoSuchElementFoundException {
-    /**
-     * <p>Constructor for RecordNotSuchElementException.</p>
-     *
-     * @param message a {@link java.lang.String} object
-     */
     public RecordNotSuchElementException(String message) {
         super(message);
     }

src/main/java/net/coderic/core/api/NoSuchElementFoundException.java renamed to src/main/java/net/coderic/core/api/errors/NoSuchElementFoundException.java

@@ -1,4 +1,4 @@
-package net.coderic.core.api;
+package net.coderic.core.api.errors;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.http.HttpStatus;