diff options
| author | zeripath <art27@cantab.net> | 2021-09-12 18:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 19:35:38 +0200 |
| commit | a334a95a3c7f97b2a60fc87f5ada5ce139b07ffe (patch) | |
| tree | 2ed19779dd010ddd8bfda8598460ff46c0dd3865 /routers/web/web.go | |
| parent | aac7f68af1a145fc772c018ed98f34b1af34b637 (diff) | |
| download | gitea-a334a95a3c7f97b2a60fc87f5ada5ce139b07ffe.tar.gz gitea-a334a95a3c7f97b2a60fc87f5ada5ce139b07ffe.zip | |
Use common sessioner for API and Web (#17027)
* Use common sessioner for API and Web
Instead of creating separate sessioner and doubly initialising the provider just
use the same sessioner for the API and Web routes.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers/web/web.go')
| -rw-r--r-- | routers/web/web.go | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/routers/web/web.go b/routers/web/web.go index a88b66726a..8d984abcf2 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -40,7 +40,6 @@ import ( _ "code.gitea.io/gitea/modules/session" "gitea.com/go-chi/captcha" - "gitea.com/go-chi/session" "github.com/NYTimes/gziphandler" "github.com/go-chi/chi/middleware" "github.com/go-chi/cors" @@ -72,7 +71,7 @@ func CorsHandler() func(next http.Handler) http.Handler { } // Routes returns all web routes -func Routes() *web.Route { +func Routes(sessioner func(http.Handler) http.Handler) *web.Route { routes := web.NewRoute() routes.Use(public.AssetsHandler(&public.Options{ @@ -81,17 +80,7 @@ func Routes() *web.Route { CorsHandler: CorsHandler(), })) - routes.Use(session.Sessioner(session.Options{ - Provider: setting.SessionConfig.Provider, - ProviderConfig: setting.SessionConfig.ProviderConfig, - CookieName: setting.SessionConfig.CookieName, - CookiePath: setting.SessionConfig.CookiePath, - Gclifetime: setting.SessionConfig.Gclifetime, - Maxlifetime: setting.SessionConfig.Maxlifetime, - Secure: setting.SessionConfig.Secure, - SameSite: setting.SessionConfig.SameSite, - Domain: setting.SessionConfig.Domain, - })) + routes.Use(sessioner) routes.Use(Recovery()) |