Merge pull request #229 from neon-balcony/develop

chore: move auth.email settings to application-selfhost.yml & code cleanup

Author: neon-balcony

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/company/CompanyGroupService.java

@@ -82,7 +82,6 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, INVITATION_URL + "/**"), // invitation
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, CUSTOM_AUTH + "/logout"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.HEAD, STATE_URL + "/healthCheck"),
-
                         // used in public viewed apps
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL), // system config
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL + "/deploymentId"), // system config

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/company/CompanyMemberService.java

@@ -28,6 +28,7 @@
 import com.openblocks.api.usermanagement.view.UserProfileView;
 import com.openblocks.domain.user.constant.UserStatusType;
 import com.openblocks.domain.user.model.User;
+import com.openblocks.domain.user.model.UserDetail;
 import com.openblocks.domain.user.service.UserService;
 import com.openblocks.domain.user.service.UserStatusService;
 import com.openblocks.infra.constant.NewUrl;
@@ -169,7 +170,7 @@ public Mono<ResponseView<Boolean>> setPassword(@RequestParam String password) {
     }
 
     @GetMapping("/currentUser")
-    public Mono<ResponseView<?>> getCurrentUser(ServerWebExchange exchange) {
+    public Mono<ResponseView<UserDetail>> getCurrentUser(ServerWebExchange exchange) {
         return sessionUserService.getVisitor()
                 .flatMap(user -> userService.buildUserDetail(user, false))
                 .map(ResponseView::success);

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/company/CompanyOrganizationService.java

@@ -7,6 +7,11 @@ common:
   workspace:
     mode: ENTERPRISE
 
+auth:
+  email:
+    enable: ${LOGIN_CHANNEL_EMAIL:true}
+    enable-register: ${LOGIN_CHANNEL_EMAIL_REGISTER:true}
+
 spring:
   data:
     mongodb:

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/company/CompanyService.java

@@ -1,7 +1,7 @@
 auth:
   email:
     enable: true
-    enable-register: ${ENABLE_USER_SIGN_UP:true}
+    enable-register: true
 
 spring:
   data: