From 12daa83784ea112e33d3b8b590a805dae9a29c1c Mon Sep 17 00:00:00 2001
From: William Lahti <wilahti@gmail.com>
Date: Thu, 28 Jun 2018 20:23:26 -0700
Subject: [PATCH] move CORS allowance to the REST API router

---
 server.ts                       | 34 +++++++++++++++++----------------
 server/controllers/api/index.ts |  7 +++++++
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/server.ts b/server.ts
index 0cb0759e0..5511c5435 100644
--- a/server.ts
+++ b/server.ts
@@ -84,22 +84,24 @@ import { UpdateVideosScheduler } from './server/lib/schedulers/update-videos-sch
 
 // ----------- App -----------
 
-// Enable CORS
-app.use((req, res, next) => {
-  // These routes have already cors
-  if (
-    req.path.indexOf(STATIC_PATHS.TORRENTS) === -1 &&
-    req.path.indexOf(STATIC_PATHS.WEBSEED) === -1
-  ) {
-    return (cors({
-      origin: '*',
-      exposedHeaders: 'Retry-After',
-      credentials: true
-    }))(req, res, next)
-  }
-
-  return next()
-})
+// Enable CORS for develop
+if (isTestInstance()) {
+  app.use((req, res, next) => {
+    // These routes have already cors
+    if (
+      req.path.indexOf(STATIC_PATHS.TORRENTS) === -1 &&
+      req.path.indexOf(STATIC_PATHS.WEBSEED) === -1
+    ) {
+      return (cors({
+        origin: '*',
+        exposedHeaders: 'Retry-After',
+        credentials: true
+      }))(req, res, next)
+    }
+
+    return next()
+  })
+}
 
 // For the logger
 app.use(morgan('combined', {
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 8f63b9535..c386a6710 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -8,9 +8,16 @@ import { accountsRouter } from './accounts'
 import { videosRouter } from './videos'
 import { badRequest } from '../../helpers/express-utils'
 import { videoChannelRouter } from './video-channel'
+import * as cors from 'cors'
 
 const apiRouter = express.Router()
 
+apiRouter.use(cors({
+  origin: '*',
+  exposedHeaders: 'Retry-After',
+  credentials: true
+}))
+
 apiRouter.use('/server', serverRouter)
 apiRouter.use('/oauth-clients', oauthClientsRouter)
 apiRouter.use('/config', configRouter)
-- 
2.41.0