add #40

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.1.10</version>
+    <version>3.2.0.dev</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
@@ -145,7 +145,7 @@
 
             <dependency>
                 <groupId>com.codingapi.springboot</groupId>
-                <artifactId>springboot-starter-security-jwt</artifactId>
+                <artifactId>springboot-starter-security</artifactId>
                 <version>${codingapi.framework.version}</version>
             </dependency>
 
@@ -251,7 +251,7 @@
             </activation>
             <modules>
                 <module>springboot-starter</module>
-                <module>springboot-starter-security-jwt</module>
+                <module>springboot-starter-security</module>
                 <module>springboot-starter-data-fast</module>
             </modules>
         </profile>
@@ -262,7 +262,7 @@
 
             <modules>
                 <module>springboot-starter</module>
-                <module>springboot-starter-security-jwt</module>
+                <module>springboot-starter-security</module>
                 <module>springboot-starter-data-fast</module>
             </modules>
 
@@ -311,7 +311,7 @@
 
             <modules>
                 <module>springboot-starter</module>
-                <module>springboot-starter-security-jwt</module>
+                <module>springboot-starter-security</module>
                 <module>springboot-starter-data-fast</module>
             </modules>
 

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.1.10</version>
+        <version>3.2.0.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/crypto/MyCryptoConfiguration.java

@@ -6,13 +6,13 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.1.10</version>
+        <version>3.2.0.dev</version>
     </parent>
 
-    <artifactId>springboot-starter-security-jwt</artifactId>
+    <artifactId>springboot-starter-security</artifactId>
 
-    <name>springboot-starter-security-jwt</name>
-    <description>springboot-starter-security-jwt project for Spring Boot</description>
+    <name>springboot-starter-security</name>
+    <description>springboot-starter-security project for Spring Boot</description>
 
     <properties>
         <java.version>17</java.version>

springboot-starter-security-jwt/pom.xml renamed to springboot-starter-security/pom.xml

@@ -4,9 +4,9 @@
 import com.codingapi.springboot.security.controller.VersionController;
 import com.codingapi.springboot.security.dto.request.LoginRequest;
 import com.codingapi.springboot.security.filter.*;
-import com.codingapi.springboot.security.jwt.Jwt;
-import com.codingapi.springboot.security.jwt.Token;
-import com.codingapi.springboot.security.properties.SecurityJwtProperties;
+import com.codingapi.springboot.security.gateway.Token;
+import com.codingapi.springboot.security.gateway.TokenGateway;
+import com.codingapi.springboot.security.properties.CodingApiSecurityProperties;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -60,23 +60,23 @@ public PasswordEncoder passwordEncoder() {
 
     @Bean
     @ConditionalOnMissingBean
-    public SecurityLoginHandler securityLoginHandler(){
-       return new SecurityLoginHandler() {
-           @Override
-           public void preHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest handler) throws Exception {
+    public SecurityLoginHandler securityLoginHandler() {
+        return new SecurityLoginHandler() {
+            @Override
+            public void preHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest handler) throws Exception {
 
-           }
+            }
 
-           @Override
-           public void postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest handler, Token token) {
+            @Override
+            public void postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest handler, Token token) {
 
-           }
-       };
+            }
+        };
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public AuthenticationTokenFilter authenticationTokenFilter(){
+    public AuthenticationTokenFilter authenticationTokenFilter() {
         return (request, response, chain) -> {
 
         };
@@ -85,17 +85,17 @@ public AuthenticationTokenFilter authenticationTokenFilter(){
 
     @Bean
     @ConditionalOnMissingBean
-    public SecurityFilterChain filterChain(HttpSecurity security, Jwt jwt,SecurityLoginHandler loginHandler,
-                                           SecurityJwtProperties properties,AuthenticationTokenFilter authenticationTokenFilter) throws Exception {
+    public SecurityFilterChain filterChain(HttpSecurity security, TokenGateway tokenGateway, SecurityLoginHandler loginHandler,
+                                           CodingApiSecurityProperties properties, AuthenticationTokenFilter authenticationTokenFilter) throws Exception {
         //disable basic auth
         security.httpBasic().disable();
 
         //before add addCorsMappings to enable cors.
         security.cors();
-        if(properties.isDisableCsrf() ){
+        if (properties.isDisableCsrf()) {
             security.csrf().disable();
         }
-        security.apply(new HttpSecurityConfigurer(jwt,loginHandler,properties,authenticationTokenFilter));
+        security.apply(new HttpSecurityConfigurer(tokenGateway, loginHandler, properties, authenticationTokenFilter));
         security
                 .exceptionHandling()
                 .authenticationEntryPoint(new MyUnAuthenticationEntryPoint())
@@ -135,18 +135,11 @@ public AuthenticationProvider authenticationProvider(UserDetailsService userDeta
 
 
     @Bean
-    @ConditionalOnMissingBean
-    public Jwt jwt(SecurityJwtProperties properties) {
-        return new Jwt(properties.getJwtSecretKey(), properties.getJwtTime(), properties.getJwtRestTime());
-    }
-
-
-    @Bean
-    public WebMvcConfigurer corsConfigurer(SecurityJwtProperties securityJwtProperties) {
+    public WebMvcConfigurer corsConfigurer(CodingApiSecurityProperties securityJwtProperties) {
         return new WebMvcConfigurer() {
             @Override
             public void addCorsMappings(CorsRegistry registry) {
-                if(securityJwtProperties.isDisableCors()) {
+                if (securityJwtProperties.isDisableCors()) {
                     registry.addMapping("/**")
                             .allowedHeaders("*")
                             .allowedMethods("*")
@@ -163,14 +156,14 @@ public void addCorsMappings(CorsRegistry registry) {
 
     @Bean
     @ConfigurationProperties(prefix = "codingapi.security")
-    public SecurityJwtProperties securityJwtProperties() {
-        return new SecurityJwtProperties();
+    public CodingApiSecurityProperties codingApiSecurityProperties() {
+        return new CodingApiSecurityProperties();
     }
 
 
     @Bean
     @ConditionalOnMissingBean
-    public VersionController versionController(Environment environment){
+    public VersionController versionController(Environment environment) {
         return new VersionController(environment);
     }
 

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/AutoConfiguration.java renamed to springboot-starter-security/src/main/java/com/codingapi/springboot/security/AutoConfiguration.java

@@ -4,8 +4,8 @@
 import com.codingapi.springboot.security.filter.MyAuthenticationFilter;
 import com.codingapi.springboot.security.filter.MyLoginFilter;
 import com.codingapi.springboot.security.filter.SecurityLoginHandler;
-import com.codingapi.springboot.security.jwt.Jwt;
-import com.codingapi.springboot.security.properties.SecurityJwtProperties;
+import com.codingapi.springboot.security.gateway.TokenGateway;
+import com.codingapi.springboot.security.properties.CodingApiSecurityProperties;
 import lombok.AllArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -14,16 +14,16 @@
 @AllArgsConstructor
 public class HttpSecurityConfigurer extends AbstractHttpConfigurer<HttpSecurityConfigurer, HttpSecurity> {
 
-    private final Jwt jwt;
+    private final TokenGateway tokenGateway;
 
     private final SecurityLoginHandler securityLoginHandler;
-    private final SecurityJwtProperties securityJwtProperties;
+    private final CodingApiSecurityProperties securityJwtProperties;
     private final AuthenticationTokenFilter authenticationTokenFilter;
 
     @Override
     public void configure(HttpSecurity security) throws Exception {
         AuthenticationManager manager = security.getSharedObject(AuthenticationManager.class);
-        security.addFilter(new MyLoginFilter(manager, jwt,securityLoginHandler, securityJwtProperties));
-        security.addFilter(new MyAuthenticationFilter(manager,securityJwtProperties,jwt,authenticationTokenFilter));
+        security.addFilter(new MyLoginFilter(manager, tokenGateway, securityLoginHandler, securityJwtProperties));
+        security.addFilter(new MyAuthenticationFilter(manager, securityJwtProperties, tokenGateway, authenticationTokenFilter));
     }
 }

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/configurer/HttpSecurityConfigurer.java renamed to springboot-starter-security/src/main/java/com/codingapi/springboot/security/configurer/HttpSecurityConfigurer.java

@@ -1,6 +1,6 @@
 package com.codingapi.springboot.security.configurer;
 
-import com.codingapi.springboot.security.properties.SecurityJwtProperties;
+import com.codingapi.springboot.security.properties.CodingApiSecurityProperties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
@@ -10,7 +10,7 @@
 @AllArgsConstructor
 public class WebSecurityConfigurer implements WebSecurityCustomizer {
 
-    private final SecurityJwtProperties securityJwtProperties;
+    private final CodingApiSecurityProperties securityJwtProperties;
 
     @Override
     public void customize(WebSecurity web) {