Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5d006e8

Browse files
author
chengluo
committed
Merge branch 'develop' into github_dev
2 parents 8d5561e + 9e0727c commit 5d006e8

File tree

8 files changed

+8
-50
lines changed

8 files changed

+8
-50
lines changed

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
8282
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, INVITATION_URL + "/**"), // invitation
8383
ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, CUSTOM_AUTH + "/logout"),
8484
ServerWebExchangeMatchers.pathMatchers(HttpMethod.HEAD, STATE_URL + "/healthCheck"),
85-
8685
// used in public viewed apps
8786
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL), // system config
8887
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL + "/deploymentId"), // system config

‎server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.openblocks.api.usermanagement.view.UserProfileView;
2929
import com.openblocks.domain.user.constant.UserStatusType;
3030
import com.openblocks.domain.user.model.User;
31+
import com.openblocks.domain.user.model.UserDetail;
3132
import com.openblocks.domain.user.service.UserService;
3233
import com.openblocks.domain.user.service.UserStatusService;
3334
import com.openblocks.infra.constant.NewUrl;
@@ -169,7 +170,7 @@ public Mono<ResponseView<Boolean>> setPassword(@RequestParam String password) {
169170
}
170171

171172
@GetMapping("/currentUser")
172-
public Mono<ResponseView<?>> getCurrentUser(ServerWebExchange exchange) {
173+
public Mono<ResponseView<UserDetail>> getCurrentUser(ServerWebExchange exchange) {
173174
return sessionUserService.getVisitor()
174175
.flatMap(user -> userService.buildUserDetail(user, false))
175176
.map(ResponseView::success);

‎server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ common:
77
workspace:
88
mode: ENTERPRISE
99

10+
auth:
11+
email:
12+
enable: ${LOGIN_CHANNEL_EMAIL:true}
13+
enable-register: ${LOGIN_CHANNEL_EMAIL_REGISTER:true}
14+
1015
spring:
1116
data:
1217
mongodb:

‎server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
auth:
22
email:
33
enable: true
4-
enable-register: ${ENABLE_USER_SIGN_UP:true}
4+
enable-register: true
55

66
spring:
77
data:

0 commit comments

Comments
 (0)