From 48800c5e4e9d458ba7b6a9ab375810380091bdbb Mon Sep 17 00:00:00 2001
From: mo khan <mo@mokhan.ca>
Date: Thu, 15 May 2025 10:00:04 -0600
Subject: refactor: inline usage of RawToken type

---
 app/middleware/raw_token.go    | 7 +++++++
 app/middleware/token_parser.go | 7 +++----
 pkg/oidc/raw_token.go          | 7 -------
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 app/middleware/raw_token.go
 delete mode 100644 pkg/oidc/raw_token.go

diff --git a/app/middleware/raw_token.go b/app/middleware/raw_token.go
new file mode 100644
index 0000000..f7aa264
--- /dev/null
+++ b/app/middleware/raw_token.go
@@ -0,0 +1,7 @@
+package middleware
+
+type RawToken string
+
+func (r RawToken) String() string {
+	return string(r)
+}
diff --git a/app/middleware/token_parser.go b/app/middleware/token_parser.go
index 22a7af9..14d48e2 100644
--- a/app/middleware/token_parser.go
+++ b/app/middleware/token_parser.go
@@ -5,17 +5,16 @@ import (
 
 	"github.com/xlgmokha/x/pkg/x"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 )
 
-type TokenParser x.Mapper[*http.Request, oidc.RawToken]
+type TokenParser x.Mapper[*http.Request, RawToken]
 
-func IDTokenFromSessionCookie(r *http.Request) oidc.RawToken {
+func IDTokenFromSessionCookie(r *http.Request) RawToken {
 	cookies := r.CookiesNamed(cfg.IDTokenCookie)
 
 	if len(cookies) != 1 {
 		return ""
 	}
 
-	return oidc.RawToken(cookies[0].Value)
+	return RawToken(cookies[0].Value)
 }
diff --git a/pkg/oidc/raw_token.go b/pkg/oidc/raw_token.go
deleted file mode 100644
index 08bd1e5..0000000
--- a/pkg/oidc/raw_token.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package oidc
-
-type RawToken string
-
-func (r RawToken) String() string {
-	return string(r)
-}
-- 
cgit v1.2.3