From b5529310d17097d5177ec95e92ce81c31738565b Mon Sep 17 00:00:00 2001
From: Nayan <83352306+nayan-rafiq@users.noreply.github.com>
Date: Fri, 3 Sep 2021 15:32:53 +0600
Subject: [PATCH] feat: Removed check on template organization ID when creating
 the default organization and application after signup (#7084)

---
 .../server/services/UserServiceImpl.java      | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index 513ea8c229..40a92ac545 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -508,22 +508,16 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
                 })
                 .switchIfEmpty(Mono.defer(() -> {
                     return signupIfAllowed(user)
-                            .zipWith(configService.getTemplateOrganizationId().defaultIfEmpty(""))
-                            .flatMap(tuple -> {
-                                final User savedUser = tuple.getT1();
-                                final String templateOrganizationId = tuple.getT2();
+                            .flatMap(savedUser -> {
                                 final UserSignupDTO userSignupDTO = new UserSignupDTO();
                                 userSignupDTO.setUser(savedUser);
-                                if (!StringUtils.hasText(templateOrganizationId)) {
-                                    // Since template organization is not configured, we create an empty default organization.
-                                    log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail());
-                                    return organizationService.createDefault(new Organization(), savedUser)
-                                            .map(org -> {
-                                                userSignupDTO.setDefaultOrganizationId(org.getId());
-                                                return userSignupDTO;
-                                            });
-                                }
-                                return Mono.just(userSignupDTO);
+
+                                log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail());
+                                return organizationService.createDefault(new Organization(), savedUser)
+                                        .map(org -> {
+                                            userSignupDTO.setDefaultOrganizationId(org.getId());
+                                            return userSignupDTO;
+                                        });
                             })
                             .flatMap(userSignupDTO -> findByEmail(userSignupDTO.getUser().getEmail()).map(user1 -> {
                                 userSignupDTO.setUser(user1);