[fix] additional cases

Author: scott-wyatt

lib/utils.ts

@@ -129,12 +129,20 @@ export const Utils = {
    * Get a Controller's method's policies
    */
   getControllerPolicy(app: FabrixApp, handler, routeMethod, pre = [ ]) {
+    const controller = Utils.getControllerFromHandler(handler)
+
     if (app.config.get('policies.*.*')) {
       pre = [...new Set([...pre, ...Utils.stringToArray(app.config.get('policies.*.*'))])]
     }
     if (app.config.get(`policies.*.${routeMethod}`)) {
       pre = [...new Set([...pre, ...Utils.stringToArray(app.config.get(`policies.*.${routeMethod}`))])]
     }
+    if (handler && controller && app.config.get(`policies.${controller}.*.*`)) {
+      pre = [...new Set([...pre, ...Utils.stringToArray(app.config.get(`policies.${controller}.*.*`))])]
+    }
+    if (handler && controller && app.config.get(`policies.${controller}.*.${routeMethod}`)) {
+      pre = [...new Set([...pre, ...Utils.stringToArray(app.config.get(`policies.${controller}.*.${routeMethod}`))])]
+    }
     if (handler && app.config.get(`policies.${handler}.${routeMethod}`)) {
       pre = [...new Set([...pre, ...Utils.stringToArray(app.config.get(`policies.${handler}.${routeMethod}`))])]
     }
@@ -172,6 +180,10 @@ export const Utils = {
     return get(app.controllers, handler)
   },
 
+  getControllerFromHandler(handler) {
+    return isString(handler) ? handler.split('.')[0] : handler
+  },
+
   /**
    * Get handler method from a controller.method string path
    */
@@ -221,20 +233,6 @@ export const Utils = {
     })
   },
 
-  // /**
-  //  *
-  //  */
-  // getControllerPolicyFromString(app: FabrixApp, handlerString: string) {
-  //   let pre = []
-  //   if (app.config.get('policies.*')) {
-  //     pre.push(Utils.policyStringToArray(app.config.get('policies.*')))
-  //   }
-  //   if (app.config.get(`policies.${handlerString}`)) {
-  //     pre = [...pre, ...Utils.policyStringToArray(app.config.get(`policies.${handlerString}`))]
-  //   }
-  //   return { pre: pre }
-  // },
-
   /**
    * Build a route collection
    */

test/fixtures/app.js

@@ -29,6 +29,9 @@ module.exports = {
       },
       FooGetPolicy: class FooGetPolicy extends Policy {
         foo () { }
+      },
+      FooWildCardPolicy: class FooWildCardPolicy extends Policy {
+        foo () { }
       }
     }
   },
@@ -52,6 +55,9 @@ module.exports = {
         'GET': ['GetPolicy.foo']
       },
       'TestController': {
+        '*': {
+          '*': ['FooWildCardPolicy.foo']
+        },
         'foo': {
           'GET': ['FooGetPolicy.foo']
         }

test/integration/lib/util.test.js

@@ -110,7 +110,8 @@ describe('lib.Util', () => {
       })
       assert.equal(route.GET.config.pre[0], global.app.policies.GlobalPolicy.foo)
       assert.equal(route.GET.config.pre[1], global.app.policies.GetPolicy.foo)
-      assert.equal(route.GET.config.pre[2], global.app.policies.FooGetPolicy.foo)
+      assert.equal(route.GET.config.pre[2], global.app.policies.FooWildCardPolicy.foo)
+      assert.equal(route.GET.config.pre[3], global.app.policies.FooGetPolicy.foo)
     })
   })
 })