@universis/janitor 2.4.0 → 2.4.2

package/dist/index.js

@@ -910,7 +910,27 @@ function validateClientScope() {
 
 function validateScope() {
   return (req, res, next) => {
-    return validateClientScope();
+    const validateClientScopeHandler = validateClientScope();
+    return validateClientScopeHandler(req, res, (err) => {
+      if (err) {
+        return next(err);
+      }
+      /**
+       * @type {ScopeAccessConfiguration}
+       */
+      let scopeAccessConfiguration = req.context.getApplication().getConfiguration().getStrategy(ScopeAccessConfiguration);
+      if (typeof scopeAccessConfiguration === 'undefined') {
+        return next(new Error('Invalid application configuration. Scope access configuration strategy is missing or is in accessible.'));
+      }
+      scopeAccessConfiguration.verify(req).then((value) => {
+        if (value) {
+          return next();
+        }
+        return next(new common.HttpForbiddenError('Access denied due to authorization scopes.'));
+      }).catch((reason) => {
+        return next(reason);
+      });
+    });
   };
 }
 
@@ -1811,11 +1831,11 @@ class NetworkRestrictAccess extends common.ApplicationService {
       index = model.eventListeners.length - 1;
     }
     let otherIndex = model.eventListeners.findIndex((listener) => {
-      return listener.type === path.resolve(__dirname, './OnAccountUpdate');
+      return listener.type === '@universis/janitor/listeners/OnAccountUpdate';
     });
     if (otherIndex < 0) {
       model.eventListeners.splice(index, 0, {
-        type: path.resolve(__dirname, './OnAccountUpdate')
+        type: '@universis/janitor/listeners/OnAccountUpdate'
       });
     }
     schemaLoader.setModelDefinition(model);