RHMAP-9815 make permission map accessible and bump fh-db

sedroche · Sep 13, 2016 · 1abb244 · 1abb244
1 parent 3f1f96d
commit 1abb244
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,5 @@ before_install:
   - sudo apt-get install --assume-yes apache2-utils
   - npm install -g [email protected]
   - npm install -g grunt-cli
+  - npm config set strict-ssl false
 install: npm install
diff --git 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
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "fh-mbaas-api",
-  "version": "5.13.11",
+  "version": "5.13.12",
   "description": "FeedHenry MBAAS Cloud APIs",
   "main": "lib/api.js",
   "dependencies": {
     "async": "0.2.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
@@ -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