mirror of
https://github.com/go-gitea/gitea
synced 2024-11-18 19:49:26 +01:00
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>
This commit is contained in:
parent
74aa44625b
commit
ab42c139a2
@ -966,7 +966,7 @@ func SignInOAuthCallback(ctx *context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
overwriteDefault := &user_model.CreateUserOverwriteOptions{
|
overwriteDefault := &user_model.CreateUserOverwriteOptions{
|
||||||
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
|
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm),
|
||||||
}
|
}
|
||||||
|
|
||||||
source := authSource.Cfg.(*oauth2.Source)
|
source := authSource.Cfg.(*oauth2.Source)
|
||||||
|
Loading…
Reference in New Issue
Block a user