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

feat: Removed check on template organization ID when creating the default organization and application after signup (#7084)

Browse Source
This commit is contained in:
Nayan 2021-09-03 15:32:53 +06:00 committed by GitHub
parent 3859cb8438
commit b5529310d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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