Skip to content
This repository has been archived by the owner on Feb 4, 2018. It is now read-only.

Enable cors on deploy and apps #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions conf/cors.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"origin": "*",
"optionsSuccessStatus": 200
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"brfs": "^1.4.3",
"browser-request": "^0.3.3",
"browserify": "^13.0.0",
"cors": "^2.8.1",
"date-and-time": "^0.3.0",
"dom-css": "^2.0.0",
"envify": "^3.4.1",
Expand Down
24 changes: 18 additions & 6 deletions scripts/postinstall.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
var fs = require('fs')
var path = require('path')

var fileName = 'web.conf'
var fileName1 = 'web.conf'
var fileName2 = 'cors.conf'

var binderDir = path.join(process.env['HOME'], '.binder')
var src = path.join(__dirname, '../conf/main.json')
var dst = path.join(binderDir, fileName)

var src1 = path.join(__dirname, '..', 'conf', 'main.json')
var dst1 = path.join(binderDir, fileName1)

var src2 = path.join(__dirname, '..', 'conf', 'cors.json')
var dst2 = path.join(binderDir, fileName2)

var dirExists = fs.existsSync(binderDir)
var fileExists = fs.existsSync(dst)
var fileExists1 = fs.existsSync(dst1)
var fileExists2 = fs.existsSync(dst2)

if (!dirExists) {
fs.mkdirSync(binderDir)
}
if (!fileExists) {
fs.createReadStream(src).pipe(fs.createWriteStream(dst))

if (!fileExists1) {
fs.createReadStream(src1).pipe(fs.createWriteStream(dst1))
}

if (!fileExists2) {
fs.createReadStream(src2).pipe(fs.createWriteStream(dst2))
}
5 changes: 5 additions & 0 deletions server/cors-settings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var path = require('path')
var fs = require('fs')

var contents = fs.readFileSync(path.join(process.env['HOME'], '.binder', 'cors.conf'), 'utf8')
module.exports = JSON.parse(contents)
9 changes: 7 additions & 2 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var expressWs = require('express-ws')
var bodyParser = require('body-parser')
var app = express()
var http = require('http').Server(app)
var cors = require('cors');
var io = require('socket.io')(http)
var assign = require('object-assign')
var merge = require('lodash.merge')
Expand All @@ -20,6 +21,10 @@ app.use('/js', express.static(path.join(__dirname, '../public/js')))
app.use('/css', express.static(path.join(__dirname, '../public/css')))
app.use('/assets', express.static(path.join(__dirname, '../public/assets')))

// CORS options

var launchCORSOptions = require('./cors-settings')

// set once the server is started
var binder = null

Expand Down Expand Up @@ -63,15 +68,15 @@ app.get('/validate/:name', function (req, res) {

// API endpoints

app.get('/api/deploy/:templateName', function (req, res) {
app.get('/api/deploy/:templateName', cors(launchCORSOptions), function (req, res) {
var name = req.params.templateName
binder.deployBinder(name, function (err, status) {
if (err) return res.status(500).end()
return res.json(status)
})
})

app.get('/api/apps/:templateName/:id', function (req, res) {
app.get('/api/apps/:templateName/:id', cors(launchCORSOptions), function (req, res) {
var name = req.params.templateName
var id = req.params.id
binder.getDeployStatus(name, id, function (err, status) {
Expand Down