refactor: rename middleware

4 files changed, 7 insertions, 19 deletions

diff --git a/pkg/web/middleware/enforce_authn.go b/pkg/web/middleware/enforce_authn.go
deleted file mode 100644
index c870d7c..0000000
--- a/pkg/web/middleware/enforce_authn.go
+++ /dev/null
@@ -1 +0,0 @@
-package middleware
diff --git a/pkg/web/middleware/enforce_authn_test.go b/pkg/web/middleware/enforce_authn_test.go
deleted file mode 100644
index 285db5b..0000000
--- a/pkg/web/middleware/enforce_authn_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package middleware
-
-import "testing"
-
-func TestEnforceAuthn(t *testing.T) {
-	t.Run("when an active session cookie is provided", func(t *testing.T) {
-		t.Run("attaches a user to the request context", func(t *testing.T) {
-
-		})
-	})
-}
diff --git a/pkg/web/middleware/unpack_token.go b/pkg/web/middleware/id_token.go
index 0b182a0..a32c77b 100644
--- a/pkg/web/middleware/unpack_token.go
+++ b/pkg/web/middleware/id_token.go
@@ -9,9 +9,9 @@ import (
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 )
 
-type TokenParser func(*http.Request) oidc.RawIDToken
+type TokenParser func(*http.Request) oidc.RawToken
 
-func FromSessionCookie(r *http.Request) oidc.RawIDToken {
+func IDTokenFromSessionCookie(r *http.Request) oidc.RawToken {
 	cookies := r.CookiesNamed("session")
 
 	if len(cookies) != 1 {
@@ -27,8 +27,8 @@ func FromSessionCookie(r *http.Request) oidc.RawIDToken {
 	return tokens.IDToken
 }
 
-func UnpackToken(cfg *oidc.OpenID) func(http.Handler) http.Handler {
-	parsers := []TokenParser{FromSessionCookie}
+func IDToken(cfg *oidc.OpenID) func(http.Handler) http.Handler {
+	parsers := []TokenParser{IDTokenFromSessionCookie}
 
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/web/middleware/unpack_token_test.go b/pkg/web/middleware/id_token_test.go
index 116e88f..4f26cdf 100644
--- a/pkg/web/middleware/unpack_token_test.go
+++ b/pkg/web/middleware/id_token_test.go
@@ -20,7 +20,7 @@ import (
 	"golang.org/x/oauth2"
 )
 
-func TestUnpackToken(t *testing.T) {
+func TestIDToken(t *testing.T) {
 	srv := test.NewOIDCServer(t)
 	defer srv.Close()
 
@@ -36,14 +36,14 @@ func TestUnpackToken(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	middleware := UnpackToken(openID)
+	middleware := IDToken(openID)
 
 	t.Run("when an active session cookie is provided", func(t *testing.T) {
 		t.Run("attaches the token to the request context", func(t *testing.T) {
 			user := mockoidc.DefaultUser()
 
 			token, rawIDToken := srv.CreateTokensFor(user)
-			tokens := &oidc.Tokens{Token: token, IDToken: oidc.RawIDToken(rawIDToken)}
+			tokens := &oidc.Tokens{Token: token, IDToken: oidc.RawToken(rawIDToken)}
 			encoded := x.Must(tokens.ToBase64String())
 
 			server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {