From ef050c428a0a893607314a4d5d8d441e445e630a Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 7 May 2025 09:06:48 -0700 Subject: refactor: move cookie to web package --- pkg/web/cookie.go | 33 +++++++++++++++++++++++++++++++++ pkg/web/cookie/expire.go | 17 ----------------- pkg/web/cookie/new.go | 24 ------------------------ pkg/web/cookie/new_test.go | 19 ------------------- pkg/web/cookie/reset.go | 19 ------------------- pkg/web/cookie/reset_test.go | 25 ------------------------- pkg/web/cookie_test.go | 41 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 74 insertions(+), 104 deletions(-) create mode 100644 pkg/web/cookie.go delete mode 100644 pkg/web/cookie/expire.go delete mode 100644 pkg/web/cookie/new.go delete mode 100644 pkg/web/cookie/new_test.go delete mode 100644 pkg/web/cookie/reset.go delete mode 100644 pkg/web/cookie/reset_test.go create mode 100644 pkg/web/cookie_test.go (limited to 'pkg') diff --git a/pkg/web/cookie.go b/pkg/web/cookie.go new file mode 100644 index 0000000..d4b1555 --- /dev/null +++ b/pkg/web/cookie.go @@ -0,0 +1,33 @@ +package web + +import ( + "net/http" + + "github.com/xlgmokha/x/pkg/cookie" + "github.com/xlgmokha/x/pkg/env" + "github.com/xlgmokha/x/pkg/x" +) + +func NewCookie(name, value string, options ...x.Option[*http.Cookie]) *http.Cookie { + options = x.Prepend[x.Option[*http.Cookie]]( + options, + cookie.WithName(name), + cookie.WithValue(value), // TODO:: digitally sign the value + cookie.WithPath("/"), + cookie.WithHttpOnly(true), + cookie.WithSecure(true), + cookie.WithSameSite(http.SameSiteDefaultMode), + cookie.WithDomain(env.Fetch("HOST", "localhost")), + ) + + return x.New[*http.Cookie](options...) +} + +func ExpireCookie(w http.ResponseWriter, name string) { + cookie.Expire(w, name, + cookie.WithPath("/"), + cookie.WithDomain(env.Fetch("HOST", "localhost")), + cookie.WithHttpOnly(true), + cookie.WithSecure(true), + ) +} diff --git a/pkg/web/cookie/expire.go b/pkg/web/cookie/expire.go deleted file mode 100644 index 7d90274..0000000 --- a/pkg/web/cookie/expire.go +++ /dev/null @@ -1,17 +0,0 @@ -package cookie - -import ( - "net/http" - - "github.com/xlgmokha/x/pkg/cookie" - "github.com/xlgmokha/x/pkg/env" -) - -func Expire(w http.ResponseWriter, name string) { - cookie.Expire(w, name, - cookie.WithPath("/"), - cookie.WithDomain(env.Fetch("HOST", "localhost")), - cookie.WithHttpOnly(true), - cookie.WithSecure(true), - ) -} diff --git a/pkg/web/cookie/new.go b/pkg/web/cookie/new.go deleted file mode 100644 index be0241d..0000000 --- a/pkg/web/cookie/new.go +++ /dev/null @@ -1,24 +0,0 @@ -package cookie - -import ( - "net/http" - - "github.com/xlgmokha/x/pkg/cookie" - "github.com/xlgmokha/x/pkg/env" - "github.com/xlgmokha/x/pkg/x" -) - -func New(name, value string, options ...x.Option[*http.Cookie]) *http.Cookie { - options = x.Prepend[x.Option[*http.Cookie]]( - options, - cookie.WithName(name), - cookie.WithValue(value), // TODO:: digitally sign the value - cookie.WithPath("/"), - cookie.WithHttpOnly(true), - cookie.WithSecure(true), - cookie.WithSameSite(http.SameSiteDefaultMode), - cookie.WithDomain(env.Fetch("HOST", "localhost")), - ) - - return x.New[*http.Cookie](options...) -} diff --git a/pkg/web/cookie/new_test.go b/pkg/web/cookie/new_test.go deleted file mode 100644 index 5c9e92c..0000000 --- a/pkg/web/cookie/new_test.go +++ /dev/null @@ -1,19 +0,0 @@ -package cookie - -import ( - "net/http" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/xlgmokha/x/pkg/env" -) - -func TestNew(t *testing.T) { - env.With(env.Vars{"HOST": "sparkle.example.com"}, func() { - cookie := New("name", "value") - assert.Equal(t, "sparkle.example.com", cookie.Domain) - assert.True(t, cookie.HttpOnly) - assert.True(t, cookie.Secure) - assert.Equal(t, http.SameSiteDefaultMode, cookie.SameSite) - }) -} diff --git a/pkg/web/cookie/reset.go b/pkg/web/cookie/reset.go deleted file mode 100644 index 39625e6..0000000 --- a/pkg/web/cookie/reset.go +++ /dev/null @@ -1,19 +0,0 @@ -package cookie - -import ( - "net/http" - - "github.com/xlgmokha/x/pkg/cookie" - "github.com/xlgmokha/x/pkg/env" -) - -func Reset(name string) *http.Cookie { - return cookie.Reset( - name, - cookie.WithPath("/"), - cookie.WithHttpOnly(true), - cookie.WithSecure(true), - cookie.WithSameSite(http.SameSiteDefaultMode), - cookie.WithDomain(env.Fetch("HOST", "localhost")), - ) -} diff --git a/pkg/web/cookie/reset_test.go b/pkg/web/cookie/reset_test.go deleted file mode 100644 index 6291eac..0000000 --- a/pkg/web/cookie/reset_test.go +++ /dev/null @@ -1,25 +0,0 @@ -package cookie - -import ( - "net/http" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/xlgmokha/x/pkg/env" -) - -func TestReset(t *testing.T) { - env.With(env.Vars{"HOST": "sparkle.example.com"}, func() { - result := Reset("example") - - assert.Equal(t, -1, result.MaxAge) - assert.Equal(t, time.Unix(0, 0), result.Expires) - assert.Empty(t, result.Value) - assert.Equal(t, time.Unix(0, 0), result.Expires) - assert.True(t, result.HttpOnly) - assert.True(t, result.Secure) - assert.Equal(t, http.SameSiteDefaultMode, result.SameSite) - assert.Equal(t, "sparkle.example.com", result.Domain) - }) -} diff --git a/pkg/web/cookie_test.go b/pkg/web/cookie_test.go new file mode 100644 index 0000000..60cf7cf --- /dev/null +++ b/pkg/web/cookie_test.go @@ -0,0 +1,41 @@ +package web + +import ( + "net/http" + "net/http/httptest" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/xlgmokha/x/pkg/env" +) + +func TestNewCookie(t *testing.T) { + env.With(env.Vars{"HOST": "sparkle.example.com"}, func() { + cookie := NewCookie("name", "value") + assert.Equal(t, "sparkle.example.com", cookie.Domain) + assert.True(t, cookie.HttpOnly) + assert.True(t, cookie.Secure) + assert.Equal(t, http.SameSiteDefaultMode, cookie.SameSite) + }) +} + +func TestExpireCookie(t *testing.T) { + env.With(env.Vars{"HOST": "sparkle.example.com"}, func() { + w := httptest.NewRecorder() + + ExpireCookie(w, "example") + + result, err := http.ParseSetCookie(w.Header().Get("Set-Cookie")) + require.NoError(t, err) + + assert.Empty(t, result.Value) + assert.Equal(t, "sparkle.example.com", result.Domain) + assert.Equal(t, -1, result.MaxAge) + assert.Equal(t, time.Unix(0, 0).Unix(), result.Expires.Unix()) + assert.True(t, result.HttpOnly) + assert.True(t, result.Secure) + assert.Zero(t, result.SameSite) + }) +} -- cgit v1.2.3