SecurityLoginHandler add UserDetails

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.3.1</version>
+    <version>2.9.4</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.3.1</version>
+        <version>2.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.3.1</version>
+        <version>2.9.4</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.3.1</version>
+        <version>2.9.4</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

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

@@ -78,7 +78,7 @@ public void preHandle(HttpServletRequest request, HttpServletResponse response,
             }
 
             @Override
-            public LoginResponse postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest loginRequest, Token token) {
+            public LoginResponse postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest loginRequest,UserDetails userDetails, Token token) {
                 LoginResponse loginResponse = new LoginResponse();
                 loginResponse.setUsername(token.getUsername());
                 loginResponse.setToken(token.getToken());

springboot-starter-security/src/main/java/com/codingapi/springboot/security/filter/MyLoginFilter.java

@@ -18,7 +18,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
@@ -69,16 +69,21 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
     @Override
     protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authResult) throws IOException, ServletException {
         log.debug("login success authentication ~");
-        User user = (User) authResult.getPrincipal();
+        UserDetails user = (UserDetails) authResult.getPrincipal();
         LoginRequest loginRequest = LoginRequestContext.getInstance().get();
 
         Token token = tokenGateway.create(user.getUsername(), loginRequest.getPassword(),
                 user.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()),
                 TokenContext.getExtra());
 
-        LoginResponse loginResponse = loginHandler.postHandle(request, response, loginRequest, token);
+        LoginResponse loginResponse = loginHandler.postHandle(request, response, loginRequest, user, token);
 
         String content = JSONObject.toJSONString(SingleResponse.of(loginResponse));
+
+        // 设置响应的 Content-Type 为 JSON，并指定字符编码为 UTF-8
+        response.setContentType("application/json;charset=UTF-8");
+        response.setCharacterEncoding("UTF-8");
+
         IOUtils.write(content, response.getOutputStream(), StandardCharsets.UTF_8);
 
         LoginRequestContext.getInstance().clean();
@@ -89,7 +94,13 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
     protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) throws IOException, ServletException {
         log.debug("login fail authentication ~");
         String content = JSONObject.toJSONString(Response.buildFailure("login.error", failed.getMessage()));
+
+        // 设置响应的 Content-Type 为 JSON，并指定字符编码为 UTF-8
+        response.setContentType("application/json;charset=UTF-8");
+        response.setCharacterEncoding("UTF-8");
+
         IOUtils.write(content, response.getOutputStream(), StandardCharsets.UTF_8);
+
         LoginRequestContext.getInstance().clean();
     }
 }

springboot-starter-security/src/main/java/com/codingapi/springboot/security/filter/SecurityLoginHandler.java

@@ -3,6 +3,7 @@
 import com.codingapi.springboot.security.dto.request.LoginRequest;
 import com.codingapi.springboot.security.dto.response.LoginResponse;
 import com.codingapi.springboot.security.gateway.Token;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -12,5 +13,5 @@ public interface SecurityLoginHandler {
 
     void preHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest loginRequest) throws Exception;
 
-    LoginResponse postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest loginRequest, Token token);
+    LoginResponse postHandle(HttpServletRequest request, HttpServletResponse response, LoginRequest loginRequest, UserDetails userDetails, Token token);
 }

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.3.1</version>
+        <version>2.9.4</version>
     </parent>
     <artifactId>springboot-starter</artifactId>