Merge pull request #487 from lowcoder-org/return-id-on-api-key-creation

Return Id On Api Key Creation

Author: FalkWolsky

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/APIKey.java

@@ -1,5 +1,6 @@
 package org.lowcoder.domain.user.model;
 
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,6 +9,7 @@
 
 @Getter
 @Setter
+@Builder
 public class APIKey {
 
     private String id;

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

@@ -273,7 +273,7 @@ public Mono<APIKeyVO> createAPIKey(APIKeyRequest apiKeyRequest) {
                     String token = jwtUtils.createToken(user);
                     APIKey apiKey = new APIKey(apiKeyRequest.getId(), apiKeyRequest.getName(), apiKeyRequest.getDescription(), token);
                     addAPIKey(user, apiKey);
-                    return Pair.of(token, user);
+                    return Pair.of(APIKey.builder().id(apiKey.getId()).token(token).build(), user);
                 })
                 .flatMap(pair -> userService.update(pair.getRight().getId(), pair.getRight()).thenReturn(pair.getKey()))
                 .map(APIKeyVO::from);

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/APIKeyVO.java

@@ -2,16 +2,19 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.lowcoder.domain.user.model.APIKey;
 
 @Builder
 @Getter
 public class APIKeyVO {
 
+    private final String id;
     private final String token;
 
-    public static APIKeyVO from(String token) {
+    public static APIKeyVO from(APIKey apiKey) {
         return APIKeyVO.builder()
-                .token(token)
+                .id(apiKey.getId())
+                .token(apiKey.getToken())
                 .build();
     }