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

[feat] use instance app

lib/api/models/User.ts

@@ -6,10 +6,6 @@ import {
 import { merge, defaultsDeep } from 'lodash'
 import { queryDefaults } from '../utils'
 
-export interface User {
-  resolveRoles(app: FabrixApp, options): any
-}
-
 export class UserResolver extends PassportUserResolver {
   findByIdDefault(criteria, options = {}) {
     options = merge(options, queryDefaults.User.default(this.app))
@@ -73,10 +69,17 @@ export class User extends PassportUser {
 
 }
 
-User.prototype.resolveRoles = function(app, options = {}) {
+export interface User {
+  resolveRoles(options): any
+}
+
+/**
+ *
+ */
+User.prototype.resolveRoles = function(options = {}) {
   if (
     this.roles
-    && this.roles.every(t => t instanceof app.models['Role'].resolver.sequelizeModel)
+    && this.roles.every(t => t instanceof this.app.models['Role'].instance)
     && options.reload !== true
   ) {
     return Promise.resolve(this)

lib/api/services/PermissionsService.ts

@@ -140,7 +140,7 @@ export class PermissionsService extends Service {
     return User.resolve(reqUser, { transaction: options.transaction || null })
       .then(user => {
         resUser = user
-        return resUser.resolveRoles(this.app, {transaction: options.transaction || null})
+        return resUser.resolveRoles({transaction: options.transaction || null})
       })
       .then(() => {
         return resUser.hasRole(roleName, {transaction: options.transaction || null})
@@ -169,7 +169,7 @@ export class PermissionsService extends Service {
     return User.resolve(reqUser, { transaction: options.transaction || null })
       .then(user => {
         resUser = user
-        return resUser.resolveRoles(this.app, {transaction: options.transaction || null})
+        return resUser.resolveRoles({transaction: options.transaction || null})
       })
       .then(() => {
         return resUser.hasRole(roleName, {transaction: options.transaction || null})
@@ -198,7 +198,7 @@ export class PermissionsService extends Service {
       return this.app.models['User'].resolve(req.user, {transaction: options.transaction || null})
         .then(user => {
           resUser = user
-          return resUser.resolveRoles(this.app, {transaction: options.transaction || null})
+          return resUser.resolveRoles({transaction: options.transaction || null})
         })
         .then(() => {
           return resUser.roles.map(r => r.name)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-permissions",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Spool: Permissions (ACL) for Fabrix using Spool-Passport",
   "homepage": "https://fabrix.app",
   "author": {
@@ -46,14 +46,14 @@
     "shortid": "^2.2.12"
   },
   "devDependencies": {
-    "@fabrix/fabrix": "^1.1.2",
+    "@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-i18n": "^1.1.0",
-    "@fabrix/spool-passport": "^1.1.4",
+    "@fabrix/spool-passport": "^1.1.5",
     "@fabrix/spool-router": "^1.1.3",
-    "@fabrix/spool-sequelize": "^1.1.1",
+    "@fabrix/spool-sequelize": "^1.1.4",
     "@fabrix/spool-tapestries": "^1.1.3",
     "@types/lodash": "^4.14.109",
     "@types/node": "~10.3.4",
@@ -73,13 +73,13 @@
     "typescript": "~2.8.1"
   },
   "peerDependencies": {
-    "@fabrix/fabrix": "^1.1.2",
+    "@fabrix/fabrix": "^1.1.3",
     "@fabrix/spool-express": "^1.1.4",
     "@fabrix/spool-router": "^1.1.3",
     "@fabrix/spool-i18n": "^1.1.0",
-    "@fabrix/spool-sequelize": "^1.1.1",
+    "@fabrix/spool-sequelize": "^1.1.4",
     "@fabrix/spool-email": "^1.1.0",
-    "@fabrix/spool-passport": "^1.1.4"
+    "@fabrix/spool-passport": "^1.1.5"
   },
   "engines": {
     "node": ">= 7.6.0"