Trying to enable cors for api

This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-13 18:51:52 +01:00
parent d5376799cf
commit f566a19857
5 changed files with 34 additions and 2 deletions

16
package-lock.json generated
View File

@@ -419,6 +419,22 @@
"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" "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": { "crc": {
"version": "3.4.4", "version": "3.4.4",
"resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz", "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",

View File

@@ -34,6 +34,7 @@
"color-thief-jimp": "^2.0.2", "color-thief-jimp": "^2.0.2",
"cookie-parser": "^1.4.3", "cookie-parser": "^1.4.3",
"cookies": "^0.7.1", "cookies": "^0.7.1",
"cors": "^2.8.4",
"emoji-strip": "^0.0.3", "emoji-strip": "^0.0.3",
"express": "^4.15.2", "express": "^4.15.2",
"express-handlebars": "^3.0.0", "express-handlebars": "^3.0.0",

View File

@@ -5,6 +5,11 @@ var usual = [];
var settings = []; var settings = [];
db.getCollectionNames(function(err, docs) { 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++) { /*for(var i = 0; i < docs.length; i++) {
if(docs[i].indexOf("_settings") > -1) { if(docs[i].indexOf("_settings") > -1) {
settings.push(docs[0]); 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) { function addType(name) {
if(name.indexOf("_settings") > -1) { if(name.indexOf("_settings") > -1) {
db.collection(name).update({views: {$exists: true}}, {$set: { id: "config" }}, {multi: true}, function(err, doc) { db.collection(name).update({views: {$exists: true}}, {$set: { id: "config" }}, {multi: true}, function(err, doc) {

View File

@@ -19,6 +19,7 @@ var path = require('path');
var express = require('express'); var express = require('express');
var app = express(); var app = express();
var exphbs = require('express-handlebars'); var exphbs = require('express-handlebars');
var cors = require('cors');
var hbs = exphbs.create({ var hbs = exphbs.create({
defaultLayout: publicPath + '/layouts/client/main', defaultLayout: publicPath + '/layouts/client/main',
@@ -101,7 +102,7 @@ app.use('/service-worker.js', function(req, res) {
app.use('/', ico_router); app.use('/', ico_router);
app.use('/', api); app.use('/', api);
app.use('/', router); app.use('/', cors(), router);
app.use('/assets/js', function(req, res, next) { app.use('/assets/js', function(req, res, next) {
res.sendStatus(403); res.sendStatus(403);

View File

@@ -6,6 +6,7 @@ var ObjectId = mongojs.ObjectId;
var token_db = mongojs("tokens"); var token_db = mongojs("tokens");
var cookieParser = require("cookie-parser"); var cookieParser = require("cookie-parser");
var cookies = require("cookie"); var cookies = require("cookie");
var cors = require('cors');
var toShowChannel = { var toShowChannel = {
start: 1, 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 next(); // make sure we go to the next routes and don't stop here
}); });