Skip to content

Commit 5c37d58

Browse files
committed
add applicationid param to private npm repository endpoint
1 parent a9f94b2 commit 5c37d58

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import lombok.RequiredArgsConstructor;
44
import org.jetbrains.annotations.NotNull;
55
import org.lowcoder.api.home.SessionUserService;
6+
import org.lowcoder.domain.application.service.ApplicationServiceImpl;
7+
import org.lowcoder.domain.organization.service.OrgMemberServiceImpl;
68
import org.lowcoder.domain.organization.service.OrganizationService;
79
import org.lowcoder.infra.constant.NewUrl;
810
import org.lowcoder.infra.js.NodeServerHelper;
@@ -27,22 +29,24 @@ public class PrivateNpmRegistryController implements PrivateNpmRegistryEndpoint{
2729

2830
private static final String NPM_REGISTRY_METADATA = "npm/registry";
2931
private static final String NPM_REGISTRY_ASSET = "npm/package";
32+
private final OrgMemberServiceImpl orgMemberServiceImpl;
33+
private final ApplicationServiceImpl applicationServiceImpl;
3034

3135
@Override
32-
public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String name) {
33-
return forwardToNodeService(name, NPM_REGISTRY_METADATA);
36+
public Mono<ResponseEntity<Resource>> getNpmPackageMeta(String applicationId, String name) {
37+
return forwardToNodeService(applicationId, name, NPM_REGISTRY_METADATA);
3438
}
3539

3640
@Override
37-
public Mono<ResponseEntity<Resource>> getNpmPackageAsset(String path) {
38-
return forwardToNodeService(path, NPM_REGISTRY_ASSET);
41+
public Mono<ResponseEntity<Resource>> getNpmPackageAsset(String applicationId, String path) {
42+
return forwardToNodeService(applicationId, path, NPM_REGISTRY_ASSET);
3943
}
4044

4145
@NotNull
42-
private Mono<ResponseEntity<Resource>> forwardToNodeService(String path, String prefix) {
46+
private Mono<ResponseEntity<Resource>> forwardToNodeService(String applicationId, String path, String prefix) {
4347
String withoutLeadingSlash = path.startsWith("/") ? path.substring(1) : path;
44-
return sessionUserService.getVisitorOrgMemberCache().flatMap(orgMember -> organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> {
45-
Map<String, Object> config = Map.of("npmRegistries", organizationCommonSettings.get("npmRegistries"), "workspaceId", orgMember.getOrgId());
48+
return applicationServiceImpl.findById(applicationId).flatMap(application -> organizationService.getById(application.getOrganizationId())).flatMap(orgMember -> organizationService.getOrgCommonSettings(orgMember.getId()).flatMap(organizationCommonSettings -> {
49+
Map<String, Object> config = Map.of("npmRegistries", organizationCommonSettings.get("npmRegistries"), "workspaceId", orgMember.getId());
4650
return WebClientBuildHelper.builder()
4751
.systemProxy()
4852
.build()

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ public interface PrivateNpmRegistryEndpoint {
2121
summary = "Get NPM registry Metadata",
2222
description = "Retrieve the metadata of private NPM registry package."
2323
)
24-
@GetMapping("/registry/{name}")
25-
public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String name);
24+
@GetMapping("/registry/{applicationId}/{name}")
25+
public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String applicationId, @PathVariable String name);
2626

2727
@Operation(
2828
tags = TAG_NPM_REGISTRY_MANAGEMENT,
2929
operationId = "getNpmPackageAsset",
3030
summary = "Get NPM registry asset",
3131
description = "Retrieve the asset of private NPM registry package."
3232
)
33-
@GetMapping("/package/{*path}")
34-
public Mono<ResponseEntity<Resource>> getNpmPackageAsset(@PathVariable String path);
33+
@GetMapping("/package/{applicationId}/{*path}")
34+
public Mono<ResponseEntity<Resource>> getNpmPackageAsset(@PathVariable String applicationId, @PathVariable String path);
3535
}

0 commit comments

Comments
 (0)