Commitf2b7d10

Thomasr

authored and

committed

Allow super admin to login even when email login is disabled

1 parent5a9732c commitf2b7d10Copy full SHA for f2b7d10

File tree

+14

-1

lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service
- AuthenticationApiServiceImpl.java

+14

-1

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,23 @@ protected Mono<AuthUser> authenticate(String authId, @Deprecated String source,`
`98`	`98`	`})`
`99`	`99`	`.flatMap(findAuthConfig -> {`
`100`	`100`	`context.setAuthConfig(findAuthConfig.authConfig());`
	`101`	`+// Check if email/password is superadmin before checking EMAIL provider enable`
`101`	`102`	`if (findAuthConfig.authConfig().getSource().equals("EMAIL")) {`
`102`		`-if(StringUtils.isBlank(context.getOrgId())) {`
	`103`	`+if(StringUtils.isBlank(context.getOrgId())) {`
`103`	`104`	`context.setOrgId(Optional.ofNullable(findAuthConfig.organization()).map(Organization::getId).orElse(null));`
`104`	`105`	`}`
	`106`	`+// --- Superadmin check start ---`
	`107`	`+if (contextinstanceofFormAuthRequestContextformContext) {`
	`108`	`+Stringemail =formContext.getLoginId();`
	`109`	`+Stringpassword =formContext.getPassword();`
	`110`	`+StringsuperAdminEmail =commonConfig.getSuperAdmin().getUserName();`
	`111`	`+StringsuperAdminPassword =commonConfig.getSuperAdmin().getPassword();`
	`112`	`+if (StringUtils.equalsIgnoreCase(email,superAdminEmail) &&StringUtils.equals(password,superAdminPassword)) {`
	`113`	`+// Allow superadmin login even if EMAIL provider is disabled`
	`114`	`+returnMono.just(findAuthConfig);`
	`115`	`+ }`
	`116`	`+ }`
	`117`	`+// --- Superadmin check end ---`
`105`	`118`	`if(!findAuthConfig.authConfig().getEnable()) {`
`106`	`119`	`returnMono.error(newBizException(EMAIL_PROVIDER_DISABLED,"EMAIL_PROVIDER_DISABLED"));`
`107`	`120`	`}`

Comments

(0)