Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silverwind merged 3 commits into from
Apr 25, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b95d94
Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC…
garymoon Apr 25, 2023
711ba01
Merge branch 'release/v1.19' into backport-24035-v1.19
GiteaBot Apr 25, 2023
63a0265
Merge branch 'release/v1.19' into backport-24035-v1.19
GiteaBot Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routers/web/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down