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

garymoon · GiteaBot · commit 0b95d945b36e · 2023-04-25T14:08:47.000Z
This change prevents Gitea from bypassing the manual approval process for newly registered users when OIDC is used. - Resolves go-gitea#23392 Signed-off-by: Gary Moon <gary@garymoon.net>
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
@@ -963,7 +963,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
`@@ -963,7 +963,7 @@ func SignInOAuthCallback(ctx *context.Context) {`
`963`	`963`	`}`
`964`	`964`
`965`	`965`	`overwriteDefault := &user_model.CreateUserOverwriteOptions{`
`966`		`- IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),`
	`966`	`+ IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm),`
`967`	`967`	`}`
`968`	`968`
`969`	`969`	`source := authSource.Cfg.(*oauth2.Source)`