(incubator-streampark) branch dev-2.1.5 updated: [Improve] set team bug fixed.

[benjobs]

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

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


The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
     new 51dc66cc2 [Improve] set team bug fixed.
51dc66cc2 is described below

commit 51dc66cc2d0ba71fe8084bffe3536edca086355f
Author: benjobs <benj...@apache.org>
AuthorDate: Fri Aug 9 22:08:05 2024 +0800

    [Improve] set team bug fixed.
---
 .../org/apache/streampark/console/base/domain/ResponseCode.java    | 2 ++
 .../streampark/console/system/controller/PassportController.java   | 6 ++++++
 .../streampark-console-webapp/src/views/base/login/LoginForm.vue   | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
index 80254608c..8c617031f 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
@@ -23,6 +23,8 @@ public interface ResponseCode {
 
   Long CODE_UNAUTHORIZED = 401L;
 
+  Long CODE_FORBIDDEN = 403L;
+
   Long CODE_FAIL = 500L;
 
   Long CODE_FAIL_ALERT = 501L;
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 6cec82158..46374d1f6 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
@@ -18,6 +18,7 @@
 package org.apache.streampark.console.system.controller;
 
 import org.apache.streampark.common.util.DateUtils;
+import org.apache.streampark.console.base.domain.ResponseCode;
 import org.apache.streampark.console.base.domain.RestResponse;
 import org.apache.streampark.console.core.enums.AuthenticationType;
 import org.apache.streampark.console.system.authentication.JWTToken;
@@ -67,6 +68,11 @@ public class PassportController {
       return RestResponse.success().put("code", 1);
     }
 
+    // no team.
+    if (user.getLastTeamId() == null) {
+      return RestResponse.success().data(user.getUserId()).put("code", 
ResponseCode.CODE_FORBIDDEN);
+    }
+
     this.userService.updateLoginTime(user.getUsername());
     String token = JWTUtil.sign(user, AuthenticationType.SIGN);
 
diff --git 
a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
 
b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
index f22f1c90b..98cbd7278 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
+++ 
b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
@@ -94,6 +94,7 @@
   import TeamModal from './teamModal.vue';
   import { LoginResultModel } from '/@/api/system/model/userModel';
   import { Result } from '/#/axios';
+  import { fetchUserTeam } from '/@/api/system/member';
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
 
@@ -164,6 +165,12 @@
               (code === 0 ? ' authentication error' : ' current User is 
locked.');
             createMessage.error(message);
             return;
+          } else if (code == 403) {
+            userId.value = data as unknown as string;
+            const teamList = await fetchUserTeam({ userId: userId.value });
+            userStore.setTeamList(teamList.map((i) => ({ label: i.teamName, 
value: i.id })));
+            modelVisible.value = true;
+            return;
           } else {
             console.log(data);
           }