Subscription permission

src/engine/action/Action.ts

@@ -56,7 +56,7 @@ export class Action {
   private _output: any;
   resolve: Function;
   type: string;
-  permissions: Function | Permission | Permission[];
+  permissions: Permission | Permission[];
   private _permissions: Function | Permission | Permission[];
   private _defaultPermissions: Permission | Permission[];
   descriptionPermissions: string | boolean;
@@ -252,7 +252,7 @@ export class Action {
     this._defaultPermissions = defaultPermissions;
   }
 
-  getPermissions(): Function | Permission | Permission[] {
+  getPermissions(): Permission | Permission[] {
     if ((!this._permissions && !this._defaultPermissions) || this.permissions) {
       return this.permissions;
     }

src/engine/helpers.ts

@@ -1,10 +1,10 @@
 import * as _ from 'lodash';
-import { Entity } from '..';
+import { Entity, Subscription } from '..';
 import { Mutation } from './mutation/Mutation';
 
 export const fillSystemAttributesDefaultValues = (
   entity: Entity,
-  entityMutation: Mutation,
+  operation: Mutation | Subscription,
   payload: any,
   context: Record<string, any>,
 ): any => {
@@ -22,7 +22,7 @@ export const fillSystemAttributesDefaultValues = (
     const attributeName = attribute.name;
     const defaultValue = attribute.defaultValue;
 
-    const value = defaultValue(ret, entityMutation, entity, context);
+    const value = defaultValue(ret, operation, entity, context);
     if (typeof value !== 'undefined') {
       ret[attributeName] = value;
     }

src/engine/permission/Permission.ts

@@ -499,8 +499,6 @@ export const buildUserAttributesPermissionFilter = ({
   if (permission.userAttributes.length > 0) {
     passOrThrow(userId, () => 'missing userId in permission object');
     where = {};
-    // where = where || {};
-    // where.$or = where.$or || [];
 
     permission.userAttributes.map(attributeName => {
       const userAttrFilter = {
@@ -533,8 +531,6 @@ export const buildStatesPermissionFilter = ({
   if (permission.states.length > 0) {
     passOrThrow(entity, () => 'missing entity in permission object');
     where = {};
-    // where = where || {};
-    // where.$or = where.$or || [];
 
     const states = entity.getStates();
     const stateIds = permission.states.map(stateName => {
@@ -573,8 +569,6 @@ export const buildValuesPermissionFilter = ({
 
   if (permission.values.length > 0) {
     where = {};
-    // where = where || {};
-    // where.$or = where.$or || [];
 
     permission.values.map(({ attributeName, value }) => {
       const filter = {
@@ -625,8 +619,6 @@ export const buildLookupsPermissionFilter = async ({
 
   if (permission.lookups.length > 0) {
     where = {};
-    // where = where || {};
-    // where.$or = where.$or || [];
 
     await Promise.all(
       permission.lookups.map(async ({ entity, lookupMap }) => {
@@ -812,10 +804,11 @@ export type ActionPermissionFilter = {
 };
 
 export const buildActionPermissionFilter = async (
-  _permissions: Permission | Permission[],
+  _permissions: Function | Permission | Permission[],
   userId = null,
   userRoles = [],
-  action: Action,
+  action: Action | Subscription,
+  // action: Action,
   input?: any,
   context?: any,
 ): Promise<
@@ -829,10 +822,22 @@ export const buildActionPermissionFilter = async (
     return undefined;
   }
 
-  // const permissions = isArray(_permissions) ? _permissions : [_permissions];
-  const permissions = isArray(_permissions as Permission[])
-    ? (_permissions as Permission[])
-    : ([_permissions] as Permission[]);
+  let permissions: Permission[];
+  if (isFunction(_permissions)) {
+    const permissionFn = _permissions as Function;
+    const permissionResult = permissionFn();
+    permissions = isArray(permissionResult)
+      ? permissionResult
+      : [permissionResult];
+  } else if (isArray(_permissions as Permission[])) {
+    permissions = _permissions as Permission[];
+  } else {
+    permissions = [_permissions] as Permission[];
+  }
+
+  // const permissions = isArray(_permissions as Permission[])
+  //   ? (_permissions as Permission[])
+  //   : ([_permissions] as Permission[]);
 
   let foundSimplePermission = false;
 
@@ -1036,6 +1041,18 @@ export const findEmptyEntityPermissions = (permissions): string[] => {
     });
   }
 
+  if (permissions.subscriptions) {
+    const subscriptionNames = Object.keys(permissions.subscriptions);
+    subscriptionNames.map(subscriptionName => {
+      if (
+        permissions.subscriptions[subscriptionName] &&
+        hasEmptyPermissions(permissions.subscriptions[subscriptionName])
+      ) {
+        emptyPermissionsIn.push(`subscriptions.${subscriptionName}`);
+      }
+    });
+  }
+
   return emptyPermissionsIn;
 };
 

src/engine/subscription/Subscription.spec.ts

@@ -375,8 +375,7 @@ describe('Subscription', () => {
                 .map(attribute => input[attribute])
                 .reduce((acc, curr) => `${acc + delimiter + curr}`, '');
 
-              const topic = `${entitySubscription.name}${_entity.name}${filled}`;
-              return topic;
+              return filled;
             }
 
             return null;