Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
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
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
View File

@ -87,20 +87,8 @@ public class CustomApplicationRepositoryCEImpl extends BaseAppsmithRepositoryImp
@Override @Override
public Flux<Application> findAllUserApps(AclPermission permission) { public Flux<Application> findAllUserApps(AclPermission permission) {
Mono<User> currentUserWithTenantMono = ReactiveSecurityContextHolder.getContext() return ReactiveSecurityContextHolder.getContext()
.map(ctx -> ctx.getAuthentication()) .map(ctx -> (User) ctx.getAuthentication().getPrincipal())
.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
.flatMap(cacheableRepositoryHelper::getPermissionGroupsOfUser) .flatMap(cacheableRepositoryHelper::getPermissionGroupsOfUser)
.flatMapMany(permissionGroups -> queryBuilder() .flatMapMany(permissionGroups -> queryBuilder()
.permission(permission) .permission(permission)