Merge pull request #4 from fabrix-app/v1.1

scott-wyatt · web-flow · commit 38b90d687988 · 2018-08-03T14:20:53.000-04:00
[chore] extendable models
diff --git a/lib/api/models/Event.ts b/lib/api/models/Event.ts
@@ -25,7 +25,7 @@ export class Event extends Model {
     }
   }
 
-  static schema (app, Sequelize?) {
+  static schema (app, Sequelize?): {[key: string]: any} {
     return {
       // The Target Model or object
       object: {
diff --git a/lib/api/models/Permission.ts b/lib/api/models/Permission.ts
@@ -2,15 +2,15 @@ import { FabrixModel as Model } from '@fabrix/fabrix/dist/common'
 import { SequelizeResolver } from '@fabrix/spool-sequelize'
 
 export class Permission extends Model {
-  static config(app, Sequelize) {
+  static config(app, Sequelize): {[key: string]: any} {
     return {
       options: {
         underscored: true
       }
     }
   }
 
-  static schema(app, Sequelize) {
+  static schema(app, Sequelize): {[key: string]: any} {
     return {
       action: {
         type: Sequelize.STRING,
diff --git a/lib/api/models/Resource.ts b/lib/api/models/Resource.ts
@@ -2,7 +2,7 @@ import { FabrixModel as Model } from '@fabrix/fabrix/dist/common'
 import { SequelizeResolver } from '@fabrix/spool-sequelize'
 
 export class Resource extends Model {
-  public static config(app, Sequelize) {
+  public static config(app, Sequelize): {[key: string]: any} {
     return {
       // More information about supported models options here : http://docs.sequelizejs.com/en/latest/docs/models-definition/#configuration
       options: {
@@ -11,7 +11,7 @@ export class Resource extends Model {
     }
   }
 
-  public static schema(app, Sequelize) {
+  public static schema(app, Sequelize): {[key: string]: any} {
     return {
       type: {
         type: Sequelize.ENUM,
diff --git a/lib/api/models/Role.ts b/lib/api/models/Role.ts
@@ -2,15 +2,15 @@ import { FabrixModel as Model } from '@fabrix/fabrix/dist/common'
 import { SequelizeResolver } from '@fabrix/spool-sequelize'
 
 export class Role extends Model {
-  static config(app, Sequelize) {
+  static config(app, Sequelize): {[key: string]: any} {
     return {
       options: {
         underscored: true
       }
     }
   }
 
-  static schema(app, Sequelize) {
+  static schema(app, Sequelize): {[key: string]: any} {
     return {
       name: {
         type: Sequelize.STRING,
diff --git a/lib/api/models/User.ts b/lib/api/models/User.ts
@@ -1,11 +1,12 @@
-import { FabrixApp } from '@fabrix/fabrix'
 import {
   User as PassportUser,
   UserResolver as PassportUserResolver
 } from '@fabrix/spool-passport/dist/api/models/User'
 import { merge, defaultsDeep } from 'lodash'
 import { queryDefaults } from '../utils'
 
+import { Utils } from '@fabrix/spool-sequelize'
+
 export class UserResolver extends PassportUserResolver {
   findByIdDefault(criteria, options: {[key: string]: any} = {}) {
     options = merge(options, queryDefaults.User.default(this.app))
@@ -20,8 +21,8 @@ export class UserResolver extends PassportUserResolver {
 
 export class User extends PassportUser {
 
-  static config(app, Sequelize) {
-    return defaultsDeep({}, PassportUser.config(app, Sequelize), {
+  static config(app, Sequelize): {[key: string]: any} {
+    return Utils.mergeConfig(PassportUser.config(app, Sequelize), {
       options: {
         underscored: true,
         hooks: {
diff --git a/lib/api/models/UserItem.ts b/lib/api/models/UserItem.ts
@@ -7,15 +7,15 @@ import { SequelizeResolver } from '@fabrix/spool-sequelize'
  */
 export class UserItem extends Model {
 
-  static config (app, Sequelize) {
+  static config (app, Sequelize): {[key: string]: any} {
     return {
       options: {
         underscored: true
       }
     }
   }
 
-  static schema (app, Sequelize) {
+  static schema (app, Sequelize): {[key: string]: any} {
     return {
       // Record ID
       id: {
diff --git a/lib/api/models/UserRole.ts b/lib/api/models/UserRole.ts
@@ -7,15 +7,15 @@ import { SequelizeResolver } from '@fabrix/spool-sequelize'
  */
 export class UserRole extends Model {
 
-  static config (app, Sequelize) {
+  static config (app, Sequelize): {[key: string]: any} {
     return {
       options: {
         underscored: true
       }
     }
   }
 
-  static schema (app, Sequelize) {
+  static schema (app, Sequelize): {[key: string]: any} {
     return {
       id: {
         type: Sequelize.INTEGER,
diff --git a/lib/api/models/UserUpload.ts b/lib/api/models/UserUpload.ts
@@ -36,7 +36,7 @@ export class UserUploadResolver extends SequelizeResolver {
  */
 export class UserUpload extends Model {
 
-  static config (app, Sequelize) {
+  static config (app, Sequelize): {[key: string]: any} {
     return {
       // migrate: 'drop', // override default models configurations if needed
       // store: 'uploads',
@@ -46,7 +46,7 @@ export class UserUpload extends Model {
     }
   }
 
-  static schema (app, Sequelize) {
+  static schema (app, Sequelize): {[key: string]: any} {
     return {
       // Upload ID
       upload_id: {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-permissions",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Spool: Permissions (ACL) for Fabrix using Spool-Passport",
   "homepage": "https://fabrix.app",
   "author": {
@@ -40,7 +40,7 @@
     "test"
   ],
   "dependencies": {
-    "papaparse": "^4.3.6",
+    "papaparse": "^4.6.0",
     "joi": "^13.4.0",
     "multer": "^1.2.1",
     "shortid": "^2.2.12"
@@ -49,11 +49,11 @@
     "@fabrix/fabrix": "^1.1.3",
     "@fabrix/lint": "^1.0.0-alpha.3",
     "@fabrix/spool-email": "^1.1.0",
-    "@fabrix/spool-express": "^1.1.4",
+    "@fabrix/spool-express": "^1.1.5",
     "@fabrix/spool-i18n": "^1.1.0",
-    "@fabrix/spool-passport": "^1.1.5",
+    "@fabrix/spool-passport": "^1.1.6",
     "@fabrix/spool-router": "^1.1.3",
-    "@fabrix/spool-sequelize": "^1.1.4",
+    "@fabrix/spool-sequelize": "^1.1.8",
     "@fabrix/spool-tapestries": "^1.1.3",
     "@types/lodash": "^4.14.109",
     "@types/node": "~10.3.4",
@@ -74,12 +74,12 @@
   },
   "peerDependencies": {
     "@fabrix/fabrix": "^1.1.3",
-    "@fabrix/spool-express": "^1.1.4",
+    "@fabrix/spool-express": "^1.1.5",
     "@fabrix/spool-router": "^1.1.3",
     "@fabrix/spool-i18n": "^1.1.0",
-    "@fabrix/spool-sequelize": "^1.1.4",
+    "@fabrix/spool-sequelize": "^1.1.8",
     "@fabrix/spool-email": "^1.1.0",
-    "@fabrix/spool-passport": "^1.1.5"
+    "@fabrix/spool-passport": "^1.1.6"
   },
   "engines": {
     "node": ">= 7.6.0"
diff --git a/test/fixtures/app.js b/test/fixtures/app.js
@@ -179,6 +179,17 @@ const App = {
           }
         }
       },
+      '/success/all/permissions': {
+        'GET': 'TestController.success',
+        config: {
+          app: {
+            permissions: {
+              resource_name: 'successAllRoute',
+              roles: ['admin', 'registered', 'public']
+            }
+          }
+        }
+      },
       '/failure/public/permissions': {
         'GET': 'TestController.failure',
         config: {
diff --git a/test/integration/policies/CheckPermissions.test.js b/test/integration/policies/CheckPermissions.test.js
@@ -82,7 +82,7 @@ describe('CheckPermissions', () => {
         .set('Accept', 'application/json') //set header for this test
         .expect(200)
         .end((err, res) => {
-          assert.equal(res.body.length, 44)
+          assert.equal(res.body.length, 47)
           done(err)
         })
     })
@@ -107,6 +107,14 @@ describe('CheckPermissions', () => {
         })
     })
 
+    it('should allow to access Route with granted permissions for non logged users', done => {
+      request.get('/api/success/all/permissions')
+        .expect(200)
+        .end((err, res) => {
+          done(err)
+        })
+    })
+
     it('should not allow to access Route with no permissions for non logged users', done => {
       request.get('/api/failure/public/permissions')
         .set('Accept', 'application/json') //set header for this test

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class Event extends Model {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- static schema (app, Sequelize?) {`
	`28`	`+ static schema (app, Sequelize?): {[key: string]: any} {`
`29`	`29`	`return {`
`30`	`30`	`// The Target Model or object`
`31`	`31`	`object: {`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@ import { FabrixModel as Model } from '@fabrix/fabrix/dist/common'`
`2`	`2`	`import { SequelizeResolver } from '@fabrix/spool-sequelize'`
`3`	`3`
`4`	`4`	`export class Permission extends Model {`
`5`		`- static config(app, Sequelize) {`
	`5`	`+ static config(app, Sequelize): {[key: string]: any} {`
`6`	`6`	`return {`
`7`	`7`	`options: {`
`8`	`8`	`underscored: true`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`- static schema(app, Sequelize) {`
	`13`	`+ static schema(app, Sequelize): {[key: string]: any} {`
`14`	`14`	`return {`
`15`	`15`	`action: {`
`16`	`16`	`type: Sequelize.STRING,`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@ import { FabrixModel as Model } from '@fabrix/fabrix/dist/common'`
`2`	`2`	`import { SequelizeResolver } from '@fabrix/spool-sequelize'`
`3`	`3`
`4`	`4`	`export class Role extends Model {`
`5`		`- static config(app, Sequelize) {`
	`5`	`+ static config(app, Sequelize): {[key: string]: any} {`
`6`	`6`	`return {`
`7`	`7`	`options: {`
`8`	`8`	`underscored: true`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`- static schema(app, Sequelize) {`
	`13`	`+ static schema(app, Sequelize): {[key: string]: any} {`
`14`	`14`	`return {`
`15`	`15`	`name: {`
`16`	`16`	`type: Sequelize.STRING,`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@ import { SequelizeResolver } from '@fabrix/spool-sequelize'`
`7`	`7`	`*/`
`8`	`8`	`export class UserItem extends Model {`
`9`	`9`
`10`		`- static config (app, Sequelize) {`
	`10`	`+ static config (app, Sequelize): {[key: string]: any} {`
`11`	`11`	`return {`
`12`	`12`	`options: {`
`13`	`13`	`underscored: true`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- static schema (app, Sequelize) {`
	`18`	`+ static schema (app, Sequelize): {[key: string]: any} {`
`19`	`19`	`return {`
`20`	`20`	`// Record ID`
`21`	`21`	`id: {`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@ import { SequelizeResolver } from '@fabrix/spool-sequelize'`
`7`	`7`	`*/`
`8`	`8`	`export class UserRole extends Model {`
`9`	`9`
`10`		`- static config (app, Sequelize) {`
	`10`	`+ static config (app, Sequelize): {[key: string]: any} {`
`11`	`11`	`return {`
`12`	`12`	`options: {`
`13`	`13`	`underscored: true`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- static schema (app, Sequelize) {`
	`18`	`+ static schema (app, Sequelize): {[key: string]: any} {`
`19`	`19`	`return {`
`20`	`20`	`id: {`
`21`	`21`	`type: Sequelize.INTEGER,`