fix: for now, allow to view non-published apps for logged in users

ludomikula · ludomikula · commit d5c9c32d9404 · 2024-03-04T10:19:28.000+01:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java
@@ -2,7 +2,6 @@
 
 
 import java.util.Collection;
-import java.util.List;
 
 import javax.annotation.Nonnull;
 
@@ -33,17 +32,7 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
     @Query("{$or : [{'publishedApplicationDSL.queries.datasourceId':?0},{'editingApplicationDSL.queries.datasourceId':?0}]}")
     Flux<Application> findByDatasourceId(String datasourceId);
 
-    Flux<Application> findByIdIn(List<String> ids);
-
-
-    // Falk: Why to combine? Marketplace-List and Agency-List are different Endpoints
-
-    /* @Query(value = "{$and:[{'publicToAll':true},{'$or':[{'publicToMarketplace':?0},{'agencyProfile':?1}]}, {'_id': { $in: ?2}}]}", fields = "{_id : 1}")
-    Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsOrAgencyProfileIsAndIdIn
-            (Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids); */
-
-    // this we do not need
-    // Flux<Application> findByPublicToAllIsTrueAndPublicToMarketplaceIsAndAgencyProfileIsAndIdIn(Boolean publicToMarketplace, Boolean agencyProfile, Collection<String> ids);
+    Flux<Application> findByIdIn(Collection<String> ids);
 
     /**
      * Filter public applications from list of supplied IDs
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java
@@ -206,12 +206,19 @@ public Mono<Boolean> setApplicationAsAgencyProfile(String applicationId, boolean
 
     @NonEmptyMono
     @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
-    public Mono<Set<String>> getFilteredPublicApplicationIds(ApplicationRequestType requestType, Collection<String> applicationIds, Boolean isAnonymous, Boolean isPrivateMarketplace) {
+    public Mono<Set<String>> getFilteredPublicApplicationIds(ApplicationRequestType requestType, Collection<String> applicationIds, boolean isAnonymous, Boolean isPrivateMarketplace) {
 
     	switch(requestType)
     	{
 	    	case PUBLIC_TO_ALL:
-	    		return getPublicApplicationIds(applicationIds);
+	    		if (isAnonymous)
+	    		{
+	    			return getPublicApplicationIds(applicationIds);
+	    		}
+	    		else
+	    		{
+	    			return getPrivateApplicationIds(applicationIds);
+	    		}
 	    	case PUBLIC_TO_MARKETPLACE:
 	    		return getPublicMarketplaceApplicationIds(applicationIds, isAnonymous, isPrivateMarketplace);
 	    	case AGENCY_PROFILE:
@@ -235,6 +242,19 @@ public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationI
     }
 
 
+    /**
+     * Find all private applications for viewing.
+     */
+    @NonEmptyMono
+    @SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
+    public Mono<Set<String>> getPrivateApplicationIds(Collection<String> applicationIds) {
+    	// TODO: in 2.4.0 we need to check whether the app was published or not
+        return repository.findByIdIn(applicationIds)
+                        .map(HasIdAndAuditing::getId)
+                        .collect(Collectors.toSet());
+    }
+    
+    
     /**
      * Find all marketplace applications - filter based on whether user is anonymous and whether it's a private marketplace
      */
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java
@@ -10,6 +10,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -62,7 +63,7 @@ protected Mono<Map<String, List<ResourcePermission>>> getAnonymousUserPermission
             (Collection<String> resourceIds, ResourceAction resourceAction) {
 
         Set<String> applicationIds = newHashSet(resourceIds);
-        return Mono.zip(applicationService.getPublicApplicationIds(applicationIds),
+        return Mono.zip(applicationService.getPrivateApplicationIds(applicationIds),
                         templateSolution.getTemplateApplicationIds(applicationIds))
                 .map(tuple -> {
                     Set<String> publicAppIds = tuple.getT1();
@@ -81,9 +82,11 @@ protected Mono<Map<String, List<ResourcePermission>>> getAnonymousUserApplicatio
         }
 
         Set<String> applicationIds = newHashSet(resourceIds);
-        return Mono.zip(applicationService.getFilteredPublicApplicationIds(requestType, applicationIds, Boolean.TRUE, config.getMarketplace().isPrivateMode()),
-                        templateSolution.getTemplateApplicationIds(applicationIds))
-                .map(tuple -> {
+        return Mono.zip(applicationService.getFilteredPublicApplicationIds(requestType, applicationIds, Boolean.TRUE, config.getMarketplace().isPrivateMode())
+        					.defaultIfEmpty(new HashSet<>()),
+                        templateSolution.getTemplateApplicationIds(applicationIds)
+                        	.defaultIfEmpty(new HashSet<>())
+               ).map(tuple -> {
                     Set<String> publicAppIds = tuple.getT1();
                     Set<String> templateAppIds = tuple.getT2();
                     return collectMap(union(publicAppIds, templateAppIds), identity(), this::getAnonymousUserPermission);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
@@ -224,18 +224,18 @@ private Mono<Void> checkApplicationStatus(Application application, ApplicationSt
     }
 
     private Mono<Void> checkApplicationViewRequest(Application application, ApplicationRequestType expected) {
-        // TODO: The check is correct ( logically ) but we need to provide some time for the users to adapt. Will bring it back in the next release
 
-        // Falk: switched && application.isPublicToAll() on again - seems here is the bug.
-        if (expected == ApplicationRequestType.PUBLIC_TO_ALL && application.isPublicToAll()) {
+    	// TODO: check application.isPublicToAll() from v2.4.0
+    	if (expected == ApplicationRequestType.PUBLIC_TO_ALL) {
             return Mono.empty();
         }
 
         // Falk: here is to check the ENV Variable LOWCODER_MARKETPLACE_PRIVATE_MODE
         // isPublicToMarketplace & isPublicToAll must be both true
-            if (expected == ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace() && application.isPublicToAll()) {
-                return Mono.empty();
-            }
+        if (expected == ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace() && application.isPublicToAll()) {
+            return Mono.empty();
+        }
+        
         // 
         // Falk: application.agencyProfile() & isPublicToAll must be both true
         if (expected == ApplicationRequestType.AGENCY_PROFILE && application.agencyProfile() && application.isPublicToAll()) {
