fix no login way on first deployment and enterprise mode

lvhuichao · lvhuichao · commit 0c3eab803a4b · 2023-02-24T12:03:27.000+08:00
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java
@@ -3,8 +3,13 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import com.openblocks.sdk.auth.EmailAuthConfig;
+import com.openblocks.sdk.constants.AuthSourceConstants;
+
 public interface AuthenticationService {
 
+    EmailAuthConfig DEFAULT_AUTH_CONFIG = new EmailAuthConfig(AuthSourceConstants.EMAIL, true, true);
+
     Mono<FindAuthConfig> findAuthConfigByAuthId(String authId);
 
     Mono<FindAuthConfig> findAuthConfigBySource(String source);
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java
@@ -59,7 +59,8 @@ public Flux<FindAuthConfig> findAllAuthConfigs(boolean enableOnly) {
                         return findAuthConfig.authConfig().isEnable();
                     }
                     return true;
-                });
+                })
+                .defaultIfEmpty(new FindAuthConfig(DEFAULT_AUTH_CONFIG, null));
     }
 
     private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.openblocks.domain.organization.service;
 
+import static com.openblocks.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG;
 import static com.openblocks.domain.organization.model.OrganizationState.ACTIVE;
 import static com.openblocks.domain.organization.model.OrganizationState.DELETED;
 import static com.openblocks.domain.util.QueryDslUtils.fieldName;
@@ -10,6 +11,7 @@
 import static com.openblocks.sdk.util.LocaleUtils.getMessage;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
 import javax.annotation.Nonnull;
@@ -29,6 +31,7 @@
 import com.openblocks.domain.organization.model.MemberRole;
 import com.openblocks.domain.organization.model.Organization;
 import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings;
+import com.openblocks.domain.organization.model.OrganizationDomain;
 import com.openblocks.domain.organization.model.OrganizationState;
 import com.openblocks.domain.organization.model.QOrganization;
 import com.openblocks.domain.organization.repository.OrganizationRepository;
@@ -102,6 +105,9 @@ public Mono<Organization> createDefault(User user) {
                         if (Boolean.TRUE.equals(join)) {
                             return Mono.empty();
                         }
+                        OrganizationDomain organizationDomain = new OrganizationDomain();
+                        organizationDomain.setAuthConfigs(List.of(DEFAULT_AUTH_CONFIG));
+                        organization.setOrganizationDomain(organizationDomain);
                         return create(organization, user.getId());
                     });
         });
diff --git a/server/api-service/openblocks-server/src/test/resources/application.yml b/server/api-service/openblocks-server/src/test/resources/application.yml
@@ -17,12 +17,4 @@ demo:
       port: 3306
       timeout: 100
       username: 123
-      host: localhost
-
-common:
-  cloud: false
-  cookie-name: UT-TACO-TOKEN
-
-auth:
-  email:
-    enable: true
+      host: localhost

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public Flux<FindAuthConfig> findAllAuthConfigs(boolean enableOnly) {`
`59`	`59`	`return findAuthConfig.authConfig().isEnable();`
`60`	`60`	`}`
`61`	`61`	`return true;`
`62`		`- });`
	`62`	`+ })`
	`63`	`+ .defaultIfEmpty(new FindAuthConfig(DEFAULT_AUTH_CONFIG, null));`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {`