diff --git a/.travis.yml b/.travis.yml index b5c1769..9f48f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,5 @@ before_install: - sudo apt-get install --assume-yes apache2-utils - npm install -g npm@2.13.5 - npm install -g grunt-cli + - npm config set strict-ssl false install: npm install diff --git a/lib/api.js b/lib/api.js index af37662..51c299d 100644 --- a/lib/api.js +++ b/lib/api.js @@ -47,6 +47,7 @@ function FHapi(cfg, logr) { sec: sec.security, auth: require('./auth')(cfg), host: require('./host'), + permission_map: require('fh-db').permission_map, hash: function (opts, callback) { var p = { act: 'hash', diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b29b705..a55a3ea 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "fh-mbaas-api", - "version": "5.13.11", + "version": "5.13.12", "dependencies": { "async": { "version": "0.2.9", @@ -23,9 +23,9 @@ "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz" }, "fh-db": { - "version": "1.2.1", - "from": "fh-db@1.2.1", - "resolved": "https://registry.npmjs.org/fh-db/-/fh-db-1.2.1.tgz", + "version": "1.2.2", + "from": "fh-db@1.2.2", + "resolved": "https://npm.skunkhenry.com/fh-db/-/fh-db-1.2.2.tgz", "dependencies": { "adm-zip": { "version": "0.4.7", @@ -568,9 +568,9 @@ } }, "fh-mbaas-express": { - "version": "5.6.1", - "from": "fh-mbaas-express@5.6.1", - "resolved": "https://registry.npmjs.org/fh-mbaas-express/-/fh-mbaas-express-5.6.1.tgz", + "version": "5.6.2", + "from": "fh-mbaas-express@5.6.2", + "resolved": "https://npm.skunkhenry.com/fh-mbaas-express/-/fh-mbaas-express-5.6.2.tgz", "dependencies": { "body-parser": { "version": "1.15.2", diff --git a/package.json b/package.json index 6784c2e..51ad663 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fh-mbaas-api", - "version": "5.13.11", + "version": "5.13.12", "description": "FeedHenry MBAAS Cloud APIs", "main": "lib/api.js", "dependencies": { @@ -8,9 +8,9 @@ "colors": "0.6.2", "cycle": "1.0.3", "eyes": "0.1.8", - "fh-db": "1.2.1", + "fh-db": "1.2.2", "fh-mbaas-client": "0.15.0", - "fh-mbaas-express": "5.6.1", + "fh-mbaas-express": "5.6.2", "fh-security": "0.2.0", "fh-statsc": "0.3.0", "lodash-contrib": "^393.0.1", diff --git a/sonar-project.properties b/sonar-project.properties index 461f669..3f0772e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ sonar.projectKey=fh-mbaas-api sonar.projectName=fh-mbaas-api-nightly-master -sonar.projectVersion=5.13.11 +sonar.projectVersion=5.13.12 sonar.sources=./lib sonar.tests=./test