From f566a19857c3224c2e915164ac7e8cdc63218e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 13 Mar 2018 18:51:52 +0100
Subject: [PATCH] Trying to enable cors for api

---
 package-lock.json            | 16 ++++++++++++++++
 package.json                 |  1 +
 server/apps/addtype.js       | 13 +++++++++++++
 server/apps/client.js        |  3 ++-
 server/routing/client/api.js |  3 ++-
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 58d6c225..d700fdb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -419,6 +419,22 @@
       "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
+      "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
+      "requires": {
+        "object-assign": "4.1.1",
+        "vary": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+        }
+      }
+    },
     "crc": {
       "version": "3.4.4",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
diff --git a/package.json b/package.json
index 01b9997c..60e42d21 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "color-thief-jimp": "^2.0.2",
     "cookie-parser": "^1.4.3",
     "cookies": "^0.7.1",
+    "cors": "^2.8.4",
     "emoji-strip": "^0.0.3",
     "express": "^4.15.2",
     "express-handlebars": "^3.0.0",
diff --git a/server/apps/addtype.js b/server/apps/addtype.js
index c2122480..7891c7c3 100644
--- a/server/apps/addtype.js
+++ b/server/apps/addtype.js
@@ -5,6 +5,11 @@ var usual = [];
 var settings = [];
 
 db.getCollectionNames(function(err, docs) {
+    for(var i = 0; i < docs.length; i++) {
+        if(docs[i].indexOf("_settings")) {
+            t(docs[i]);
+        }
+    }
     /*for(var i = 0; i < docs.length; i++) {
         if(docs[i].indexOf("_settings") > -1) {
             settings.push(docs[0]);
@@ -20,6 +25,14 @@ db.getCollectionNames(function(err, docs) {
     }*/
 })
 
+function t(docs) {
+    db.collection(docs).find({id: "config"}, function(e, _docs) {
+        if(_docs.length > 0 && _docs[0].userpass == undefined) {
+            console.log(docs);
+        })
+    })
+}
+
 function addType(name) {
     if(name.indexOf("_settings") > -1) {
         db.collection(name).update({views: {$exists: true}}, {$set: { id: "config" }}, {multi: true}, function(err, doc) {
diff --git a/server/apps/client.js b/server/apps/client.js
index c22f6e90..97e73a88 100755
--- a/server/apps/client.js
+++ b/server/apps/client.js
@@ -19,6 +19,7 @@ var path = require('path');
 var express = require('express');
 var app = express();
 var exphbs = require('express-handlebars');
+var cors = require('cors');
 
 var hbs = exphbs.create({
 	defaultLayout: publicPath + '/layouts/client/main',
@@ -101,7 +102,7 @@ app.use('/service-worker.js', function(req, res) {
 
 app.use('/', ico_router);
 app.use('/', api);
-app.use('/', router);
+app.use('/', cors(), router);
 
 app.use('/assets/js', function(req, res, next) {
     res.sendStatus(403);
diff --git a/server/routing/client/api.js b/server/routing/client/api.js
index 81020c70..59c1e56c 100644
--- a/server/routing/client/api.js
+++ b/server/routing/client/api.js
@@ -6,6 +6,7 @@ var ObjectId = mongojs.ObjectId;
 var token_db = mongojs("tokens");
 var cookieParser = require("cookie-parser");
 var cookies = require("cookie");
+var cors = require('cors');
 
 var toShowChannel = {
     start: 1,
@@ -88,7 +89,7 @@ var error = {
     }
 }
 
-router.use(function(req, res, next) {
+router.use('/api/', cors(), function(req, res, next) {
     next(); // make sure we go to the next routes and don't stop here
 });