[incubator-streampark] 01/01: [Improve] signin improvement

[be...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch login
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git

commit 26e2a091393e92deb4b5349111f2d8766850268f
Author: benjobs <be...@apache.org>
AuthorDate: Sun Apr 2 22:04:06 2023 +0800

    [Improve] signin improvement
---
 .../console/system/controller/PassportController.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
index c91f4f558..eb7799cf2 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
@@ -60,20 +60,13 @@ public class PassportController {
       @NotBlank(message = "{required}") String password,
       @NotBlank(message = "{required}") String loginType)
       throws Exception {
+
     if (StringUtils.isEmpty(username)) {
       return RestResponse.success().put("code", 0);
     }
-    User user = authenticator.authenticate(username, password, loginType);
-    return login(username, password, user);
-  }
 
-  @PostMapping("signout")
-  public RestResponse signout() {
-    SecurityUtils.getSecurityManager().logout(SecurityUtils.getSubject());
-    return new RestResponse();
-  }
+    User user = authenticator.authenticate(username, password, loginType);
 
-  private RestResponse login(String username, String password, User user) throws Exception {
     if (user == null) {
       return RestResponse.success().put("code", 0);
     }
@@ -82,6 +75,7 @@ public class PassportController {
       return RestResponse.success().put("code", 1);
     }
 
+    // set team
     userService.fillInTeam(user);
 
     // no team.
@@ -100,4 +94,10 @@ public class PassportController {
         userService.generateFrontendUserInfo(user, user.getLastTeamId(), jwtToken);
     return new RestResponse().data(userInfo);
   }
+
+  @PostMapping("signout")
+  public RestResponse signout() {
+    SecurityUtils.getSecurityManager().logout(SecurityUtils.getSubject());
+    return new RestResponse();
+  }
 }