expand cors

server/index.js

@@ -58,8 +58,7 @@ app.use(bodyParser.json());
 app.set('views', __dirname +'/views');
 app.set('view engine', 'pug');
 
-
-// this route is to be removed when we update guides to use the v1 route
+// this route is to be removed when we update guides and FCCSearchBar to use the v1 route
 app.get('/search', cors, (req, res) => {
   const { q: query } = req.query;
   Observable.fromPromise(findTheThings(query))

server/middleware/cors.js

@@ -1,20 +1,13 @@
 const cors = require('cors');
 
 const whitelist = [
-  'http://guide.freecodecamp.org',
-  'https://guide.freecodecamp.org',
-  'http://news.freecodecamp.org',
-  'https://news.freecodecamp.org',
-  'http://localhost:8000'
+  /(\.|https:\/\/)freecodecamp\.org/, // freecodecamp.org and any subdomain of
+  /\.netlify\.com/, // deploy previews
+  'http://localhost:3000', // fcc dev
+  'http://localhost:8000' // guides dev
 ];
 const corsOptions = {
-  origin: function (origin, callback) {
-    if (whitelist.includes(origin)) {
-      callback(null, true);
-    } else {
-      callback(new Error('The request is not from an authorised origin'));
-    }
-  },
+  origin: whitelist,
   optionsSuccessStatus: 200
 };
 exports.cors = cors;