add support for cors

Hacker0x01 · Jul 20, 2016 · f6ccc9e · f6ccc9e
1 parent 9eaf052
commit f6ccc9e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/bin/slackin b/bin/slackin
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-var pkg = require('./../package');
-var args = require('args');
-var slackin = require('./../dist').default;
+var pkg = require('./../package')
+var args = require('args')
+var slackin = require('./../dist').default
 
 args
   .option(['p', 'port'], 'Port to listen on [$PORT or 3000]', require('hostenv').PORT || process.env.PORT || 3000)
@@ -11,33 +11,34 @@ args
   .option(['i', 'interval'], 'How frequently (ms) to poll Slack [$SLACK_INTERVAL or 5000]', process.env.SLACK_INTERVAL || 5000)
   .option(['P', 'path'], 'Path to serve slackin under', '/')
   .option(['s', 'silent'], 'Do not print out warns or errors')
+  .option(['x', 'cors'], 'Enable CORS for all routes')
   .option(['C', 'coc'], 'Full URL to a CoC that needs to be agreed to')
   .option(['S', 'css'], 'Full URL to a custom CSS file to use on the main page')
-  .option(['?', 'help'], 'Show the usage information');
+  .option(['?', 'help'], 'Show the usage information')
 
 var flags = args.parse(process.argv, {
   value: '<team-id> <api-token>',
   help: false
-});
+})
 
-var org = args.sub[0] || process.env.SLACK_SUBDOMAIN;
-var token = args.sub[1] || process.env.SLACK_API_TOKEN;
+var org = args.sub[0] || process.env.SLACK_SUBDOMAIN
+var token = args.sub[1] || process.env.SLACK_API_TOKEN
 
 if (flags.help) {
-  args.showHelp();
+  args.showHelp()
 }
 
 if (!org || !token) {
-  args.showHelp();
+  args.showHelp()
 } else {
-  flags.org = org;
-  flags.token = token;
+  flags.org = org
+  flags.token = token
 }
 
-var port = flags.port;
-var hostname = flags.hostname;
+var port = flags.port
+var hostname = flags.hostname
 
-slackin(flags).listen(port, hostname, function(err){
-  if (err) throw err;
-  if (!flags.silent) console.log('%s – listening on %s:%d', new Date, hostname, port);
-});
+slackin(flags).listen(port, hostname, function (err) {
+  if (err) throw err
+  if (!flags.silent) console.log('%s – listening on %s:%d', new Date, hostname, port)
+})
diff --git a/lib/index.js b/lib/index.js
@@ -8,6 +8,7 @@ import { json } from 'body-parser'
 import { Server as http } from 'http'
 import remail from 'email-regex'
 import dom from 'vd'
+import cors from 'cors'
 
 // our code
 import Slack from './slack'
@@ -23,6 +24,7 @@ export default function slackin ({
   org,
   css,
   coc,
+  cors: useCors = false,
   path='/',
   channels,
   silent = false // jshint ignore:line,
@@ -43,7 +45,7 @@ export default function slackin ({
   // setup app
   let app = express()
   let srv = http(app)
-  srv.app = app;
+  srv.app = app
 
   let assets = __dirname + '/assets'
 
@@ -61,6 +63,10 @@ export default function slackin ({
     slack.once('ready', next)
   })
 
+  if (useCors) {
+    app.use(cors())
+  }
+
   // splash page
   app.get('/', (req, res) => {
     let { name, logo } = slack.org

diff --git a/package.json b/package.json
@@ -4,7 +4,10 @@
   "description": "Public Slack organizations made easy",
   "repository": "rauchg/slackin",
   "main": "dist/index",
-  "files": ["dist", "bin"],
+  "files": [
+    "dist",
+    "bin"
+  ],
   "babel": {
     "presets": [
       "es2015"
@@ -14,6 +17,7 @@
     "args": "1.3.0",
     "babel-polyfill": "6.3.14",
     "body-parser": "1.10.2",
+    "cors": "2.7.1",
     "debug": "2.1.1",
     "email-regex": "1.0.0",
     "express": "4.11.0",