Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC (…

…#24035) 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 <[email protected]>
go-gitea · Apr 25, 2023 · ab42c13 · ab42c13
1 parent 74aa446
commit ab42c13
Showing 1 changed file with 1 addition and 1 deletion.
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)