Merge branch 'bug/org-creation' into 'release'

Bug fix : Create Organization is failing because the user is read from the session and not from the repository. Now reading the user at appropriate places.

See merge request theappsmith/internal-tools-server!405

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java

@@ -12,7 +12,6 @@ import com.appsmith.server.dtos.OrganizationApplicationsDTO;
 import com.appsmith.server.dtos.UserHomepageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.PolicyUtils;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.PageRepository;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +47,7 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
     private final PageRepository pageRepository;
     private final SessionUserService sessionUserService;
     private final OrganizationService organizationService;
-    private final PolicyUtils policyUtils;
+    private final UserService userService;
 
     @Autowired
     public ApplicationServiceImpl(Scheduler scheduler,
@@ -60,12 +59,12 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                                   PageRepository pageRepository,
                                   SessionUserService sessionUserService,
                                   OrganizationService organizationService,
-                                  PolicyUtils policyUtils) {
+                                  UserService userService) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.pageRepository = pageRepository;
         this.sessionUserService = sessionUserService;
         this.organizationService = organizationService;
-        this.policyUtils = policyUtils;
+        this.userService = userService;
     }
 
     @Override
@@ -178,8 +177,9 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
                     if (user.getIsAnonymous()) {
                         return Mono.error(new AppsmithException(AppsmithError.USER_NOT_SIGNED_IN));
                     }
-                    return Mono.just(user);
+                    return Mono.just(user.getUsername());
                 })
+                .flatMap(userService::findByEmail)
                 .cache();
 
         return userMono

app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java

@@ -2,7 +2,6 @@ package com.appsmith.server.services;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.AppsmithRole;
-import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.constants.AnalyticsEvents;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Organization;
@@ -14,9 +13,9 @@ import com.appsmith.server.domains.UserRole;
 import com.appsmith.server.dtos.OrganizationPluginStatus;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.PolicyUtils;
 import com.appsmith.server.repositories.OrganizationRepository;
 import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.repositories.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -38,6 +37,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_USERS;
 import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
 import static java.util.stream.Collectors.toMap;
 
@@ -51,8 +51,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
     private final PluginRepository pluginRepository;
     private final SessionUserService sessionUserService;
     private final UserOrganizationService userOrganizationService;
-    private final PolicyGenerator policyGenerator;
-    private final PolicyUtils policyUtils;
+    private final UserRepository userRepository;
 
     @Autowired
     public OrganizationServiceImpl(Scheduler scheduler,
@@ -66,7 +65,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
                                    PluginRepository pluginRepository,
                                    SessionUserService sessionUserService,
                                    UserOrganizationService userOrganizationService,
-                                   PolicyGenerator policyGenerator, PolicyUtils policyUtils) {
+                                   UserRepository userRepository) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.repository = repository;
         this.settingService = settingService;
@@ -74,8 +73,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
         this.pluginRepository = pluginRepository;
         this.sessionUserService = sessionUserService;
         this.userOrganizationService = userOrganizationService;
-        this.policyGenerator = policyGenerator;
-        this.policyUtils = policyUtils;
+        this.userRepository = userRepository;
     }
 
     @Override
@@ -198,6 +196,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
     @Override
     public Mono<Organization> create(Organization organization) {
         return sessionUserService.getCurrentUser()
+                .flatMap(user -> userRepository.findByEmail(user.getUsername(), READ_USERS))
                 .flatMap(user -> create(organization, user));
     }
 

app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java

@@ -63,7 +63,8 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
 
         Mono<User> currentUserMono;
         if (user == null) {
-            currentUserMono = sessionUserService.getCurrentUser();
+            currentUserMono = sessionUserService.getCurrentUser()
+                    .flatMap(user1 -> userRepository.findByEmail(user1.getUsername()));
         } else {
             currentUserMono = Mono.just(user);
         }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java

@@ -122,6 +122,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "organizationId"));
         }
         return sessionUserService.getCurrentUser()
+                .flatMap(user -> repository.findByEmail(user.getUsername()))
                 .flatMap(user -> {
                     log.debug("Going to set organizationId: {} for user: {}", orgId, user.getId());