Commit895e184

Thomasr

authored and

committed

Fixed enterprise login issue for newcomers

1 parent5aa2969 commit895e184Copy full SHA for 895e184

File tree

-4

lines changed

server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service
  - OrganizationServiceImpl.java
- lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job
  - MigrateAuthConfigJobImpl.java

-4

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,6 @@ public Mono<Organization> createDefault(User user, boolean isSuperAdmin) {`
`91`	`91`	`if (Boolean.TRUE.equals(join)) {`
`92`	`92`	`returnMono.empty();`
`93`	`93`	`}`
`94`		`-OrganizationDomainorganizationDomain =newOrganizationDomain();`
`95`		`-organizationDomain.setConfigs(List.of(DEFAULT_AUTH_CONFIG));`
`96`		`-organization.setOrganizationDomain(organizationDomain);`
`97`	`94`	`returncreate(organization,user.getId(),isSuperAdmin);`
`98`	`95`	`});`
`99`	`96`	`});`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`importorg.lowcoder.sdk.auth.AbstractAuthConfig;`
`9`	`9`	`importorg.lowcoder.sdk.config.AuthProperties;`
`10`	`10`	`importorg.lowcoder.sdk.config.CommonConfig;`
	`11`	`+importorg.lowcoder.sdk.constants.AuthSourceConstants;`
`11`	`12`	`importorg.lowcoder.sdk.constants.WorkspaceMode;`
`12`	`13`	`importorg.lowcoder.sdk.util.IDUtils;`
`13`	`14`	`importorg.springframework.beans.factory.annotation.Autowired;`
`@@ -57,6 +58,6 @@ protected void setAuthConfigs2OrganizationDomain(Organization organization, List`
`57`	`58`	`organization.setOrganizationDomain(domain);`
`58`	`59`	`}`
`59`	`60`	`authConfigs.forEach(abstractAuthConfig ->abstractAuthConfig.setId(IDUtils.generate()));`
`60`		`-domain.setConfigs(authConfigs);`
	`61`	`+domain.setConfigs(authConfigs.stream().filter(authConfig -> !authConfig.getSource().equals(AuthSourceConstants.EMAIL)).toList());`
`61`	`62`	`}`
`62`	`63`	`}`

Comments

(0)