diff options
Diffstat (limited to 'app/middleware/user_test.go')
| -rw-r--r-- | app/middleware/user_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/middleware/user_test.go b/app/middleware/user_test.go index e6c74d8..3e2425c 100644 --- a/app/middleware/user_test.go +++ b/app/middleware/user_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "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/key" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/test" @@ -24,14 +24,14 @@ func TestUser(t *testing.T) { t.Run("when ID Token is provided", func(t *testing.T) { t.Run("when user is known", func(t *testing.T) { server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user := key.CurrentUser.From(r.Context()) + user := cfg.CurrentUser.From(r.Context()) require.NotNil(t, user) assert.Equal(t, knownUser.ID, user.ID) w.WriteHeader(http.StatusTeapot) })) - ctx := key.IDToken.With(t.Context(), &oidc.IDToken{Subject: knownUser.ID.String()}) + ctx := cfg.IDToken.With(t.Context(), &oidc.IDToken{Subject: knownUser.ID.String()}) r, w := test.RequestResponse("GET", "/example", test.WithContext(ctx)) server.ServeHTTP(w, r) @@ -43,14 +43,14 @@ func TestUser(t *testing.T) { unknownID := pls.GenerateULID() server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user := key.CurrentUser.From(r.Context()) + user := cfg.CurrentUser.From(r.Context()) require.NotNil(t, user) assert.Equal(t, domain.ID(unknownID), user.ID) w.WriteHeader(http.StatusTeapot) })) - ctx := key.IDToken.With(t.Context(), &oidc.IDToken{Subject: unknownID}) + ctx := cfg.IDToken.With(t.Context(), &oidc.IDToken{Subject: unknownID}) r, w := test.RequestResponse("GET", "/example", test.WithContext(ctx)) server.ServeHTTP(w, r) @@ -62,7 +62,7 @@ func TestUser(t *testing.T) { t.Run("when ID Token is not provided", func(t *testing.T) { server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user := key.CurrentUser.From(r.Context()) + user := cfg.CurrentUser.From(r.Context()) require.Nil(t, user) w.WriteHeader(http.StatusTeapot) |