From ab42c139a246be8905bae2e87a41aef9ecbe06f7 Mon Sep 17 00:00:00 2001
From: Gary Moon <garymoon@users.noreply.github.com>
Date: Tue, 25 Apr 2023 02:40:48 -0400
Subject: [PATCH] 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 https://github.com/go-gitea/gitea/issues/23392
Signed-off-by: Gary Moon <gary@garymoon.net>
---
routers/web/auth/oauth.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index 287136e64c..92a06e7c14 100644
--- 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)