Merge pull request #366 from dadi/feature/allow-options-on-token-route

feat: allow options request for token route
dadi · Dec 5, 2017 · f3fb920 · f3fb920
2 parents 54499f7 + 91a804a
commit f3fb920
Show file tree

Hide file tree

Showing 3 changed files with 406 additions and 406 deletions.
diff --git a/dadi/lib/auth/index.js b/dadi/lib/auth/index.js
@@ -165,7 +165,19 @@ module.exports = function (server) {
  var method = req.method && req.method.toLowerCase()
  if (method === 'post') {
  return tokens.generate(req, res, next)
+ } else if (method === 'options') {
+ res.statusCode = 200
+ res.setHeader('content-type', 'application/json')
+
+ if (config.get('cors') === true) {
+ res.setHeader('Access-Control-Allow-Origin', '*')
+ res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS')
+ res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization')
+ }
+
+ return res.end(JSON.stringify({}))
  }
+
  next()
  })
 }
diff --git a/dadi/lib/help.js b/dadi/lib/help.js
@@ -1,4 +1,3 @@
-var _ = require('underscore')
 var crypto = require('crypto')
 var formatError = require('@dadi/format-error')
 var fs = require('fs')
@@ -159,7 +158,7 @@ module.exports.transformQuery = function (obj, type, format) {
  }
 
  if (obj) {
- Object.keys(obj).forEach((key) => {
+ Object.keys(obj).forEach(key => {
  if ((typeof obj[key] === 'object') && (obj[key] !== null)) {
  this.transformQuery(obj[key], type)
  } else if (typeof obj[key] === 'string') {
@@ -233,7 +232,7 @@ module.exports.validateCollectionSchema = function (obj) {
  response.errors.push({section: 'settings', message: 'must be provided'})
  }
 
- if (!_.isEmpty(response.errors)) {
+ if (response.errors.length > 0) {
  response.success = false
  return response
  }
@@ -262,13 +261,13 @@ module.exports.validateCollectionSchema = function (obj) {
  if (!obj.settings.index) {
  indexSpecified = false
  } else {
- if (_.isArray(obj.settings.index)) {
- _.each(obj.settings.index, (index) => {
- if (_.contains(Object.keys(index.keys), obj.settings.sort)) {
+ if (Array.isArray(obj.settings.index)) {
+ obj.settings.index.forEach(index => {
+ if (Object.keys(index.keys).includes(obj.settings.sort)) {
  indexSpecified = true
  }
  })
- } else if (_.contains(Object.keys(obj.settings.index.keys), obj.settings.sort)) {
+ } else if (Object.keys(obj.settings.index.keys).includes(obj.settings.sort)) {
  indexSpecified = true
  }
  }
@@ -278,7 +277,7 @@ module.exports.validateCollectionSchema = function (obj) {
  }
  }
 
- response.success = _.isEmpty(response.errors)
+ response.success = response.errors.length === 0
 
  return response
 }