Backport of fix for auto registration - PR #17219 (#17292)

kvaster · web-flow · commit fde6ff6a7584 · 2021-10-12T00:02:47.000-04:00
diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go
@@ -617,7 +617,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 == "" {

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ func SignInOAuthCallback(ctx *context.Context) {`
`617`	`617`	`}`
`618`	`618`
`619`	`619`	`if u == nil {`
`620`		`- if !(setting.Service.DisableRegistration \|\| setting.Service.AllowOnlyInternalRegistration) && setting.OAuth2Client.EnableAutoRegistration {`
	`620`	`+ if !setting.Service.AllowOnlyInternalRegistration && setting.OAuth2Client.EnableAutoRegistration {`
`621`	`621`	`// create new user with details from oauth2 provider`
`622`	`622`	`var missingFields []string`
`623`	`623`	`if gothUser.UserID == "" {`