Skip to content

Commit 9067a24

Browse files
authored
Merge branch 'dev' into fix/pagination
2 parents c346550 + 895e184 commit 9067a24

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ public Mono<Organization> createDefault(User user, boolean isSuperAdmin) {
9191
if (Boolean.TRUE.equals(join)) {
9292
return Mono.empty();
9393
}
94-
OrganizationDomain organizationDomain = new OrganizationDomain();
95-
organizationDomain.setConfigs(List.of(DEFAULT_AUTH_CONFIG));
96-
organization.setOrganizationDomain(organizationDomain);
9794
return create(organization, user.getId(), isSuperAdmin);
9895
});
9996
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.lowcoder.sdk.auth.AbstractAuthConfig;
99
import org.lowcoder.sdk.config.AuthProperties;
1010
import org.lowcoder.sdk.config.CommonConfig;
11+
import org.lowcoder.sdk.constants.AuthSourceConstants;
1112
import org.lowcoder.sdk.constants.WorkspaceMode;
1213
import org.lowcoder.sdk.util.IDUtils;
1314
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,6 @@ protected void setAuthConfigs2OrganizationDomain(Organization organization, List
5758
organization.setOrganizationDomain(domain);
5859
}
5960
authConfigs.forEach(abstractAuthConfig -> abstractAuthConfig.setId(IDUtils.generate()));
60-
domain.setConfigs(authConfigs);
61+
domain.setConfigs(authConfigs.stream().filter(authConfig -> !authConfig.getSource().equals(AuthSourceConstants.EMAIL)).toList());
6162
}
6263
}

0 commit comments

Comments
 (0)