From 86f0ebe9fe7113b412b45dcdf7181ec529a1d0cd Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 12 Mar 2024 06:36:16 +0530
Subject: [PATCH] chore: Remove unnecessary call to get default tenant ID
 (#31521)

---
 .../ce/CustomApplicationRepositoryCEImpl.java    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
index dbdb82d6b8..ae5d19326f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
@@ -87,20 +87,8 @@ public class CustomApplicationRepositoryCEImpl extends BaseAppsmithRepositoryImp
 
     @Override
     public Flux<Application> findAllUserApps(AclPermission permission) {
-        Mono<User> currentUserWithTenantMono = ReactiveSecurityContextHolder.getContext()
-                .map(ctx -> ctx.getAuthentication())
-                .map(auth -> (User) auth.getPrincipal())
-                .flatMap(user -> {
-                    if (user.getTenantId() == null) {
-                        return cacheableRepositoryHelper.getDefaultTenantId().map(tenantId -> {
-                            user.setTenantId(tenantId);
-                            return user;
-                        });
-                    }
-                    return Mono.just(user);
-                });
-
-        return currentUserWithTenantMono
+        return ReactiveSecurityContextHolder.getContext()
+                .map(ctx -> (User) ctx.getAuthentication().getPrincipal())
                 .flatMap(cacheableRepositoryHelper::getPermissionGroupsOfUser)
                 .flatMapMany(permissionGroups -> queryBuilder()
                         .permission(permission)