Skip to content
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

Jump to bottom

Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC #24035

Merged
merged 9 commits into from
Apr 25, 2023
Merged

Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC #24035

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
79623df
Respect the REGISTER_MANUAL_CONFIRM setting when registering via OIDC
garymoon Apr 10, 2023
0355d8a
Merge branch 'main' into gm/oidc-manual-confirm
silverwind Apr 23, 2023
ec2c61d
Merge branch 'main' into gm/oidc-manual-confirm
garymoon Apr 24, 2023
933efe2
Merge branch 'main' into gm/oidc-manual-confirm
GiteaBot Apr 24, 2023
0b18430
Merge branch 'main' into gm/oidc-manual-confirm
GiteaBot Apr 24, 2023
5ab791b
Merge branch 'main' into gm/oidc-manual-confirm
GiteaBot Apr 24, 2023
7566611
Merge branch 'main' into gm/oidc-manual-confirm
GiteaBot Apr 24, 2023
d35d5cc
Merge branch 'main' into gm/oidc-manual-confirm
GiteaBot Apr 25, 2023
7cde442
Merge branch 'main' into gm/oidc-manual-confirm
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 @@ -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)
Expand Down