Commit95aae3c

committed

Add handling for LOWCODER_CREATE_SIGNUP_WORKSPACE

1 parent6845453 commit95aae3cCopy full SHA for 95aae3c

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class AuthProperties {`
`28`	`28`	`privateOauth2Simplegoogle =newOauth2Simple();`
`29`	`29`	`privateOauth2Simplegithub =newOauth2Simple();`
`30`	`30`	`privateApiKeyapiKey =newApiKey();`
	`31`	`+privateBooleanworkspaceCreation;`
`31`	`32`
`32`	`33`	`@Getter`
`33`	`34`	`@Setter`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`importorg.lowcoder.domain.user.model.*;`
`30`	`30`	`importorg.lowcoder.domain.user.service.UserService;`
`31`	`31`	`importorg.lowcoder.sdk.auth.AbstractAuthConfig;`
	`32`	`+importorg.lowcoder.sdk.config.AuthProperties;`
`32`	`33`	`importorg.lowcoder.sdk.exception.BizError;`
`33`	`34`	`importorg.lowcoder.sdk.exception.BizException;`
`34`	`35`	`importorg.lowcoder.sdk.util.CookieHelper;`
`@@ -85,6 +86,9 @@ public class AuthenticationApiServiceImpl implements AuthenticationApiService {`
`85`	`86`	`@Autowired`
`86`	`87`	`privateJWTUtilsjwtUtils;`
`87`	`88`
	`89`	`+@Autowired`
	`90`	`+privateAuthPropertiesauthProperties;`
	`91`	`+`
`88`	`92`	`@Override`
`89`	`93`	`publicMono<AuthUser>authenticateByForm(StringloginId,Stringpassword,Stringsource,booleanregister,StringauthId,StringorgId) {`
`90`	`94`	`returnauthenticate(authId,source,newFormAuthRequestContext(loginId,password,register,orgId));`
`@@ -142,7 +146,9 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,`
`142`	`146`	`})`
`143`	`147`	`// after register`
`144`	`148`	`.delayUntil(user -> {`
`145`		`-if (user.getIsNewUser()) {`
	`149`	`+booleancreateWorkspace =`
	`150`	`+authUser.getOrgId() ==null &&StringUtils.isBlank(invitationId) &&authProperties.getWorkspaceCreation();`
	`151`	`+if (user.getIsNewUser() &&createWorkspace) {`
`146`	`152`	`returnonUserRegister(user);`
`147`	`153`	`}`
`148`	`154`	`returnMono.empty();`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ spring:`
`3`	`3`	`mongodb:`
`4`	`4`	`authentication-database:admin`
`5`	`5`	`auto-index-creation:false`
`6`		`-uri:mongodb://lowcoder:secret123@localhost:27017/lowcoder?authSource=admin`
	`6`	`+uri:mongodb://192.168.8.103:27017/lowcoder?authSource=admin`
`7`	`7`	`redis:`
`8`		`-url:redis://localhost:6379`
	`8`	`+url:redis://192.168.8.103:6379`
`9`	`9`	`main:`
`10`	`10`	`allow-bean-definition-overriding:true`
`11`	`11`	`allow-circular-references:true`
`@@ -61,4 +61,5 @@ auth:`
`61`	`61`	`secret:5a41b090758b39b226603177ef48d73ae9839dd458ccb7e66f7e7cc028d5a50b`
`62`	`62`	`email:`
`63`	`63`	`enable:true`
`64`		`-enable-register:true`
	`64`	`+enable-register:true`
	`65`	`+workspace-creation:false`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ auth:`
`13`	`13`	`email:`
`14`	`14`	`enable:${LOGIN_CHANNEL_EMAIL:true}`
`15`	`15`	`enable-register:${ENABLE_USER_SIGN_UP:true}`
	`16`	`+workspace-creation:${LOWCODER_CREATE_SIGNUP_WORKSPACE:true}`
`16`	`17`
`17`	`18`	`spring:`
`18`	`19`	`data:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ auth:`
`4`	`4`	`email:`
`5`	`5`	`enable:true`
`6`	`6`	`enable-register:${ENABLE_USER_SIGN_UP:true}`
	`7`	`+workspace-creation:${LOWCODER_CREATE_SIGNUP_WORKSPACE:true}`
`7`	`8`
`8`	`9`	`spring:`
`9`	`10`	`data:`

Comments

(0)