@izara_project/izara-core-generate-service-code 1.0.86 → 1.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.86",
+  "version": "1.0.87",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -95,12 +95,12 @@ function _extractDynamoTableNames({
     }
   }
   if (rbac) {
+    dynamoTableNames.add('Roles');
     dynamoTableNames.add('TargetRoles');
     dynamoTableNames.add('RolePermissions');
     dynamoTableNames.add('RoleUsers');
     dynamoTableNames.add('UserRoles');
     dynamoTableNames.add('RbacPermissionCaches');
-    dynamoTableNames.add('RoleLimit');
     dynamoTableNames.add('RunningTotalUsage');
     dynamoTableNames.add('RunningTotalReservedUsage');
   }

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -66,12 +66,12 @@ const externalServices = {
     }
   });
   if (typeof rbac !== 'undefined' && rbac) {
+    dynamoTableNames.add('Roles');
     dynamoTableNames.add('TargetRoles');
     dynamoTableNames.add('RolePermissions');
     dynamoTableNames.add('RoleUsers');
     dynamoTableNames.add('UserRoles');
     dynamoTableNames.add('RbacPermissionCaches');
-    dynamoTableNames.add('RoleLimit');
     dynamoTableNames.add('RunningTotalUsage');
     dynamoTableNames.add('RunningTotalReservedUsage');
   }
@@ -182,20 +182,6 @@ const tableConfigs = {
   const currentServiceTag = (typeof serviceTag !== 'undefined' && serviceTag) ? serviceTag : ((typeof project !== 'undefined' && project?.serviceTag) ? project.serviceTag : '');
   const rbacSubs = [];
   if (crud && rbac) {
-    const allRbacTags = Array.from(new Set([
-      'Rbac',
-      currentServiceTag,
-      ...(typeof rbacValidatorServiceTags !== 'undefined' && rbacValidatorServiceTags ? rbacValidatorServiceTags : [])
-    ])).filter(Boolean);
-    const hasGraph = typeof objectGraphServiceTags !== 'undefined' && objectGraphServiceTags && objectGraphServiceTags.length > 0;
-    const createEndpoint = hasGraph ? 'CreateRbacCallbackHdrSqs' : 'CreateCompleteHdrSqs';
-    const updateEndpoint = hasGraph ? 'UpdateRbacCallbackHdrSqs' : 'UpdateCompleteHdrSqs';
-    const deleteEndpoint = hasGraph ? 'DeleteRbacCallbackHdrSqs' : 'DeleteCompleteHdrSqs';
-    allRbacTags.forEach(function(tag) {
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: createEndpoint });
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: updateEndpoint });
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: deleteEndpoint });
-    });
     if (typeof hasQuotaReservation !== 'undefined' && hasQuotaReservation) {
       rbacSubs.push({ serviceTag: 'Rbac', topicName: 'ConfirmUsage_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
       rbacSubs.push({ serviceTag: 'Rbac', topicName: 'CancelUsage_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
@@ -318,6 +304,17 @@ function roleConfigs() {
 <% }); -%>
 <% } -%>
 <% if (rbac || (rbacValidatorServiceTags && rbacValidatorServiceTags.length > 0)) { -%>
+        {
+          Sid: 'FlowObjectsInvokeValidatorRbac',
+          Effect: 'Allow',
+          Action: ['lambda:InvokeFunction'],
+          Resource: [
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', 'Rbac')}`<% if (rbac) { %>,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv')}`<% } %><% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', '<%= tag %>')}`<% }); %>
+          ]
+        },
+
         {
           Sid: 'FlowObjectsPublishValidatorRbacTopics',
           Effect: 'Allow',
@@ -340,6 +337,16 @@ function roleConfigs() {
     {
       roleName: 'FlowRbac',
       statement: [
+        {
+          Sid: 'FlowRbacInvokeValidatorRbac',
+          Effect: 'Allow',
+          Action: ['lambda:InvokeFunction'],
+          Resource: [
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', 'Rbac')}`<% if (rbac) { %>,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv')}`<% } %><% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', '<%= tag %>')}`<% }); %>
+          ]
+        },
         {
           Sid: 'FlowRbacPublishValidatorRbacTopics',
           Effect: 'Allow',

package/src/emit/crud/crudActionPlan.js

@@ -32,7 +32,7 @@ export function createCrudActionPlan(
     hasRbac: actionHasRbac,
     hasQuotaReservation,
     hasComplete: outputTopic && (actionHasRbac || hasGraph),
-    hasRbacCallback: outputTopic && actionHasRbac && hasGraph,
+    hasRbacCallback: false,
     hasCreateNodeCallback:
       outputTopic && action === 'Create' && actionHasRbac && hasGraph && hasQuotaReservation
   };

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -73,16 +73,17 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
       }
     );
   } else if (plan.hasComplete) {
+    const nextStepName = plan.hasCreateNodeCallback ? 'CreateNodeCallback' : 'Complete';
     startNextSteps.push({
       targetType: 'ownTopic',
-      stepName: 'Complete'
+      stepName: nextStepName
     });
     if (plan.hasGraph) {
       startNextSteps.push({
         targetType: 'extTopic',
         serviceTag: 'GraphHandler',
         topicName: `${action}Node_In`,
-        toStepNames: ['Complete']
+        toStepNames: [nextStepName]
       });
     }
   }
@@ -143,19 +144,20 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
   }
 
   if (plan.hasCreateNodeCallback) {
+    const prevStepName = plan.hasRbacCallback ? 'RbacCallback' : 'Start';
     flowSteps.push({
       stepName: 'CreateNodeCallback',
       event: ['extTopic'],
       previousSteps: [
         {
           sourceType: 'ownTopic',
-          stepName: 'RbacCallback'
+          stepName: prevStepName
         },
         {
           sourceType: 'extTopic',
           serviceTag: 'GraphHandler',
           topicName: 'CreateNode_Out',
-          fromStepNames: ['RbacCallback']
+          fromStepNames: [prevStepName]
         }
       ],
       nextSteps: [

package/src/emit/crud/templates/CreateEndpoint_Main.ejs

@@ -381,11 +381,12 @@ export default async function <%- flowTag %>(
         },
         parameterGroups,
         {
+          targetIdentifiers,
           rbacObjType: {
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
+          sync: true
         }
       );
 
@@ -394,10 +395,18 @@ export default async function <%- flowTag %>(
         resultPermissionCheck
       );
 
+      if (resultPermissionCheck && resultPermissionCheck.permission !== true) {
+        errorsFound.push('Permission denied');
+        return await <%- flowTag %>LogicalLib(
+          _izContext,
+          requestParams,
+          callingFlowConfig,
+          errorsFound
+        );
+      }
+
       //(<rbacPublish_<%- flowTag %>)
       //(</rbacPublish_<%- flowTag %>)
-
-      return resultPermissionCheck;
     }
     <%_ } _%>
 

package/src/emit/crud/templates/CreateLogicalLib.ejs

@@ -385,21 +385,51 @@ export async function autoProvisionOwnerTargetRole(_izContext, { node, submitted
     }
 
     const identifiers = node.objInstanceFull.identifiers;
-    const targetIdentKeys = Object.entries(identifiers)
-      .filter(([k]) => k !== 'submittedByUserId')
-      .map(([k, v]) => `${k}#${v}`)
-      .join('|');
-
-    const targetIdentifiersConcat =
-      targetIdentKeys ||
-      (identifiers[Object.keys(identifiers)[0]]
-        ? `${Object.keys(identifiers)[0]}#${identifiers[Object.keys(identifiers)[0]]}`
-        : '');
+    const sortedKeys = Object.keys(identifiers)
+      .filter(
+        (k) =>
+          k !== 'submittedByUserId' &&
+          k !== 'identifierConcat' &&
+          k !== 'identifiersConcat'
+      )
+      .sort();
+    const parts = [];
+    for (const key of sortedKeys) {
+      const value = identifiers[key];
+      if (value !== undefined && value !== null) {
+        parts.push(`${key}#${value}`);
+      }
+    }
+    const targetIdentifiersConcat = parts.join('|');
 
     if (!targetIdentifiersConcat) {
       return;
     }
 
+    const targetPlanTier =
+      node?.objInstanceFull?.planTier ||
+      node?.objInstanceFull?.targetIdentifiers?.planTier ||
+      'tier-free';
+    let planTierName = 'Free Plan';
+    if (targetPlanTier === 'tier-pro') {
+      planTierName = 'Professional Plan';
+    } else if (targetPlanTier === 'tier-enterprise') {
+      planTierName = 'Enterprise Plan';
+    }
+
+    await dynamodbSharedLib.putItem(
+      _izContext,
+      dynamodbSharedLib.tableName(_izContext, 'TargetRoles'),
+      {
+        identifiersConcat: targetIdentifiersConcat,
+        roleIdKey: targetPlanTier,
+        roleType: 'plan_tier',
+        roleName: planTierName,
+        submittedByUserId,
+        createdAt: new Date().toISOString()
+      }
+    );
+
     const roleIdKey = `${targetIdentifiersConcat}_owner`;
     _izContext.logger.debug(
       '[CreateNodeCallback] Auto-provisioning owner TargetRole:',
@@ -417,8 +447,9 @@ export async function autoProvisionOwnerTargetRole(_izContext, { node, submitted
       {
         identifiersConcat: targetIdentifiersConcat,
         roleIdKey,
+        roleType: 'tenant_role',
+        roleName: 'Owner',
         submittedByUserId,
-        roleName: 'owner',
         assignedAt: new Date().toISOString()
       }
     );
@@ -816,16 +847,49 @@ export async function autoProvisionOwnerTargetRoleForDynamoOnly(
       _izContext.correlationIds?.get(coreConsts.SUBMITTED_BY_USER_ID);
 
     if (submittedByUserId) {
-      const targetIdentKeys = Object.entries(identifiersForCreateData)
-        .map(([k, v]) => `${k}#${v}`)
-        .join('|');
-      const targetIdentifiersConcat =
-        targetIdentKeys ||
-        (identifiersForCreateData[Object.keys(identifiersForCreateData)[0]]
-          ? `${Object.keys(identifiersForCreateData)[0]}#${identifiersForCreateData[Object.keys(identifiersForCreateData)[0]]}`
-          : '');
+      const sortedKeys = Object.keys(identifiersForCreateData)
+        .filter(
+          (k) =>
+            k !== 'submittedByUserId' &&
+            k !== 'identifierConcat' &&
+            k !== 'identifiersConcat'
+        )
+        .sort();
+      const parts = [];
+      for (const key of sortedKeys) {
+        const value = identifiersForCreateData[key];
+        if (value !== undefined && value !== null) {
+          parts.push(`${key}#${value}`);
+        }
+      }
+      const targetIdentifiersConcat = parts.join('|');
 
       if (targetIdentifiersConcat) {
+        const targetPlanTier =
+          actionData?.planTier ||
+          requestParams?.planTier ||
+          requestParams?.passBackProperties?.planTier ||
+          'tier-free';
+        let planTierName = 'Free Plan';
+        if (targetPlanTier === 'tier-pro') {
+          planTierName = 'Professional Plan';
+        } else if (targetPlanTier === 'tier-enterprise') {
+          planTierName = 'Enterprise Plan';
+        }
+
+        await dynamodbSharedLib.putItem(
+          _izContext,
+          dynamodbSharedLib.tableName(_izContext, 'TargetRoles'),
+          {
+            identifiersConcat: targetIdentifiersConcat,
+            roleIdKey: targetPlanTier,
+            roleType: 'plan_tier',
+            roleName: planTierName,
+            submittedByUserId,
+            createdAt: new Date().toISOString()
+          }
+        );
+
         const roleIdKey = `${targetIdentifiersConcat}_owner`;
         _izContext.logger.debug(
           '[<%- flowTag %>LogicalLib] Auto-provisioning owner TargetRole for DynamoDB-only:',
@@ -843,8 +907,9 @@ export async function autoProvisionOwnerTargetRoleForDynamoOnly(
           {
             identifiersConcat: targetIdentifiersConcat,
             roleIdKey,
+            roleType: 'tenant_role',
+            roleName: 'Owner',
             submittedByUserId,
-            roleName: 'owner',
             assignedAt: new Date().toISOString()
           }
         );

package/src/emit/crud/templates/DeleteEndpoint_Main.ejs

@@ -200,7 +200,8 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
+          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>',
+          sync: true
         }
       );
 
@@ -209,10 +210,18 @@ export default async function <%- flowTag %>(
         resultPermissionCheck
       );
 
+      if (resultPermissionCheck && resultPermissionCheck.permission !== true) {
+        errorsFound.push('Permission denied');
+        return await <%- flowTag %>LogicalLib(
+          _izContext,
+          requestParams,
+          callingFlowConfig,
+          errorsFound
+        );
+      }
+
       //(<rbacPublish_<%- flowTag %>)
       //(</rbacPublish_<%- flowTag %>)
-
-      return resultPermissionCheck;
     }
     <%_ } _%>
 

package/src/emit/crud/templates/UpdateEndpoint_Main.ejs

@@ -218,7 +218,8 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
+          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>',
+          sync: true
         }
       );
 
@@ -227,10 +228,18 @@ export default async function <%- flowTag %>(
         resultPermissionCheck
       );
 
+      if (resultPermissionCheck && resultPermissionCheck.permission !== true) {
+        errorsFound.push('Permission denied');
+        return await <%- flowTag %>LogicalLib(
+          _izContext,
+          requestParams,
+          callingFlowConfig,
+          errorsFound
+        );
+      }
+
       //(<rbacPublish_<%- flowTag %>)
       //(</rbacPublish_<%- flowTag %>)
-
-      return resultPermissionCheck;
     }
     <%_ } _%>
 

package/src/emit/function/functionYamlArtifact.js

@@ -319,8 +319,10 @@ function _sqsFilterPatterns(
           - body:
               MessageAttributes:
                 callingFlow:
-                  Value:
-                    - exists: false
+                  - exists: false
+          - body:
+              MessageAttributes:
+                - exists: false
         #<#/${hookFunctionName}FilterPatterns#>
 `;
 }

package/src/emit/rbac/emitDynamicRbacFlowSchemas.js

@@ -18,9 +18,6 @@ const RBAC_CORE_FLOW_DEFINITIONS = [
 ];
 
 const LIMIT_FLOW_DEFINITIONS = [
-  { flowTag: 'CreateRoleLimit', event: ['ownTopic'] },
-  { flowTag: 'ListRoleLimits', event: ['lambdaSyncApi'] },
-  { flowTag: 'DeleteRoleLimit', event: ['ownTopic'] },
   { flowTag: 'ReservedDynamicUsage', event: ['ownTopic'] },
   { flowTag: 'ConfirmUsage', event: ['ownTopic'] },
   { flowTag: 'CancelUsage', event: ['ownTopic'] }

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -52,11 +52,7 @@ export async function emitRbacApplicationArtifacts(objects) {
 
   const limitHandlers = await Promise.all(
     hasSelfRbac
-      ? [
-          ...LIMIT_LIST_DEFINITIONS.map(createLimitListHandler),
-          ...LIMIT_MUTATION_DEFINITIONS.map(createLimitMutationHandler),
-          ...ACCOUNT_LIMIT_HANDLERS.map(createAccountLimitHandler)
-        ]
+      ? ACCOUNT_LIMIT_HANDLERS.map(createAccountLimitHandler)
       : []
   );
 
@@ -104,14 +100,6 @@ const LIST_DEFINITIONS = [
   }
 ];
 
-const LIMIT_LIST_DEFINITIONS = [
-  {
-    flowTag: 'ListRoleLimits',
-    tableName: 'RoleLimit',
-    requestProperty: 'roleLimitId'
-  }
-];
-
 const MUTATION_DEFINITIONS = [
   {
     flowTag: 'CreateRolePermissions',
@@ -127,21 +115,6 @@ const MUTATION_DEFINITIONS = [
   }
 ];
 
-const LIMIT_MUTATION_DEFINITIONS = [
-  {
-    flowTag: 'CreateRoleLimit',
-    tableName: 'RoleLimit',
-    method: 'putItem',
-    fields: ['roleLimitId', 'limitType', 'limitValue', 'actionType']
-  },
-  {
-    flowTag: 'DeleteRoleLimit',
-    tableName: 'RoleLimit',
-    method: 'deleteItem',
-    fields: ['roleLimitId', 'limitType']
-  }
-];
-
 const USER_ROLE_MUTATIONS = [
   { flowTag: 'CreateUserRole', operation: 'Put' },
   { flowTag: 'DeleteUserFromRole', operation: 'Delete' }
@@ -197,17 +170,6 @@ const STATIC_RBAC_APPLICATION_PATHS = [
 ];
 
 const STATIC_LIMIT_APPLICATION_PATHS = [
-  ...LIMIT_LIST_DEFINITIONS.flatMap(({ flowTag }) => [
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi.js`
-  ]),
-  ...LIMIT_MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_WbsMain.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrWbs.js`
-  ]),
   ...ACCOUNT_LIMIT_HANDLERS.flatMap((flowTag) => [
     `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
     `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
@@ -274,83 +236,6 @@ async function createAccountLimitHandler(flowTag) {
   };
 }
 
-async function createLimitListHandler(definition) {
-  const sourcePath = `app/src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const handlerPath = `src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  return {
-    artifacts: [
-      {
-        path: `${sourcePath}/${definition.flowTag}_Main.js`,
-        content: await renderRbacTemplate('ListRbac_Main.ejs', {
-          ...definition,
-          useContextUserId: definition.useContextUserId ?? false
-        })
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrSqs.js`,
-        content: await renderRbacTemplate('ListRbac_HdrSqs.ejs', definition)
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrApi.js`,
-        content: await renderRbacTemplate('ListRbac_HdrApi.ejs', definition)
-      }
-    ],
-    functions: [
-      {
-        type: 'sqs',
-        functionName: `${definition.flowTag}HdrSqs`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrSqs.main`,
-        roleName: 'FlowRbacRole',
-        queueName: `${definition.flowTag}HdrSqs`,
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      },
-      {
-        type: 'api',
-        functionName: `${definition.flowTag}HdrApi`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrApi.main`,
-        roleName: 'FlowRbacRole',
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      }
-    ]
-  };
-}
-
-async function createLimitMutationHandler(definition) {
-  const sourcePath = `app/src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const handlerPath = `src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const webSocket = await createWebSocketEntry(
-    definition.flowTag,
-    sourcePath,
-    handlerPath
-  );
-  return {
-    artifacts: [
-      {
-        path: `${sourcePath}/${definition.flowTag}_Main.js`,
-        content: await renderRbacTemplate('RbacMutation_Main.ejs', definition)
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrSqs.js`,
-        content: await renderRbacTemplate('ListRbac_HdrSqs.ejs', definition)
-      },
-      ...webSocket.artifacts
-    ],
-    functions: [
-      {
-        type: 'sqs',
-        functionName: `${definition.flowTag}HdrSqs`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrSqs.main`,
-        roleName: 'FlowRbacRole',
-        queueName: `${definition.flowTag}HdrSqs`,
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      },
-      ...webSocket.functions
-    ]
-  };
-}
 
 async function createCustomRbacOwnTopicHandler(flowTag, mainTemplateName) {
   const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;

package/src/emit/rbac/templates/CancelUsage_Main.ejs

@@ -39,21 +39,25 @@ export default async function CancelUsage(_izContext, requestParams) {
       requestParams?.limitTag;
 
     const targetIdentifiers = requestParams?.targetIdentifiers;
-    let identifiersConcat = requestParams?.identifiersConcat;
+    let identifiersConcat =
+      requestParams?.identifiersConcat || requestParams?.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }

package/src/emit/rbac/templates/ConfirmUsage_Main.ejs

@@ -39,21 +39,25 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       requestParams?.limitTag;
 
     const targetIdentifiers = requestParams?.targetIdentifiers;
-    let identifiersConcat = requestParams?.identifiersConcat;
+    let identifiersConcat =
+      requestParams?.identifiersConcat || requestParams?.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }