|
4 | 4 | importorg.jetbrains.annotations.NotNull; |
5 | 5 | importorg.lowcoder.api.home.SessionUserService; |
6 | 6 | importorg.lowcoder.domain.application.service.ApplicationServiceImpl; |
| 7 | +importorg.lowcoder.domain.organization.model.OrgMember; |
| 8 | +importorg.lowcoder.domain.organization.model.Organization; |
7 | 9 | importorg.lowcoder.domain.organization.service.OrgMemberServiceImpl; |
8 | 10 | importorg.lowcoder.domain.organization.service.OrganizationService; |
9 | 11 | importorg.lowcoder.infra.constant.NewUrl; |
@@ -49,23 +51,39 @@ private Mono<ResponseEntity<Resource>> forwardToNodeService(String applicationId |
49 | 51 |
|
50 | 52 | StringwithoutLeadingSlash =path.startsWith("/") ?path.substring(1) :path; |
51 | 53 | if(applicationId.equals("none")) { |
52 | | -returnsessionUserService.getVisitorOrgMemberCache().flatMap(orgMember ->organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> { |
53 | | -Map<String,Object>config =Map.of("npmRegistries",Objects.requireNonNullElse(organizationCommonSettings.get("npmRegistries"),newArrayList<>(0)),"workspaceId",orgMember.getOrgId()); |
54 | | -returnWebClientBuildHelper.builder() |
55 | | - .systemProxy() |
56 | | - .build() |
57 | | - .post() |
58 | | - .uri(nodeServerHelper.createUri(prefix +"/" +withoutLeadingSlash)) |
59 | | - .contentType(MediaType.APPLICATION_JSON) |
60 | | - .body(BodyInserters.fromValue(config)) |
61 | | - .retrieve().toEntity(Resource.class) |
62 | | - .map(response -> { |
63 | | -returnResponseEntity |
64 | | - .status(response.getStatusCode()) |
65 | | - .headers(response.getHeaders()) |
66 | | - .body(response.getBody()); |
67 | | - }); |
68 | | - })); |
| 54 | +returnsessionUserService.getVisitorOrgMemberCache() |
| 55 | + .onErrorResume(e ->Mono.just(OrgMember.builder().orgId("default").build())) |
| 56 | + .flatMap(orgMember ->organizationService.getOrgCommonSettings(orgMember.getOrgId()) |
| 57 | + .onErrorResume(e -> { |
| 58 | +// Handle errors fetching organization settings and provide defaults |
| 59 | +Organization.OrganizationCommonSettingsdefaultSettings =newOrganization.OrganizationCommonSettings(); |
| 60 | +defaultSettings.put("npmRegistries",newArrayList<>(0)); |
| 61 | +returnMono.just(defaultSettings); |
| 62 | + }) |
| 63 | + .flatMap(organizationCommonSettings -> { |
| 64 | +Map<String,Object>config =Map.of( |
| 65 | +"npmRegistries",Objects.requireNonNullElse( |
| 66 | +organizationCommonSettings.get("npmRegistries"), |
| 67 | +newArrayList<>(0) |
| 68 | + ), |
| 69 | +"workspaceId",orgMember.getOrgId() |
| 70 | + ); |
| 71 | +returnWebClientBuildHelper.builder() |
| 72 | + .systemProxy() |
| 73 | + .build() |
| 74 | + .post() |
| 75 | + .uri(nodeServerHelper.createUri(prefix +"/" +withoutLeadingSlash)) |
| 76 | + .contentType(MediaType.APPLICATION_JSON) |
| 77 | + .body(BodyInserters.fromValue(config)) |
| 78 | + .retrieve() |
| 79 | + .toEntity(Resource.class) |
| 80 | + .map(response ->ResponseEntity |
| 81 | + .status(response.getStatusCode()) |
| 82 | + .headers(response.getHeaders()) |
| 83 | + .body(response.getBody()) |
| 84 | + ); |
| 85 | + })); |
| 86 | + |
69 | 87 | }else{ |
70 | 88 | returnapplicationServiceImpl.findById(applicationId).flatMap(application ->organizationService.getById(application.getOrganizationId())).flatMap(orgMember ->organizationService.getOrgCommonSettings(orgMember.getId()).flatMap(organizationCommonSettings -> { |
71 | 89 | Map<String,Object>config =Map.of("npmRegistries",Objects.requireNonNullElse(organizationCommonSettings.get("npmRegistries"),newArrayList<>(0)),"workspaceId",orgMember.getId()); |
|
