Move cors handler early in the pipeline

1 files changed, 4 insertions, 3 deletions

diff --git a/app.go b/app.go
index 941b9034..c733668f 100644
--- a/app.go
+++ b/app.go
@@ -137,9 +137,6 @@ func setRequestScheme(r *http.Request) *http.Request {
 func (a *theApp) buildHandlerPipeline() (http.Handler, error) {
 	// Handlers should be applied in a reverse order
 	handler := a.serveFileOrNotFoundHandler()
-	if !a.config.General.DisableCrossOriginRequests {
-		handler = corsHandler.Handler(handler)
-	}
 	handler = a.Auth.AuthorizationMiddleware(handler)
 	handler = routing.NewMiddleware(handler, a.source)
 
@@ -147,6 +144,10 @@ func (a *theApp) buildHandlerPipeline() (http.Handler, error) {
 	handler = a.Auth.AuthenticationMiddleware(handler, a.source)
 	handler = handlers.AcmeMiddleware(handler, a.source, a.config.GitLab.PublicServer)
 
+	if !a.config.General.DisableCrossOriginRequests {
+		handler = corsHandler.Handler(handler)
+	}
+
 	// Add auto redirect
 	handler = handlers.HTTPSRedirectMiddleware(handler, a.config.General.RedirectHTTP)