33import lombok .RequiredArgsConstructor ;
44import org .jetbrains .annotations .NotNull ;
55import org .lowcoder .api .home .SessionUserService ;
6+ import org .lowcoder .domain .application .service .ApplicationServiceImpl ;
7+ import org .lowcoder .domain .organization .service .OrgMemberServiceImpl ;
68import org .lowcoder .domain .organization .service .OrganizationService ;
79import org .lowcoder .infra .constant .NewUrl ;
810import 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 ()
0 commit comments