From 79623df2476d4639d42f0bdf1ceccefd7a924dd7 Mon Sep 17 00:00:00 2001 From: Gary Moon Date: Mon, 10 Apr 2023 18:01:32 +0000 Subject: [PATCH] Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC Signed-off-by: Gary Moon --- 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 b3c4a234c1ef6..af916e1377639 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)