From 1abb2449ca569a4d7471494b91a81a3f715c1808 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Tue, 13 Sep 2016 10:28:26 +0200 Subject: [PATCH 1/2] RHMAP-9815 make permission map accessible and bump fh-db --- .travis.yml | 1 + lib/api.js | 1 + npm-shrinkwrap.json | 14 +++++++------- package.json | 6 +++--- sonar-project.properties | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) 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 From 91c123ee11620a4584cb3f5f04d482dfcbcc4021 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Mon, 19 Sep 2016 21:34:25 +0100 Subject: [PATCH 2/2] update dependency --- npm-shrinkwrap.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a55a3ea..10b4e96 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -25,7 +25,7 @@ "fh-db": { "version": "1.2.2", "from": "fh-db@1.2.2", - "resolved": "https://npm.skunkhenry.com/fh-db/-/fh-db-1.2.2.tgz", + "resolved": "https://registry.npmjs.org/fh-db/-/fh-db-1.2.2.tgz", "dependencies": { "adm-zip": { "version": "0.4.7", @@ -136,7 +136,7 @@ }, "lodash": { "version": "4.15.0", - "from": "lodash@>=4.8.0 <5.0.0", + "from": "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz" }, "readable-stream": { @@ -570,7 +570,7 @@ "fh-mbaas-express": { "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", + "resolved": "https://registry.npmjs.org/fh-mbaas-express/-/fh-mbaas-express-5.6.2.tgz", "dependencies": { "body-parser": { "version": "1.15.2", @@ -1252,9 +1252,9 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "inherits": { - "version": "2.0.1", + "version": "2.0.3", "from": "inherits@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" }, "isarray": { "version": "1.0.0", @@ -1318,9 +1318,9 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz", "dependencies": { "lodash": { - "version": "4.15.0", + "version": "4.16.0", "from": "lodash@>=4.8.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.0.tgz" } } } @@ -1390,9 +1390,9 @@ } }, "is-my-json-valid": { - "version": "2.13.1", + "version": "2.14.0", "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -1475,9 +1475,9 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" }, "jsprim": { - "version": "1.3.0", + "version": "1.3.1", "from": "jsprim@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz", "dependencies": { "extsprintf": { "version": "1.0.2", @@ -1485,9 +1485,9 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" }, "json-schema": { - "version": "0.2.2", - "from": "json-schema@0.2.2", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" + "version": "0.2.3", + "from": "json-schema@0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" }, "verror": { "version": "1.3.6", @@ -1573,14 +1573,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { - "version": "2.1.11", + "version": "2.1.12", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz", "dependencies": { "mime-db": { - "version": "1.23.0", - "from": "mime-db@>=1.23.0 <1.24.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.24.0", + "from": "mime-db@>=1.24.0 <1.25.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz" } } },