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

Added fallback email to new organization from user email (#1536)

Browse Source
This commit is contained in:
Nidhi 2020-11-04 12:57:17 +05:30 committed by GitHub
parent c7efe55c9c
commit fc4fca8bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,10 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS)); return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS));
} }
if (organization.getEmail() == null) {
organization.setEmail(user.getEmail());
}
Mono<Organization> setSlugMono; Mono<Organization> setSlugMono;
if (organization.getName() == null) { if (organization.getName() == null) {
setSlugMono = Mono.just(organization); setSlugMono = Mono.just(organization);

1
app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
View File

@ -148,6 +148,7 @@ public class OrganizationServiceTest {
assertThat(organization1.getPolicies()).isNotEmpty(); assertThat(organization1.getPolicies()).isNotEmpty();
assertThat(organization1.getPolicies()).containsAll(Set.of(manageOrgAppPolicy, manageOrgPolicy)); assertThat(organization1.getPolicies()).containsAll(Set.of(manageOrgAppPolicy, manageOrgPolicy));
assertThat(organization1.getSlug() != null); assertThat(organization1.getSlug() != null);
assertThat(organization1.getEmail()).isEqualTo("api_user");
}) })
.verifyComplete(); .verifyComplete();
} }