mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-05-11 05:55:29 +00:00
Code Issues Projects Releases Wiki Activity

Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC (#24035) (#24333)

Browse Source 
Backport #24035 by @garymoon

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 <[email protected]>
Co-authored-by: Gary Moon <[email protected]>
This commit is contained in:
Giteabot
2023-04-25 15:25:08 -04:00
committed by GitHub
co-authored by GitHub Gary Moon
parent 1254a8271e
commit 1bbbeb24ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/web/auth/oauth.go
+1 -1
View File
@@ -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)