refactor: inject permission service into sparkle controller

2 files changed, 5 insertions, 29 deletions

diff --git a/app/middleware/require_permission.go b/app/middleware/require_permission.go
index a10a9b6..cfcae0c 100644
--- a/app/middleware/require_permission.go
+++ b/app/middleware/require_permission.go
@@ -10,7 +10,7 @@ import (
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls"
 )
 
-func RequirePermission(permission Permission, client authz.CheckPermission) func(http.Handler) http.Handler {
+func RequirePermission(permission Permission, client authz.PermissionService) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			user := cfg.CurrentUser.From(r.Context())
diff --git a/app/middleware/require_permission_test.go b/app/middleware/require_permission_test.go
index df21b5a..b11a33c 100644
--- a/app/middleware/require_permission_test.go
+++ b/app/middleware/require_permission_test.go
@@ -1,45 +1,25 @@
 package middleware
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
-	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
 	"github.com/stretchr/testify/require"
 	"github.com/xlgmokha/x/pkg/test"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
-	"google.golang.org/grpc"
+	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/internal/stub"
 )
 
-type MockAbility func(context.Context, *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error)
-
-func (m MockAbility) CheckPermission(ctx context.Context, r *v1.CheckPermissionRequest, opts ...grpc.CallOption) (*v1.CheckPermissionResponse, error) {
-	return m(ctx, r)
-}
-
 func TestRequirePermission(t *testing.T) {
 	user := &domain.User{ID: domain.ID("1")}
 	ctx := cfg.CurrentUser.With(t.Context(), user)
-	permission := Permission("read_sparkles")
+	permission := Permission("read")
 
 	t.Run("when the permission is granted", func(t *testing.T) {
 		r, w := test.RequestResponse("GET", "/sparkles", test.WithContext(ctx))
 
-		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error) {
-			require.Equal(t, "user", r.Subject.Object.ObjectType)
-			require.Equal(t, user.Username, r.Subject.Object.ObjectId)
-
-			require.Equal(t, permission.String(), r.Permission)
-
-			require.Equal(t, "sparkle", r.Resource.ObjectType)
-			require.Equal(t, "*", r.Resource.ObjectId)
-
-			return &v1.CheckPermissionResponse{
-				Permissionship: v1.CheckPermissionResponse_PERMISSIONSHIP_HAS_PERMISSION,
-			}, nil
-		}))
+		middleware := RequirePermission(permission, stub.AllowWith(t, "user:1", permission.String(), "sparkle:*"))
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusTeapot)
 		}))
@@ -51,11 +31,7 @@ func TestRequirePermission(t *testing.T) {
 	t.Run("when the permission is denied", func(t *testing.T) {
 		r, w := test.RequestResponse("GET", "/sparkles", test.WithContext(ctx))
 
-		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error) {
-			return &v1.CheckPermissionResponse{
-				Permissionship: v1.CheckPermissionResponse_PERMISSIONSHIP_NO_PERMISSION,
-			}, nil
-		}))
+		middleware := RequirePermission(permission, stub.Deny())
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			require.Fail(t, "unexpected call to handler")
 		}))