Skip to content

Commit cc9fb9b

Browse files
committed
Return id on creation of api key
1 parent 841390b commit cc9fb9b

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lowcoder.domain.user.model;
22

3+
import lombok.Builder;
34
import lombok.Getter;
45
import lombok.Setter;
56

@@ -8,6 +9,7 @@
89

910
@Getter
1011
@Setter
12+
@Builder
1113
public class APIKey {
1214

1315
private String id;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public Mono<APIKeyVO> createAPIKey(APIKeyRequest apiKeyRequest) {
273273
String token = jwtUtils.createToken(user);
274274
APIKey apiKey = new APIKey(apiKeyRequest.getId(), apiKeyRequest.getName(), apiKeyRequest.getDescription(), token);
275275
addAPIKey(user, apiKey);
276-
return Pair.of(token, user);
276+
return Pair.of(APIKey.builder().id(apiKey.getId()).token(token).build(), user);
277277
})
278278
.flatMap(pair -> userService.update(pair.getRight().getId(), pair.getRight()).thenReturn(pair.getKey()))
279279
.map(APIKeyVO::from);

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22

33
import lombok.Builder;
44
import lombok.Getter;
5+
import org.lowcoder.domain.user.model.APIKey;
56

67
@Builder
78
@Getter
89
public class APIKeyVO {
910

11+
private final String id;
1012
private final String token;
1113

12-
public static APIKeyVO from(String token) {
14+
public static APIKeyVO from(APIKey apiKey) {
1315
return APIKeyVO.builder()
14-
.token(token)
16+
.id(apiKey.getId())
17+
.token(apiKey.getToken())
1518
.build();
1619
}
1720

0 commit comments

Comments
 (0)