Skip to content
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

Add CookieFunc to update cookie based on request before writing it to http-response #210

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

Add CookieFunc to update cookie based on request before writing it to http-response #210

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
15 changes: 12 additions & 3 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ type SessionManager struct {
// Cookie contains the configuration settings for session cookies.
Cookie SessionCookie

// CookieFunc allows you to set update attributes on the session cookie
// before it gets written to the http-response.
CookieFunc func(*http.Request, *http.Cookie)

// Codec controls the encoder/decoder used to transform session data to a
// byte slice for use by the session store. By default session data is
// encoded/decoded using encoding/gob.
Expand Down Expand Up @@ -107,6 +111,7 @@ func New() *SessionManager {
Codec: GobCodec{},
ErrorFunc: defaultErrorFunc,
contextKey: generateContextKey(),
CookieFunc: defaultCookieFunc,
Cookie: SessionCookie{
Name: "session",
Domain: "",
Expand Down Expand Up @@ -172,9 +177,9 @@ func (s *SessionManager) commitAndWriteSessionCookie(w http.ResponseWriter, r *h
return
}

s.WriteSessionCookie(ctx, w, token, expiry)
s.WriteSessionCookie(ctx, w, r, token, expiry)
case Destroyed:
s.WriteSessionCookie(ctx, w, "", time.Time{})
s.WriteSessionCookie(ctx, w, r, "", time.Time{})
}
}

Expand All @@ -188,7 +193,7 @@ func (s *SessionManager) commitAndWriteSessionCookie(w http.ResponseWriter, r *h
//
// Most applications will use the LoadAndSave() middleware and will not need to
// use this method.
func (s *SessionManager) WriteSessionCookie(ctx context.Context, w http.ResponseWriter, token string, expiry time.Time) {
func (s *SessionManager) WriteSessionCookie(ctx context.Context, w http.ResponseWriter, r *http.Request, token string, expiry time.Time) {
cookie := &http.Cookie{
Name: s.Cookie.Name,
Value: token,
Expand All @@ -198,6 +203,7 @@ func (s *SessionManager) WriteSessionCookie(ctx context.Context, w http.Response
HttpOnly: s.Cookie.HttpOnly,
SameSite: s.Cookie.SameSite,
}
s.CookieFunc(r, cookie)

if expiry.IsZero() {
cookie.Expires = time.Unix(1, 0)
Expand All @@ -216,6 +222,9 @@ func defaultErrorFunc(w http.ResponseWriter, r *http.Request, err error) {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
}

func defaultCookieFunc(r *http.Request, c *http.Cookie) {
}

type sessionResponseWriter struct {
http.ResponseWriter
request *http.Request
Expand Down