chore: Remove unnecessary call to get default tenant ID (#31521)

This commit is contained in:
Shrikant Sharat Kandula 2024-03-12 06:36:16 +05:30 committed by GitHub
parent c77e26967a
commit 86f0ebe9fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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)