(incubator-streampark) branch dev-2.1.5 updated: [Improve] accessToken check exists imporvement

[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 2c47bb386 [Improve] accessToken check exists imporvement
2c47bb386 is described below

commit 2c47bb386796ffe9405a39086ce6e7dcc7504666
Author: benjobs <benj...@apache.org>
AuthorDate: Sat Aug 3 22:37:43 2024 +0800

    [Improve] accessToken check exists imporvement
---
 .../streampark/console/system/mapper/AccessTokenMapper.java      | 3 ---
 .../console/system/service/impl/AccessTokenServiceImpl.java      | 7 +++++++
 .../src/main/resources/mapper/system/AccessTokenMapper.xml       | 9 ---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/AccessTokenMapper.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/AccessTokenMapper.java
index d36edec4e..90d978f61 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/AccessTokenMapper.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/AccessTokenMapper.java
@@ -29,9 +29,6 @@ public interface AccessTokenMapper extends 
BaseMapper<AccessToken> {
 
   IPage<AccessToken> page(Page<AccessToken> page, @Param("accessToken") 
AccessToken accessToken);
 
-  AccessToken getByUserToken(
-      @Param("userId") Long userId, @Param("accessToken") String accessToken);
-
   AccessToken getById(@Param("id") Long id);
 
   AccessToken getByUserId(@Param("userId") Long userId);
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 46f77b66a..eebb8e163 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -56,6 +56,13 @@ public class AccessTokenServiceImpl extends 
ServiceImpl<AccessTokenMapper, Acces
       return RestResponse.success().put("code", 0).message("user not 
available");
     }
 
+    AccessToken existAccessToken = baseMapper.getByUserId(user.getUserId());
+    if (existAccessToken != null) {
+      return RestResponse.success()
+          .put("code", 0)
+          .message(String.format("user %s already has a token", 
user.getUsername()));
+    }
+
     String token = JWTUtil.sign(user, AuthenticationType.OPENAPI, 
Long.MAX_VALUE);
     AccessToken accessToken = new AccessToken();
     accessToken.setToken(token);
diff --git 
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/AccessTokenMapper.xml
 
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/AccessTokenMapper.xml
index b180943d5..624343a78 100644
--- 
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/AccessTokenMapper.xml
+++ 
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/AccessTokenMapper.xml
@@ -51,15 +51,6 @@
         where t1.user_id = #{userId}
     </select>
 
-    <select id="getByUserToken" 
resultType="org.apache.streampark.console.system.entity.AccessToken">
-        select
-        <include refid="Base_Column_List"/>
-        from t_user t2
-        join t_access_token t1 on t1.user_id = t2.user_id
-        where t1.user_id = #{userId}
-        and t1.token = #{accessToken,jdbcType=VARCHAR}
-    </select>
-
     <select id="getById" 
resultType="org.apache.streampark.console.system.entity.AccessToken">
         select
         <include refid="Base_Column_List"/>