Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5c37d58

Browse files
author
Thomasr
committed
add applicationid param to private npm repository endpoint
1 parenta9f94b2 commit5c37d58

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
importlombok.RequiredArgsConstructor;
44
importorg.jetbrains.annotations.NotNull;
55
importorg.lowcoder.api.home.SessionUserService;
6+
importorg.lowcoder.domain.application.service.ApplicationServiceImpl;
7+
importorg.lowcoder.domain.organization.service.OrgMemberServiceImpl;
68
importorg.lowcoder.domain.organization.service.OrganizationService;
79
importorg.lowcoder.infra.constant.NewUrl;
810
importorg.lowcoder.infra.js.NodeServerHelper;
@@ -27,22 +29,24 @@ public class PrivateNpmRegistryController implements PrivateNpmRegistryEndpoint{
2729

2830
privatestaticfinalStringNPM_REGISTRY_METADATA ="npm/registry";
2931
privatestaticfinalStringNPM_REGISTRY_ASSET ="npm/package";
32+
privatefinalOrgMemberServiceImplorgMemberServiceImpl;
33+
privatefinalApplicationServiceImplapplicationServiceImpl;
3034

3135
@Override
32-
publicMono<ResponseEntity<Resource>>getNpmPackageMeta(Stringname) {
33-
returnforwardToNodeService(name,NPM_REGISTRY_METADATA);
36+
publicMono<ResponseEntity<Resource>>getNpmPackageMeta(StringapplicationId,Stringname) {
37+
returnforwardToNodeService(applicationId,name,NPM_REGISTRY_METADATA);
3438
}
3539

3640
@Override
37-
publicMono<ResponseEntity<Resource>>getNpmPackageAsset(Stringpath) {
38-
returnforwardToNodeService(path,NPM_REGISTRY_ASSET);
41+
publicMono<ResponseEntity<Resource>>getNpmPackageAsset(StringapplicationId,Stringpath) {
42+
returnforwardToNodeService(applicationId,path,NPM_REGISTRY_ASSET);
3943
}
4044

4145
@NotNull
42-
privateMono<ResponseEntity<Resource>>forwardToNodeService(Stringpath,Stringprefix) {
46+
privateMono<ResponseEntity<Resource>>forwardToNodeService(StringapplicationId,Stringpath,Stringprefix) {
4347
StringwithoutLeadingSlash =path.startsWith("/") ?path.substring(1) :path;
44-
returnsessionUserService.getVisitorOrgMemberCache().flatMap(orgMember ->organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> {
45-
Map<String,Object>config =Map.of("npmRegistries",organizationCommonSettings.get("npmRegistries"),"workspaceId",orgMember.getOrgId());
48+
returnapplicationServiceImpl.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
returnWebClientBuildHelper.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-
publicMono<ResponseEntity<Resource>>getNpmPackageMeta(@PathVariableStringname);
24+
@GetMapping("/registry/{applicationId}/{name}")
25+
publicMono<ResponseEntity<Resource>>getNpmPackageMeta(@PathVariableStringapplicationId,@PathVariableStringname);
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-
publicMono<ResponseEntity<Resource>>getNpmPackageAsset(@PathVariableStringpath);
33+
@GetMapping("/package/{applicationId}/{*path}")
34+
publicMono<ResponseEntity<Resource>>getNpmPackageAsset(@PathVariableStringapplicationId,@PathVariableStringpath);
3535
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp