Skip to content

AutoRegistration is supposed to be working with disabled registration #17219

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
merged 4 commits into from
Oct 11, 2021
Merged

AutoRegistration is supposed to be working with disabled registration #17219

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a771ba2
AutoRegistration is supposed to be working with disabled registration
kvaster Oct 4, 2021
22c9e1d
Merge branch 'main' into fix_auto_register
6543 Oct 7, 2021
a58ab28
Merge branch 'main' into fix_auto_register
lafriks Oct 11, 2021
abebc0c
Merge branch 'main' into fix_auto_register
6543 Oct 11, 2021
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/user/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ func SignInOAuthCallback(ctx *context.Context) {
}

if u == nil {
if !(setting.Service.DisableRegistration || setting.Service.AllowOnlyInternalRegistration) && setting.OAuth2Client.EnableAutoRegistration {
if !setting.Service.AllowOnlyInternalRegistration && setting.OAuth2Client.EnableAutoRegistration {
// create new user with details from oauth2 provider
var missingFields []string
if gothUser.UserID == "" {
Expand Down