refactor

src/main/java/com/keymobile/login/SsoApplication.java → src/main/java/com/keymobile/sso/SsoApplication.java

-package com.keymobile.login;
+package com.keymobile.sso;
 
+import com.keymobile.authservice.component.SecurityConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@ComponentScan(basePackages = {"com.keymobile.config.logging", "com.keymobile.config.naming",
-        "com.keymobile.config.redisclient"})
+@ComponentScan(basePackages = {"com.keymobile.sso",
+        "com.keymobile.config.logging", "com.keymobile.config.naming",
+        "com.keymobile.config.redisclient", "com.keymobile.authservice.component"}, excludeFilters = {
+        @ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value= SecurityConfig.class)
+})
 @PropertySource(value = "classpath:/application.yml")
 public class SsoApplication {
 

src/main/java/com/keymobile/login/api/Constants.java → src/main/java/com/keymobile/sso/api/Constants.java

-package com.keymobile.login.api;
+package com.keymobile.sso.api;
 
 public class Constants {
 

src/main/java/com/keymobile/login/api/LoginManagement.java → src/main/java/com/keymobile/sso/api/LoginManagement.java

-package com.keymobile.login.api;
+package com.keymobile.sso.api;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

src/main/java/com/keymobile/login/conf/RESTAuthenticationEntryPoint.java → src/main/java/com/keymobile/sso/conf/RESTAuthenticationEntryPoint.java

-package com.keymobile.login.conf;
+package com.keymobile.sso.conf;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/keymobile/login/conf/RESTAuthenticationFailureHandler.java → src/main/java/com/keymobile/sso/conf/RESTAuthenticationFailureHandler.java

-package com.keymobile.login.conf;
+package com.keymobile.sso.conf;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/keymobile/login/conf/RESTAuthenticationSuccessHandler.java → src/main/java/com/keymobile/sso/conf/RESTAuthenticationSuccessHandler.java

-package com.keymobile.login.conf;
+package com.keymobile.sso.conf;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -15,7 +15,7 @@ import java.io.PrintWriter;
 @Component
 public class RESTAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
 
-    @Value("${security.allowRootLogin:true}")
+    @Value("${self.web.login.allowRoot:true}")
     private boolean rootAllowLogin = true;
 
     @Override

src/main/java/com/keymobile/login/conf/RESTLogoutSuccessHandler.java → src/main/java/com/keymobile/sso/conf/RESTLogoutSuccessHandler.java

-package com.keymobile.login.conf;
+package com.keymobile.sso.conf;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/keymobile/login/conf/SecurityConfig.java → src/main/java/com/keymobile/sso/conf/SsoSecurityConfig.java

-package com.keymobile.login.conf;
+package com.keymobile.sso.conf;
 
-
-import com.keymobile.authservice.component.CustomizedUserDetailService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
 
-import javax.sql.DataSource;
-
 
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@ComponentScan("com.keymobile.authservice.component")
-public class SecurityConfig {
+public class SsoSecurityConfig {
 
     @Autowired
     private RESTAuthenticationEntryPoint authenticationEntryPoint;
@@ -36,27 +27,32 @@ public class SecurityConfig {
     private RESTLogoutSuccessHandler logoutSuccessHandler;
 
     @Bean
-    public UserDetailsManager users(DataSource dataSource) {
-        return new CustomizedUserDetailService(dataSource);
-    }
-
-    @Bean
     public PasswordEncoder passwordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
 
     @Bean
     protected SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http.authorizeHttpRequests((request) -> {
+            request.anyRequest().permitAll();
+        });
+        http.csrf((httpSecurityCsrfConfigurer) -> {
+            httpSecurityCsrfConfigurer.disable();
+        });
+        http.exceptionHandling((exceptionHandling) -> {
+            exceptionHandling.authenticationEntryPoint(authenticationEntryPoint);
+        });
+        http.formLogin((formLogin) -> {
+            formLogin.successHandler(authenticationSuccessHandler);
+            formLogin.failureHandler(authenticationFailureHandler);
+            formLogin.loginPage("/login");
+            formLogin.loginProcessingUrl("/signin");
+        });
+        http.logout((logout) -> {
+            logout.logoutUrl("/signout");
+            logout.logoutSuccessHandler(logoutSuccessHandler);
+        });
 
-        http.authorizeRequests().anyRequest().permitAll();
-        http.csrf().disable();
-        http.exceptionHandling().authenticationEntryPoint(authenticationEntryPoint);
-        http.formLogin().successHandler(authenticationSuccessHandler);
-        http.formLogin().failureHandler(authenticationFailureHandler);
-        http.formLogin().loginPage("/login");
-        http.formLogin().loginProcessingUrl("/signin");
-        http.logout().logoutUrl("/signout");
-        http.logout().logoutSuccessHandler(logoutSuccessHandler);
         return http.build();
     }
 

src/main/java/com/keymobile/login/exception/ApiError.java → src/main/java/com/keymobile/sso/exception/ApiError.java

-package com.keymobile.login.exception;
+package com.keymobile.sso.exception;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.springframework.http.HttpStatus;

src/main/java/com/keymobile/login/exception/RestExceptionHandler.java → src/main/java/com/keymobile/sso/exception/RestExceptionHandler.java

-package com.keymobile.login.exception;
+package com.keymobile.sso.exception;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

src/main/java/com/keymobile/login/logging/LogConstants.java → src/main/java/com/keymobile/sso/logging/LogConstants.java

-package com.keymobile.login.logging;
+package com.keymobile.sso.logging;
 
 public interface LogConstants {
 

src/main/java/com/keymobile/login/logging/LogManager.java → src/main/java/com/keymobile/sso/logging/LogManager.java

-package com.keymobile.login.logging;
+package com.keymobile.sso.logging;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;