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/init.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/init.go')
| -rw-r--r-- | routers/init.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/routers/init.go b/routers/init.go index 27cd066b73..fe89c738ef 100644 --- a/routers/init.go +++ b/routers/init.go @@ -41,6 +41,8 @@ import ( pull_service "code.gitea.io/gitea/services/pull" "code.gitea.io/gitea/services/repository" "code.gitea.io/gitea/services/webhook" + + "gitea.com/go-chi/session" ) // NewServices init new services @@ -145,8 +147,20 @@ func NormalRoutes() *web.Route { r.Use(middle) } - r.Mount("/", web_routers.Routes()) - r.Mount("/api/v1", apiv1.Routes()) + sessioner := 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, + }) + + r.Mount("/", web_routers.Routes(sessioner)) + r.Mount("/api/v1", apiv1.Routes(sessioner)) r.Mount("/api/internal", private.Routes()) return r } |