Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC (#24035)

garymoon · web-flow · commit ab42c139a246 · 2023-04-25T14:40:48.000+08:00
This change prevents Gitea from bypassing the manual approval process for newly registered users when OIDC is used. - Resolves #23392 Signed-off-by: Gary Moon <gary@garymoon.net>
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
@@ -966,7 +966,7 @@ func SignInOAuthCallback(ctx *context.Context) {
 			}
 
 			overwriteDefault := &user_model.CreateUserOverwriteOptions{
-				IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
+				IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm),
 			}
 
 			source := authSource.Cfg.(*oauth2.Source)

Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@ func SignInOAuthCallback(ctx *context.Context) {`
`966`	`966`	`}`
`967`	`967`
`968`	`968`	`overwriteDefault := &user_model.CreateUserOverwriteOptions{`
`969`		`- IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),`
	`969`	`+ IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm),`
`970`	`970`	`}`
`971`	`971`
`972`	`972`	`source := authSource.Cfg.(*oauth2.Source)`