Skip to content

Return Id On Api Key Creation #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2023
Merged

Return Id On Api Key Creation #487

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc9fb9b
Return id on creation of api key
aq-ikhwa-tech Nov 10, 2023
c2b9ba7
Merge branch 'dev' into return-id-on-api-key-creation
aq-ikhwa-tech Nov 10, 2023
671680b
Merge branch 'dev' into return-id-on-api-key-creation
FalkWolsky Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Return id on creation of api key
  • Loading branch information
@aq-ikhwa-tech
aq-ikhwa-tech committed Nov 10, 2023
commit cc9fb9bde4a12782b59bcf5b262bddbbe9fe78a3
2 changes: 2 additions & 0 deletions server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/APIKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.lowcoder.domain.user.model;

import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

Expand All @@ -8,6 +9,7 @@

@Getter
@Setter
@Builder
public class APIKey {

private String id;
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions ...-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/APIKeyVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down