Merge branch 'release/1.8.1' into production

docs.json

@@ -2,9 +2,7 @@
   "title": "LoopBack Documentation",
   "content": [
     "lib/application.js",
-    {"title": "LoopBack", "depth": 3},
     "lib/loopback.js",
-    {"title": "Middleware", "depth": 3},
     "lib/middleware/token.js",
     "lib/models/access-token.js",
     "lib/models/access-context.js",

lib/models/access-context.js

@@ -7,6 +7,7 @@ var debug = require('debug')('loopback:security:access-context');
  * resources
  *
  * @class
+ * @options {Object} context The context object
  * @property {Principal[]} principals An array of principals
  * @property {Function} model The model class
  * @property {String} modelName The model name
@@ -16,7 +17,6 @@ var debug = require('debug')('loopback:security:access-context');
  * @property {String} accessType The access type
  * @property {AccessToken} accessToken The access token
  *
- * @param {Object} context The context object
  * @returns {AccessContext}
  * @constructor
  */

lib/models/acl.js

@@ -356,7 +356,7 @@ ACL.prototype.debug = function() {
  * @property {String} accessType The access type
  * @param {Function} callback
  */
-ACL.checkAccess = function (context, callback) {
+ACL.checkAccessForContext = function (context, callback) {
   if(!(context instanceof AccessContext)) {
     context = new AccessContext(context);
   }
@@ -422,7 +422,7 @@ ACL.checkAccess = function (context, callback) {
       if(resolved && resolved.permission === ACL.DEFAULT) {
         resolved.permission = (model && model.settings.defaultPermission) || ACL.ALLOW;
       }
-      debug('checkAccess() returns: %j', resolved);
+      debug('checkAccessForContext() returns: %j', resolved);
       callback && callback(null, resolved);
     });
   });
@@ -455,7 +455,7 @@ ACL.checkAccessForToken = function (token, model, modelId, method, callback) {
 
   context.debug();
 
-  this.checkAccess(context, function (err, access) {
+  this.checkAccessForContext(context, function (err, access) {
     if (err) {
       callback && callback(err);
       return;

package.json

@@ -9,7 +9,7 @@
     "Platform",
     "mBaaS"
   ],
-  "version": "1.8.0",
+  "version": "1.8.1",
   "scripts": {
     "test": "mocha -R spec"
   },

test/acl.test.js

@@ -268,7 +268,7 @@ describe('security ACLs', function () {
 
               log('ACL 2: ', acl.toObject());
 
-              ACL.checkAccess({
+              ACL.checkAccessForContext({
                 principals: [
                   {type: ACL.USER, id: userId}
                 ],
@@ -279,7 +279,7 @@ describe('security ACLs', function () {
                 assert(!err && access.permission === ACL.ALLOW);
               });
 
-              ACL.checkAccess({
+              ACL.checkAccessForContext({
                 principals: [
                   {type: ACL.ROLE, id: Role.EVERYONE}
                 ],