[incubator-streampark] branch sso updated: sso login improve

[benjobs]

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

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


The following commit(s) were added to refs/heads/sso by this push:
     new 694cf4dd0 sso login improve
694cf4dd0 is described below

commit 694cf4dd0e71fd0467863d09a52a32614297242a
Author: benjobs <benj...@apache.org>
AuthorDate: Sat Jul 1 15:32:45 2023 +0800

    sso login improve
---
 .../streampark/console/system/controller/PassportController.java    | 5 +----
 .../apache/streampark/console/system/controller/SsoController.java  | 4 +---
 .../org/apache/streampark/console/system/service/UserService.java   | 2 +-
 .../streampark/console/system/service/impl/UserServiceImpl.java     | 6 ++----
 4 files changed, 5 insertions(+), 12 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 fcdbe5d33..92558aefc 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
@@ -39,7 +39,6 @@ import javax.validation.constraints.NotBlank;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Tag(name = "PASSPORT_TAG")
 @Slf4j
@@ -83,10 +82,8 @@ public class PassportController {
     if (StringUtils.isEmpty(username)) {
       return RestResponse.success().put("code", 0);
     }
-
     User user = authenticator.authenticate(username, password, loginType);
-    Map<String, Object> userInfo = userService.getLoginUserInfo(user);
-    return RestResponse.success(userInfo);
+    return userService.getLoginUserInfo(user);
   }
 
   @Operation(summary = "Signout")
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
index cf2cdfe62..06956d107 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
@@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Controller
@@ -85,7 +84,6 @@ public class SsoController {
     }
 
     User user = authenticator.authenticate(principal.getName(), null, 
LoginType.SSO.toString());
-    Map<String, Object> userInfo = userService.getLoginUserInfo(user);
-    return RestResponse.success(userInfo);
+    return userService.getLoginUserInfo(user);
   }
 }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
index 2a592acbd..af513023e 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
@@ -114,5 +114,5 @@ public interface UserService extends IService<User> {
 
   void transferResource(Long userId, Long targetUserId);
 
-  Map<String, Object> getLoginUserInfo(User user);
+  RestResponse getLoginUserInfo(User user);
 }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index 9041f417a..cba5f6c16 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -280,8 +280,7 @@ public class UserServiceImpl extends 
ServiceImpl<UserMapper, User> implements Us
   }
 
   @Override
-  public Map<String, Object> getLoginUserInfo(User user) {
-
+  public RestResponse getLoginUserInfo(User user) {
     if (user == null) {
       return RestResponse.success().put("code", 0);
     }
@@ -289,7 +288,6 @@ public class UserServiceImpl extends 
ServiceImpl<UserMapper, User> implements Us
     if (User.STATUS_LOCK.equals(user.getStatus())) {
       return RestResponse.success().put("code", 1);
     }
-
     // set team
     fillInTeam(user);
 
@@ -306,6 +304,6 @@ public class UserServiceImpl extends 
ServiceImpl<UserMapper, User> implements Us
     String userId = RandomStringUtils.randomAlphanumeric(20);
     user.setId(userId);
     Map<String, Object> userInfo = generateFrontendUserInfo(user, 
user.getLastTeamId(), jwtToken);
-    return new RestResponse().data(userInfo);
+    return RestResponse.success(userInfo);
   }
 }