From e3eeba19f090f38712b4720e2f928d503f0d92d2 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 17 Apr 2025 14:20:52 -0600 Subject: refactor: remove Key suffix from context keys --- pkg/web/middleware/unpack_token.go | 2 +- pkg/web/middleware/unpack_token_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/web') diff --git a/pkg/web/middleware/unpack_token.go b/pkg/web/middleware/unpack_token.go index 914f405..db04e0e 100644 --- a/pkg/web/middleware/unpack_token.go +++ b/pkg/web/middleware/unpack_token.go @@ -37,7 +37,7 @@ func UnpackToken(cfg *oidc.OpenID) func(http.Handler) http.Handler { log.WithFields(r.Context(), log.Fields{"id_token": idToken}) next.ServeHTTP( w, - r.WithContext(key.IDTokenKey.With(r.Context(), idToken)), + r.WithContext(key.IDToken.With(r.Context(), idToken)), ) }) } diff --git a/pkg/web/middleware/unpack_token_test.go b/pkg/web/middleware/unpack_token_test.go index 1405d6d..f2250bc 100644 --- a/pkg/web/middleware/unpack_token_test.go +++ b/pkg/web/middleware/unpack_token_test.go @@ -47,7 +47,7 @@ func TestUnpackToken(t *testing.T) { encoded := x.Must(tokens.ToBase64String()) server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - token := key.IDTokenKey.From(r.Context()) + token := key.IDToken.From(r.Context()) require.NotNil(t, token) assert.Equal(t, user.Subject, token.Subject) @@ -68,7 +68,7 @@ func TestUnpackToken(t *testing.T) { t.Run("when an invalid session cookie is provided", func(t *testing.T) { t.Run("forwards the request", func(t *testing.T) { server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - require.Nil(t, key.IDTokenKey.From(r.Context())) + require.Nil(t, key.IDToken.From(r.Context())) w.WriteHeader(http.StatusTeapot) })) @@ -87,7 +87,7 @@ func TestUnpackToken(t *testing.T) { t.Run("when no cookies are provided", func(t *testing.T) { t.Run("forwards the request", func(t *testing.T) { server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - require.Nil(t, key.IDTokenKey.From(r.Context())) + require.Nil(t, key.IDToken.From(r.Context())) w.WriteHeader(http.StatusTeapot) })) -- cgit v1.2.3