refactor: remove more types from oidc package

6 files changed, 14 insertions, 20 deletions

diff --git a/app/cfg/cfg.go b/app/cfg/cfg.go
index 1dffa16..e076932 100644
--- a/app/cfg/cfg.go
+++ b/app/cfg/cfg.go
@@ -1,10 +1,10 @@
 package cfg
 
 import (
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/xlgmokha/x/pkg/context"
 	"github.com/xlgmokha/x/pkg/env"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 )
 
 var CurrentUser context.Key[*domain.User] = context.Key[*domain.User]("current_user")
diff --git a/app/middleware/init.go b/app/middleware/init.go
index f1a693d..874ca52 100644
--- a/app/middleware/init.go
+++ b/app/middleware/init.go
@@ -1,14 +1,23 @@
 package middleware
 
 import (
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/xlgmokha/x/pkg/mapper"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 )
 
+type CustomClaims struct {
+	Name       string   `json:"name"`
+	Nickname   string   `json:"nickname"`
+	Email      string   `json:"email"`
+	ProfileURL string   `json:"profile"`
+	Picture    string   `json:"picture"`
+	Groups     []string `json:"groups_direct"`
+}
+
 func init() {
 	mapper.Register(func(idToken *oidc.IDToken) *domain.User {
-		customClaims := &oidc.CustomClaims{}
+		customClaims := &CustomClaims{}
 		if err := idToken.Claims(customClaims); err != nil {
 			return &domain.User{ID: domain.ID(idToken.Subject)}
 		}
diff --git a/app/middleware/user.go b/app/middleware/user.go
index c0181f9..9a88f8e 100644
--- a/app/middleware/user.go
+++ b/app/middleware/user.go
@@ -3,11 +3,11 @@ package middleware
 import (
 	"net/http"
 
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/xlgmokha/x/pkg/mapper"
 	"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/app/domain"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls"
 )
 
diff --git a/app/middleware/user_test.go b/app/middleware/user_test.go
index e6ba09d..aed3582 100644
--- a/app/middleware/user_test.go
+++ b/app/middleware/user_test.go
@@ -4,13 +4,13 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/stretchr/testify/assert"
 	"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/db"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls"
 )
 
diff --git a/pkg/oidc/custom_claims.go b/pkg/oidc/custom_claims.go
deleted file mode 100644
index 0d89d89..0000000
--- a/pkg/oidc/custom_claims.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package oidc
-
-type CustomClaims struct {
-	Name       string   `json:"name"`
-	Nickname   string   `json:"nickname"`
-	Email      string   `json:"email"`
-	ProfileURL string   `json:"profile"`
-	Picture    string   `json:"picture"`
-	Groups     []string `json:"groups_direct"`
-}
diff --git a/pkg/oidc/id_token.go b/pkg/oidc/id_token.go
deleted file mode 100644
index b7f21ce..0000000
--- a/pkg/oidc/id_token.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package oidc
-
-import "github.com/coreos/go-oidc/v3/oidc"
-
-type IDToken = oidc.IDToken