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

Commitacbef3c

Browse files
committed
Add validation between ptm and agency apis
1 parent570d184 commitacbef3c

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,19 @@ private Mono<Void> checkApplicationStatus(Application application, ApplicationSt
248248
returnMono.error(newBizException(BizError.UNSUPPORTED_OPERATION,"BAD_REQUEST"));
249249
}
250250

251+
privateMono<Void>checkApplicationViewRequest(Applicationapplication,ApplicationEndpoints.ApplicationRequestTypeexpected) {
252+
if (expected ==ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL &&application.isPublicToAll()) {
253+
returnMono.empty();
254+
}
255+
if (expected ==ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_MARKETPLACE &&application.isPublicToMarketplace()) {
256+
returnMono.empty();
257+
}
258+
if (expected ==ApplicationEndpoints.ApplicationRequestType.AGENCY_PROFILE &&application.agencyProfile()) {
259+
returnMono.empty();
260+
}
261+
returnMono.error(newBizException(BizError.UNSUPPORTED_OPERATION,"BAD_REQUEST"));
262+
}
263+
251264
privateMono<Boolean>updateApplicationStatus(StringapplicationId,ApplicationStatusapplicationStatus) {
252265
returncheckCurrentUserApplicationPermission(applicationId,MANAGE_APPLICATIONS)
253266
.then(Mono.defer(() -> {
@@ -280,10 +293,11 @@ public Mono<ApplicationView> getEditingApplication(String applicationId) {
280293
});
281294
}
282295

283-
publicMono<ApplicationView>getPublishedApplication(StringapplicationId) {
296+
publicMono<ApplicationView>getPublishedApplication(StringapplicationId,ApplicationEndpoints.ApplicationRequestTyperequestType) {
284297
returncheckPermissionWithReadableErrorMsg(applicationId,READ_APPLICATIONS)
285298
.zipWhen(permission ->applicationService.findById(applicationId)
286-
.delayUntil(application ->checkApplicationStatus(application,NORMAL)))
299+
.delayUntil(application ->checkApplicationStatus(application,NORMAL))
300+
.delayUntil(application ->checkApplicationViewRequest(application,requestType)))
287301
.zipWhen(tuple ->applicationService.getAllDependentModulesFromApplication(tuple.getT2(),true),TupleUtils::merge)
288302
.zipWhen(tuple ->organizationService.getOrgCommonSettings(tuple.getT2().getOrganizationId()),TupleUtils::merge)
289303
.zipWith(getTemplateIdFromApplicationId(applicationId),TupleUtils::merge)

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable S
9191

9292
@Override
9393
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId) {
94-
returnapplicationApiService.getPublishedApplication(applicationId)
94+
returnapplicationApiService.getPublishedApplication(applicationId,ApplicationRequestType.PUBLIC_TO_ALL)
9595
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(applicationId))
9696
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,VIEW))
9797
.map(ResponseView::success);
9898
}
9999

100100
@Override
101101
publicMono<ResponseView<ApplicationView>>getPublishedMarketPlaceApplication(@PathVariableStringapplicationId) {
102-
returnapplicationApiService.getPublishedApplication(applicationId)
102+
returnapplicationApiService.getPublishedApplication(applicationId,ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
103103
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(applicationId))
104104
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,VIEW))
105105
.map(ResponseView::success);
106106
}
107107

108108
@Override
109109
publicMono<ResponseView<ApplicationView>>getAgencyProfileApplication(@PathVariableStringapplicationId) {
110-
returnapplicationApiService.getPublishedApplication(applicationId)
110+
returnapplicationApiService.getPublishedApplication(applicationId,ApplicationRequestType.AGENCY_PROFILE)
111111
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(applicationId))
112112
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,VIEW))
113113
.map(ResponseView::success);

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,12 @@ public Boolean agencyProfile() {
284284
}
285285
}
286286

287+
publicenumApplicationRequestType {
288+
PUBLIC_TO_ALL,
289+
PUBLIC_TO_MARKETPLACE,
290+
AGENCY_PROFILE,
291+
}
292+
287293
publicrecordUpdatePermissionRequest(Stringrole) {
288294
}
289295

0 commit comments

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