AutoRegistration is supposed to be working with disabled registration (go-gitea#17219)

kvaster · 6543 · lafriks · Stelios Malathouras · commit d7a4710a7cbc · 2021-10-15T11:41:39.000+03:00
Co-authored-by: 6543 &lt;6543@obermui.de&gt;
Co-authored-by: Lauris BH &lt;lauris@nix.lv&gt;
diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go
@@ -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 == "" {

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ func SignInOAuthCallback(ctx *context.Context) {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`if u == nil {`
`631`		`- if !(setting.Service.DisableRegistration \|\| setting.Service.AllowOnlyInternalRegistration) && setting.OAuth2Client.EnableAutoRegistration {`
	`631`	`+ if !setting.Service.AllowOnlyInternalRegistration && setting.OAuth2Client.EnableAutoRegistration {`
`632`	`632`	`// create new user with details from oauth2 provider`
`633`	`633`	`var missingFields []string`
`634`	`634`	`if gothUser.UserID == "" {`