Add handling for PTM apps

lowcoder-org · FalkWolsky · Feb 7, 2024 · Feb 1, 2024 · Feb 6, 2024 · Feb 7, 2024
commit 55fbff9c8da4fd9796372cc168eb03a9888ea8d9
diff --git a/...omain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java b/...omain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java
@@ -35,7 +35,7 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
     Flux<Application> findByIdIn(List<String> ids);
 
     @Query(fields = "{_id : 1}")
-    Flux<Application> findByPublicToAllIsTrueAndIdIn(Collection<String> ids);
+    Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceAndIdIn(Collection<String> ids, Boolean publicToMarketplace);
 
     Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsTrue();
 

diff --git a/...oder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java b/...oder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java
@@ -160,9 +160,10 @@ public Mono<Boolean> setApplicationPublicToMarketplace(String applicationId, boo
 
     @NonEmptyMono
     @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
-    public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationIds) {
-        return repository.findByPublicToAllIsTrueAndIdIn(applicationIds)
+    public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationIds, Boolean isAnonymous) {
+        return repository.findByPublicToAllIsTrueAndPublicToMarketplaceAndIdIn(applicationIds, !isAnonymous)
                 .map(HasIdAndAuditing::getId)
                 .collect(Collectors.toSet());
+
     }
 }
diff --git a/...in/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java b/...in/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java
@@ -46,7 +46,22 @@ protected Mono<Map<String, List<ResourcePermission>>> getAnonymousUserPermission
         }
 
         Set<String> applicationIds = newHashSet(resourceIds);
-        return Mono.zip(applicationService.getPublicApplicationIds(applicationIds),
+        return Mono.zip(applicationService.getPublicApplicationIds(applicationIds, Boolean.TRUE),
+                        templateSolution.getTemplateApplicationIds(applicationIds))
+                .map(tuple -> {
+                    Set<String> publicAppIds = tuple.getT1();
+                    Set<String> templateAppIds = tuple.getT2();
+                    return collectMap(union(publicAppIds, templateAppIds), identity(), this::getAnonymousUserPermission);
+                });
+    }
+
+    // This is for PTM apps that are public but only available to logged-in users
+    @Override
+    protected Mono<Map<String, List<ResourcePermission>>> getNonAnonymousUserPublicResourcePermissions
+            (Collection<String> resourceIds, ResourceAction resourceAction) {
+
+        Set<String> applicationIds = newHashSet(resourceIds);
+        return Mono.zip(applicationService.getPublicApplicationIds(applicationIds, Boolean.FALSE),
                         templateSolution.getTemplateApplicationIds(applicationIds))
                 .map(tuple -> {
                     Set<String> publicAppIds = tuple.getT1();

diff --git a/...ain/src/main/java/org/lowcoder/domain/permission/service/DatasourcePermissionHandler.java b/...ain/src/main/java/org/lowcoder/domain/permission/service/DatasourcePermissionHandler.java
@@ -1,7 +1,6 @@
 package org.lowcoder.domain.permission.service;
 
 import static org.lowcoder.domain.permission.model.ResourceHolder.USER;
-import static org.lowcoder.sdk.constants.Authentication.ANONYMOUS_USER_ID;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -39,6 +38,11 @@ protected Mono<Map<String, List<ResourcePermission>>> getAnonymousUserPermission
         return Mono.just(Collections.emptyMap());
     }
 
+    @Override
+    protected Mono<Map<String, List<ResourcePermission>>> getNonAnonymousUserPublicResourcePermissions(Collection<String> resourceIds, ResourceAction resourceAction) {
+        return Mono.just(Collections.emptyMap());
+    }
+
     @Override
     protected Mono<String> getOrgId(String resourceId) {
         return datasourceService.getById(resourceId)

diff --git a/...omain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java b/...omain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java
@@ -94,6 +94,16 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnResource(
             return publicResourcePermissionMono;
         }
 
+        Mono<UserPermissionOnResourceStatus> nonAnonymousPublicResourcePermissionMono = getNonAnonymousUserPublicResourcePermissions(singletonList(resourceId), resourceAction)
+                .map(it -> it.getOrDefault(resourceId, emptyList()))
+                .map(it -> {
+                    if (!it.isEmpty()) {
+                        return UserPermissionOnResourceStatus.success(it.get(0));
+                    }
+                    return isAnonymousUser(userId) ? UserPermissionOnResourceStatus.anonymousUser() : UserPermissionOnResourceStatus.notInOrg();
+                });
+
+
         Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)
                 .flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))
                 .flatMap(orgMember -> {
@@ -107,13 +117,17 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnResource(
                 })
                 .defaultIfEmpty(UserPermissionOnResourceStatus.notInOrg());
 
-        return Mono.zip(publicResourcePermissionMono, orgUserPermissionMono)
+        return Mono.zip(publicResourcePermissionMono, nonAnonymousPublicResourcePermissionMono, orgUserPermissionMono)
                 .map(tuple -> {
                     UserPermissionOnResourceStatus publicResourcePermission = tuple.getT1();
-                    UserPermissionOnResourceStatus orgUserPermission = tuple.getT2();
+                    UserPermissionOnResourceStatus nonAnonymousPublicResourcePermission = tuple.getT2();
+                    UserPermissionOnResourceStatus orgUserPermission = tuple.getT3();
                     if (orgUserPermission.hasPermission()) {
                         return orgUserPermission;
                     }
+                    if(nonAnonymousPublicResourcePermission.hasPermission()) {
+                        return nonAnonymousPublicResourcePermission;
+                    }
                     if (publicResourcePermission.hasPermission()) {
                         return publicResourcePermission;
                     }
@@ -132,6 +146,9 @@ private ResourcePermission getMaxPermission(List<ResourcePermission> permissions
     protected abstract Mono<Map<String, List<ResourcePermission>>> getAnonymousUserPermissions(Collection<String> resourceIds,
             ResourceAction resourceAction);
 
+    protected abstract Mono<Map<String, List<ResourcePermission>>> getNonAnonymousUserPublicResourcePermissions
+            (Collection<String> resourceIds, ResourceAction resourceAction);
+
     private Mono<Map<String, List<ResourcePermission>>> getAllMatchingPermissions0(String userId, String orgId, ResourceType resourceType,
             Collection<String> resourceIds,
             ResourceAction resourceAction) {

diff --git a/...omain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java b/...omain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java
@@ -214,7 +214,8 @@ public Mono<ResourcePermission> checkAndReturnMaxPermission(String userId, Strin
                 });
     }
 
-    public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnResource(String userId, String resourceId, ResourceAction resourceAction) {
+    public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnResource
+            (String userId, String resourceId, ResourceAction resourceAction) {
         ResourceType resourceType = resourceAction.getResourceType();
         var resourcePermissionHandler = getResourcePermissionHandler(resourceType);
         return resourcePermissionHandler.checkUserPermissionStatusOnResource(userId, resourceId, resourceAction);

diff --git a/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -97,6 +97,14 @@ public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable
                 .map(ResponseView::success);
     }
 
+    @Override
+    public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId) {
+        return applicationApiService.getPublishedApplication(applicationId)
+                .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(applicationId))
+                .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, VIEW))
+                .map(ResponseView::success);
+    }
+
     @Override
     public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
             @RequestBody Application newApplication) {

diff --git a/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/...vice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -111,6 +111,15 @@ public interface ApplicationEndpoints
     @GetMapping("/{applicationId}/view")
     public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId);
 
+	@Operation(
+			tags = TAG_APPLICATION_MANAGEMENT,
+			operationId = "getMarketplaceApplicationDataInViewMode",
+			summary = "Get Marketplace Application data in view mode",
+			description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID for the marketplace."
+	)
+	@GetMapping("/{applicationId}/view_marketplace")
+	public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId);
+
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
 		    operationId = "updateApplication",