Skip to content

feat: Allow for reuse of cookie creation + decouple creation from http writer #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickheyer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Allow for reuse of cookie creation + decouple creation from http writer #848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions pkg/http/cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,12 @@ func (c *CookieHandler) CheckQueryCookie(r *http.Request, name string) (string,
return value, nil
}

func (c *CookieHandler) SetCookie(w http.ResponseWriter, name, value string) error {
if c.IsRequestAware() {
return errors.New("Cookie handler is request aware")
}

func (c *CookieHandler) CreateCookie(name, value string) (*http.Cookie, error) {
encoded, err := c.securecookie.Encode(name, value)
if err != nil {
return err
return nil, err
}
http.SetCookie(w, &http.Cookie{
return &http.Cookie{
Name: name,
Value: encoded,
Domain: c.domain,
Expand All @@ -133,26 +129,20 @@ func (c *CookieHandler) SetCookie(w http.ResponseWriter, name, value string) err
HttpOnly: true,
Secure: c.secureOnly,
SameSite: c.sameSite,
})
return nil
}, nil
}

func (c *CookieHandler) SetRequestAwareCookie(r *http.Request, w http.ResponseWriter, name string, value string) error {
if !c.IsRequestAware() {
return errors.New("Cookie handler is not request aware")
}

func (c *CookieHandler) CreateSecureCookie(r *http.Request, name, value string) (*http.Cookie, error) {
secureCookie, err := c.secureCookieFunc(r)
if err != nil {
return err
return nil, err
}

encoded, err := secureCookie.Encode(name, value)
if err != nil {
return err
return nil, err
}

http.SetCookie(w, &http.Cookie{
return &http.Cookie{
Name: name,
Value: encoded,
Domain: c.domain,
Expand All @@ -161,8 +151,34 @@ func (c *CookieHandler) SetRequestAwareCookie(r *http.Request, w http.ResponseWr
HttpOnly: true,
Secure: c.secureOnly,
SameSite: c.sameSite,
})
}, nil
}

func (c *CookieHandler) SetCookie(w http.ResponseWriter, name, value string) error {
if c.IsRequestAware() {
return errors.New("cookie handler is request aware")
}

cookie, err := c.CreateCookie(name, value)
if err != nil {
return err
}

http.SetCookie(w, cookie)
return nil
}

func (c *CookieHandler) SetRequestAwareCookie(r *http.Request, w http.ResponseWriter, name string, value string) error {
if !c.IsRequestAware() {
return errors.New("cookie handler is not request aware")
}

cookie, err := c.CreateSecureCookie(r, name, value)
if err != nil {
return err
}

http.SetCookie(w, cookie)
return nil
}

Expand Down