rename user auth role middleware

Emyrk · Emyrk · commit 6a89023eaf43 · 2022-06-01T08:25:23.000-05:00
diff --git a/coderd/authorize.go b/coderd/authorize.go
@@ -13,12 +13,12 @@ import (
 )
 
 func AuthorizeFilter[O rbac.Objecter](api *API, r *http.Request, action rbac.Action, objects []O) []O {
-	roles := httpmw.UserAuthorizationRoles(r)
+	roles := httpmw.AuthorizationUserRoles(r)
 	return rbac.Filter(r.Context(), api.Authorizer, roles.ID.String(), roles.Roles, action, objects)
 }
 
 func (api *API) Authorize(rw http.ResponseWriter, r *http.Request, action rbac.Action, object rbac.Objecter) bool {
-	roles := httpmw.UserAuthorizationRoles(r)
+	roles := httpmw.AuthorizationUserRoles(r)
 	err := api.Authorizer.ByRoleName(r.Context(), roles.ID.String(), roles.Roles, action, object.RBACObject())
 	if err != nil {
 		httpapi.Write(rw, http.StatusForbidden, httpapi.Response{
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -34,9 +34,9 @@ func APIKey(r *http.Request) database.APIKey {
 // User roles are the 'subject' field of Authorize()
 type userRolesKey struct{}
 
-// UserAuthorizationRoles returns the roles used for authorization.
+// AuthorizationUserRoles returns the roles used for authorization.
 // Comes from the ExtractAPIKey handler.
-func UserAuthorizationRoles(r *http.Request) database.GetAuthorizationUserRolesRow {
+func AuthorizationUserRoles(r *http.Request) database.GetAuthorizationUserRolesRow {
 	apiKey, ok := r.Context().Value(userRolesKey{}).(database.GetAuthorizationUserRolesRow)
 	if !ok {
 		panic("developer error: user roles middleware not provided")
diff --git a/coderd/httpmw/authorize_test.go b/coderd/httpmw/authorize_test.go
@@ -86,7 +86,7 @@ func TestExtractUserRoles(t *testing.T) {
 				httpmw.ExtractAPIKey(db, &httpmw.OAuth2Configs{}),
 			)
 			rtr.Get("/", func(_ http.ResponseWriter, r *http.Request) {
-				roles := httpmw.UserAuthorizationRoles(r)
+				roles := httpmw.AuthorizationUserRoles(r)
 				require.ElementsMatch(t, user.ID, roles.ID)
 				require.ElementsMatch(t, expRoles, roles.Roles)
 			})

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func AuthorizeFilter[O rbac.Objecter](api API, r http.Request, action rbac.Action, objects []O) []O {`
`16`		`- roles := httpmw.UserAuthorizationRoles(r)`
	`16`	`+ roles := httpmw.AuthorizationUserRoles(r)`
`17`	`17`	`return rbac.Filter(r.Context(), api.Authorizer, roles.ID.String(), roles.Roles, action, objects)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func (api API) Authorize(rw http.ResponseWriter, r http.Request, action rbac.Action, object rbac.Objecter) bool {`
`21`		`- roles := httpmw.UserAuthorizationRoles(r)`
	`21`	`+ roles := httpmw.AuthorizationUserRoles(r)`
`22`	`22`	`err := api.Authorizer.ByRoleName(r.Context(), roles.ID.String(), roles.Roles, action, object.RBACObject())`
`23`	`23`	`if err != nil {`
`24`	`24`	`httpapi.Write(rw, http.StatusForbidden, httpapi.Response{`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func TestExtractUserRoles(t *testing.T) {`
`86`	`86`	`httpmw.ExtractAPIKey(db, &httpmw.OAuth2Configs{}),`
`87`	`87`	`)`
`88`	`88`	`rtr.Get("/", func(_ http.ResponseWriter, r *http.Request) {`
`89`		`- roles := httpmw.UserAuthorizationRoles(r)`
	`89`	`+ roles := httpmw.AuthorizationUserRoles(r)`
`90`	`90`	`require.ElementsMatch(t, user.ID, roles.ID)`
`91`	`91`	`require.ElementsMatch(t, expRoles, roles.Roles)`
`92`	`92`	`})`