Fix OAuth Source Edit Page to ensure restricted and group settings are set

zeripath · zeripath · commit 690797237a23 · 2022-01-31T19:31:40.000Z
Fix go-gitea#18432 Signed-off-by: Andrew Thornton <art27@cantab.net>
diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go
@@ -192,6 +192,9 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source {
 		RequiredClaimName:             form.Oauth2RequiredClaimName,
 		RequiredClaimValue:            form.Oauth2RequiredClaimValue,
 		SkipLocalTwoFA:                form.SkipLocalTwoFA,
+		GroupClaimName:                form.Oauth2GroupClaimName,
+		RestrictedGroup:               form.Oauth2RestrictedGroup,
+		AdminGroup:                    form.Oauth2AdminGroup,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,9 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source {`
`192`	`192`	`RequiredClaimName: form.Oauth2RequiredClaimName,`
`193`	`193`	`RequiredClaimValue: form.Oauth2RequiredClaimValue,`
`194`	`194`	`SkipLocalTwoFA: form.SkipLocalTwoFA,`
	`195`	`+ GroupClaimName: form.Oauth2GroupClaimName,`
	`196`	`+ RestrictedGroup: form.Oauth2RestrictedGroup,`
	`197`	`+ AdminGroup: form.Oauth2AdminGroup,`
`195`	`198`	`}`
`196`	`199`	`}`
`197`	`200`