From ce43d38b4ffa40255cc8f859c5b31f59351f827c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 8 Jan 2021 20:15:06 +0800 Subject: Fix session bug when introduce chi (#14287) * Update go-chi session --- vendor/gitea.com/go-chi/session/session.go | 5 +++-- vendor/modules.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'vendor') diff --git a/vendor/gitea.com/go-chi/session/session.go b/vendor/gitea.com/go-chi/session/session.go index 97eb5ad365..475612ffb1 100644 --- a/vendor/gitea.com/go-chi/session/session.go +++ b/vendor/gitea.com/go-chi/session/session.go @@ -101,7 +101,8 @@ type Options struct { FlashEncryptionKey string } -func prepareOptions(options []Options) Options { +// PrepareOptions gives some default values for options +func PrepareOptions(options []Options) Options { var opt Options if len(options) > 0 { opt = options[0] @@ -231,7 +232,7 @@ func NewCookie(name string, value string, others ...interface{}) *http.Cookie { // Sessioner is a middleware that maps a session.SessionStore service into the Macaron handler chain. // An single variadic session.Options struct can be optionally provided to configure. func Sessioner(options ...Options) func(next http.Handler) http.Handler { - opt := prepareOptions(options) + opt := PrepareOptions(options) manager, err := NewManager(opt.Provider, opt) if err != nil { panic(err) diff --git a/vendor/modules.txt b/vendor/modules.txt index 426b0dc947..5dffe2e52e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,7 +7,7 @@ code.gitea.io/gitea-vet/checks # code.gitea.io/sdk/gitea v0.13.1 ## explicit code.gitea.io/sdk/gitea -# gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27 +# gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee ## explicit gitea.com/go-chi/session gitea.com/go-chi/session/couchbase -- cgit v1.2.3