Merge pull request strongloop#1301 from strongloop/feature/disable-in…

…clude-access-tokens

Upgrade test fixtures to 2.x project layouts

package.json

@@ -79,7 +79,7 @@
     "karma-mocha": "^0.1.10",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-script-launcher": "^0.1.0",
-    "loopback-boot": "^1.1.0",
+    "loopback-boot": "^2.7.0",
     "loopback-datasource-juggler": "^2.19.1",
     "loopback-testing": "^1.1.0",
     "mocha": "^2.1.0",

test/access-control.integration.js

@@ -4,7 +4,7 @@ var loopback = require('../');
 var lt = require('loopback-testing');
 var path = require('path');
 var ACCESS_CONTROL_APP = path.join(__dirname, 'fixtures', 'access-control');
-var app = require(path.join(ACCESS_CONTROL_APP, 'app.js'));
+var app = require(path.join(ACCESS_CONTROL_APP, 'server/server.js'));
 var assert = require('assert');
 var USER = {email: '[email protected]', password: 'test'};
 var CURRENT_USER = {email: '[email protected]', password: 'test'};

test/access-token.test.js

@@ -1,6 +1,8 @@
 var loopback = require('../');
 var extend = require('util')._extend;
 var Token = loopback.AccessToken.extend('MyToken');
+var ds = loopback.createDataSource({connector: loopback.Memory});
+Token.attachTo(ds);
 var ACL = loopback.ACL;
 
 describe('loopback.token(options)', function() {

test/fixtures/access-control/common/models/access-token.json

@@ -0,0 +1,19 @@
+{
+  "name": "accessToken",
+  "base": "AccessToken",
+  "baseUrl": "access-tokens",
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    },
+    {
+      "permission": "ALLOW",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "property": "create"
+    }
+  ]
+}

test/fixtures/access-control/common/models/account.json

@@ -0,0 +1,42 @@
+{
+  "name": "account",
+  "relations": {
+    "transactions": {
+      "model": "transaction",
+      "type": "hasMany"
+    },
+    "user": {
+      "model": "user",
+      "type": "belongsTo",
+      "foreignKey": "userId"
+    }
+  },
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    },
+    {
+      "accessType": "*",
+      "permission": "ALLOW",
+      "principalType": "ROLE",
+      "principalId": "$owner"
+    },
+    {
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$owner",
+      "property": "deleteById"
+    },
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "property": "find",
+      "principalType": "ROLE",
+      "principalId": "$dummy"
+    }
+  ],
+  "properties": {}
+}

test/fixtures/access-control/common/models/alert.json

@@ -0,0 +1,12 @@
+{
+  "name": "alert",
+  "acls": [
+    {
+      "accessType": "WRITE",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    }
+  ],
+  "properties": {}
+}

test/fixtures/access-control/common/models/bank.json

@@ -0,0 +1,28 @@
+{
+  "name": "bank",
+  "relations": {
+    "users": {
+      "model": "user",
+      "type": "hasMany"
+    },
+    "accounts": {
+      "model": "account",
+      "type": "hasMany"
+    }
+  },
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    },
+    {
+      "accessType": "READ",
+      "permission": "ALLOW",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    }
+  ],
+  "properties": {}
+}

test/fixtures/access-control/common/models/email.json

@@ -0,0 +1,12 @@
+{
+  "name": "email",
+  "base": "Email",
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    }
+  ]
+}

test/fixtures/access-control/common/models/transaction.json

@@ -0,0 +1,12 @@
+{
+  "name": "transaction",
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    }
+  ],
+  "properties": {}
+}

test/fixtures/access-control/common/models/user.json

@@ -0,0 +1,23 @@
+{
+  "name": "user",
+  "base": "User",
+  "relations": {
+    "accessTokens": {
+      "model": "accessToken",
+      "type": "hasMany",
+      "foreignKey": "userId"
+    },
+    "transactions": {
+      "model": "transaction",
+      "type": "hasMany"
+    }
+  },
+  "acls": [
+    {
+      "accessType": "*",
+      "permission": "DENY",
+      "principalType": "ROLE",
+      "principalId": "$everyone"
+    }
+  ]
+}

test/fixtures/access-control/server/config.json

@@ -0,0 +1,5 @@
+{
+  "port": 3000,
+  "host": "0.0.0.0",
+  "legacyExplorer": false
+}

test/fixtures/access-control/datasources.json → test/fixtures/access-control/server/datasources.json

@@ -1,10 +1,8 @@
 {
   "db": {
-    "defaultForType": "db",
     "connector": "memory"
   },
   "mail": {
-    "defaultForType": "mail",
     "connector": "mail"
   }
 }