@izara_project/izara-core-generate-service-code 1.0.94 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.94",
+  "version": "1.0.95",
   "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

@@ -1,7 +1,7 @@
 import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
-import { customFlowNextSteps, flowHasRbac, upperFirst } from '../custom/customFlows.js';
+import { customFlowNextSteps } from '../custom/customFlows.js';
 import { createCrudActionPlans } from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
@@ -217,29 +217,6 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     (objects || []).filter(o => o.belongTo?.serviceTag && o.belongTo.serviceTag !== 'Rbac').map(o => o.belongTo.serviceTag)
   )).sort();
 
-  const customRbacFlows = (flows || []).filter((f) => flowHasRbac(f, objects));
-  const customRbacFlowTags = customRbacFlows.map((f) => f.flowTag);
-  const customRbacFlowsWithTags = customRbacFlows.map((f) => {
-    const roleName = upperFirst(f.flowTag);
-    const matched = objects.find((o) => o.objectType === f.objType?.objectType);
-    const targetServiceTags = [];
-    const belongTo = matched?.belongTo;
-    if (belongTo) {
-      if (Array.isArray(belongTo)) {
-        for (const b of belongTo) {
-          if (b?.serviceTag) targetServiceTags.push(b.serviceTag);
-        }
-      } else if (belongTo.serviceTag) {
-        targetServiceTags.push(belongTo.serviceTag);
-      }
-    }
-    return {
-      roleName,
-      flowTag: f.flowTag,
-      targetServiceTags: Array.from(new Set(targetServiceTags))
-    };
-  });
-
   const crudPlans = createCrudActionPlans(objects);
   const hasQuotaReservation = crudPlans?.Create?.hasQuotaReservation ?? false;
 
@@ -250,8 +227,6 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     relationships,
     flows,
     customFlowNextSteps: customFlowNextSteps(flows),
-    customRbacFlowTags,
-    customRbacFlowsWithTags,
     objectGraphServiceTags,
     relationshipGraphServiceTags,
     crud,

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

@@ -178,23 +178,6 @@ const tableConfigs = {
       }
     });
   });
-
-  const currentServiceTag = (typeof serviceTag !== 'undefined' && serviceTag) ? serviceTag : ((typeof project !== 'undefined' && project?.serviceTag) ? project.serviceTag : '');
-  const rbacSubs = [];
-
-  if (typeof customRbacFlowTags !== 'undefined' && customRbacFlowTags && customRbacFlowTags.length > 0) {
-    const allRbacTags = Array.from(new Set([
-      'Rbac',
-      currentServiceTag,
-      ...(typeof rbacValidatorServiceTags !== 'undefined' ? rbacValidatorServiceTags : [])
-    ])).filter(Boolean);
-    customRbacFlowTags.forEach(function(flowTag) {
-      const tagUpper = flowTag[0].toUpperCase() + flowTag.slice(1);
-      allRbacTags.forEach(function(tag) {
-        rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: `${tagUpper}RbacCallbackHdrSqs` });
-      });
-    });
-  }
 -%>
 const snsTopicSubscriptions = [
 <% if (relSubs.length > 0) { -%>
@@ -247,19 +230,6 @@ const snsTopicSubscriptions = [
     sqsEndpoint: '<%= sub.sqsEndpoint %>'
   },
 <% }); -%>
-<% } -%>
-<% if (rbacSubs.length > 0) { -%>
-
-  // ------------------------------------------------------------
-  // RBAC Validator Subscriptions
-  // ------------------------------------------------------------
-<% rbacSubs.forEach(function(sub, idx) { -%>
-  {
-    serviceTag: '<%= sub.serviceTag %>',
-    topicName: '<%= sub.topicName %>',
-    sqsEndpoint: '<%= sub.sqsEndpoint %>'
-  },
-<% }); -%>
 <% } -%>
 
   //(<additionalSubscription>)

package/src/emit/custom/customFlowPaths.js

@@ -4,8 +4,7 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst,
-  flowHasRbac
+  upperFirst
 } from './customFlows.js';
 
 export const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-schema.yml';
@@ -35,12 +34,6 @@ export function ownTopicRootPaths(flow, objects = []) {
     `${source}/${tag}_WbsMain.js`,
     `${source}/${tag}_HdrWbs.js`
   ];
-  if (flowHasRbac(flow, objects)) {
-    paths.push(
-      `${source}/${tag}RbacCallback_Main.js`,
-      `${source}/${tag}RbacCallback_HdrSqs.js`
-    );
-  }
   return paths;
 }
 
@@ -52,12 +45,6 @@ export function flowPaths(flow, objects = []) {
   if (needsProcessMain(flow)) {
     paths.push(`${source}/${process}_Main.js`);
   }
-  if (flowHasRbac(flow, objects)) {
-    paths.push(
-      `${source}/${tag}RbacCallback_Main.js`,
-      `${source}/${tag}RbacCallback_HdrSqs.js`
-    );
-  }
   if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     paths.push(`${source}/${process}_HdrSqs.js`);
   }
@@ -116,7 +103,7 @@ export function customFlowApplicationManagedPaths(
   const extSteps = flowExtTopicSteps(flows);
   const dsqSteps = flowDsqSteps(flows);
 
-  return [
+  return Array.from(new Set([
     ...customFlowList.flatMap((flow) => flowPaths(flow, objects)),
     ...generatedRoots.flatMap((flow) => ownTopicRootPaths(flow, objects)),
     ...extSteps.flatMap(({ flowTag, stepName }) => {
@@ -145,5 +132,5 @@ export function customFlowApplicationManagedPaths(
     dsqSteps.length > 0
       ? [YAML_PATH]
       : [])
-  ];
+  ]));
 }

package/src/emit/custom/customFlowSteps.js

@@ -157,7 +157,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     upperCaseFlowTag: tag,
     startConfig: _startConfig(flow)
   };
-  const isRbac = flowHasRbac(flow, objects);
   const ownArtifacts = [
     {
       path: `${source}/${mainFileName}.js`,
@@ -209,46 +208,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     })
   ];
 
-  if (isRbac) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    const rbacConfig = rbacStep ? stepConfig(flow, rbacStep) : null;
-    ownArtifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    ownFunctions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
-
   return {
     artifacts: ownArtifacts,
     functions: ownFunctions

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -5,8 +5,7 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst,
-  flowHasRbac
+  upperFirst
 } from './customFlows.js';
 import {
   customFlowApplicationManagedPaths,
@@ -19,11 +18,9 @@ import {
   emitDsqStep,
   emitOwnTopicRoot,
   renderEndpointMain,
-  stepConfig,
   _startConfig
 } from './customFlowSteps.js';
 import {
-  renderCustom,
   renderShared,
   renderDsq
 } from './customFlowTemplates.js';
@@ -101,49 +98,6 @@ async function emitFlow(flow, objects) {
   }
   const functions = [];
 
-  const isRbac = flowHasRbac(flow, objects);
-  if (isRbac && !flow.event.includes('ownTopic')) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    let rbacConfig = null;
-    if (rbacStep) {
-      rbacConfig = stepConfig(flow, rbacStep);
-    }
-    artifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    functions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
 
   if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     artifacts.push({

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -182,7 +182,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       }
     }
 <% } -%>
-<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig) { -%>
+<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig && flow.initiateBy !== 'systemNoUser') { -%>
 
     const { checkRbacPermission } =
       await import('@izara_project/izara-authorization');
@@ -200,7 +200,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
           serviceTag: '<%- (typeof rbacServiceTag !== "undefined" && rbacServiceTag) ? rbacServiceTag : ((flow.objType?.belongTo ? (Array.isArray(flow.objType.belongTo) ? flow.objType.belongTo[0]?.serviceTag : flow.objType.belongTo?.serviceTag) : null) || flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "")) %>'
         },
         requestParams: typeof requestParams !== 'undefined' ? requestParams : {},
-        nextFlowStepName: '<%- upperCaseFlowTag %>RbacCallback'
+        sync: true
       }
     );
 

package/src/emit/relationship/templates/ChangeRelationship_Main.ejs

@@ -84,15 +84,15 @@ export default async function <%- functionName %>(
       firstObject,
       secondObject,
       oldRelTypeAndDirection,
-      newRelType
-      //(<requestParamCreateRel>)
-      //(</requestParamCreateRel>)
+      newRelType,
+      //(<requestParamChangeRel>)
+      //(</requestParamChangeRel>)
     } = requestParams;
 
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateChangeRel>)
-    //(</beforeValidateChangeRel>).
+    //(</beforeValidateChangeRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -443,7 +443,7 @@ export default async function <%- functionName %>(
         newRelType,
         originTimestamp,
         changedByUserId,
-        parentFlowId
+        parentFlowId,
         //(<messageBodyChangeRel>)
         //(</messageBodyChangeRel>)
 
@@ -461,15 +461,15 @@ export default async function <%- functionName %>(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.changeRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function createRelationship(
       relationshipDirection,
       relationshipProperties,
       deepPathConditional,
-      settings = {}
+      settings = {},
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
@@ -93,7 +93,7 @@ export default async function createRelationship(
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateCreateRel>)
-    //(</beforeValidateCreateRel>).
+    //(</beforeValidateCreateRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -465,7 +465,7 @@ export default async function createRelationship(
         relationshipProperties,
         deepPathConditional: deepPathConditional || [],
         parentFlowId,
-        settings: { createOnConditionalFail: createOnConditionalFail }
+        settings: { createOnConditionalFail: createOnConditionalFail },
         //(<inCreateRelMessageBodyCreateRel>)
         //(</inCreateRelMessageBodyCreateRel>)
 
@@ -483,15 +483,15 @@ export default async function createRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.createRelComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/DeleteRelationship_Main.ejs

@@ -81,7 +81,7 @@ export default async function deleteRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamDeleteRel>)
       //(</requestParamDeleteRel>)
     } = requestParams;
@@ -346,7 +346,7 @@ export default async function deleteRelationship(
         relType: relType,
         relId: relId,
         relationshipDirection: relationshipDirection,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<inDeleteRelMessageBody>)
         //(</inDeleteRelMessageBody>)
       };
@@ -362,11 +362,11 @@ export default async function deleteRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.deleteRelComplete
                     ),
+                    //(<callingFlowProperties>)
                     {}
                     //(</callingFlowProperties>)
                   )

package/src/emit/relationship/templates/GetRelationship_Main.ejs

@@ -79,7 +79,7 @@ export default async function getRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamGetRel>)
       //(</requestParamGetRel>)
     } = requestParams;

package/src/emit/relationship/templates/MoveRelationship_Main.ejs

@@ -87,7 +87,7 @@ export default async function moveRelationship(
       relType,
       relationshipDirection,
       relationshipProperties,
-      moveObject
+      moveObject,
       //(<requestParamMoveRel>)
       //(</requestParamMoveRel>)
     } = requestParams;
@@ -96,7 +96,7 @@ export default async function moveRelationship(
     let foundErrors = [];
 
     //(<beforeValidateMoveRel>)
-    //(</beforeValidateMoveRel>).
+    //(</beforeValidateMoveRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -428,7 +428,7 @@ export default async function moveRelationship(
         relationshipDirection,
         relationshipProperties,
         moveObject,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<messageBodyMoveRel>)
         //(</messageBodyMoveRel>)
 
@@ -446,15 +446,15 @@ export default async function moveRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.moveRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/UpdateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function updateRelationship(
       relType,
       relId,
       relationshipProperties,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamUpdateRel>)
       //(</requestParamUpdateRel>)
     } = requestParams;
@@ -292,7 +292,7 @@ export default async function updateRelationship(
           relationshipDirection,
           status: 'error',
           foundErrors: foundErrors,
-          parentFlowId: parentFlowId
+          parentFlowId: parentFlowId,
           //(<inUpdateCompleteMsgUpdateRel>)
           //(</inUpdateCompleteMsgUpdateRel>)
         };
@@ -422,7 +422,7 @@ export default async function updateRelationship(
           relType: relType,
           relationshipProperties,
           relationshipDirection,
-          parentFlowId
+          parentFlowId,
           //(<inUpdateRelMessageBodyUpdateRel>)
           //(</inUpdateRelMessageBodyUpdateRel>)
         };
@@ -438,15 +438,15 @@ export default async function updateRelationship(
                     callingFlowConfig, // receive parent callingFlowConfig.
                     callingFlowSharedLib.createCallingFlowConfig(
                       // callingFlow own service
-                      //(<callingFlowProperties>)
                       await lambdaSharedLib.lambdaFunctionName(
                         _izContext,
                         TOPIC_NAME_GENERATE_CODE.updateRelComplete
                       ),
-                      //(</callingFlowProperties>)
+                      //(<callingFlowProperties>)
                       {
                         graphServiceTag: storageResource.graphServiceTag
                       }
+                      //(</callingFlowProperties>)
                     )
                   )
                 );

package/src/emit/resource/iamResourceArtifacts.js

@@ -3,8 +3,7 @@ import { CRUD_ACTIONS } from '../crud/crudActionPlan.js';
 import {
   customFlowRoleName,
   flowDsqSteps,
-  flowExtTopicSteps,
-  flowHasRbac
+  flowExtTopicSteps
 } from '../custom/customFlows.js';
 import {
   RELATIONSHIP_ACTIONS,
@@ -338,9 +337,6 @@ export function roleQueueNames(state, roleName) {
   if (includesEvent(flow, 'dsq')) {
     queueList.push(`${tag}HdrDsq`);
   }
-  if (flowHasRbac(flow, state.objects)) {
-    queueList.push(`${tag}RbacCallbackHdrSqs`);
-  }
   queueList.push(
     ...flowExtTopicSteps([flow]).map(
       ({ flowTag, stepName }) => `${flowTag}${stepName}HdrSqs`

package/src/emit/resource/resourceState.js

@@ -4,8 +4,7 @@ import {
   flowExtTopicSteps,
   generatedDsqFlows,
   generatedOwnTopicFlows,
-  supportedCustomFlows,
-  flowHasRbac
+  supportedCustomFlows
 } from '../custom/customFlows.js';
 import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
 import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
@@ -146,7 +145,7 @@ export function createResourceState({ objects, relationships, flows }) {
   const customSqsQueues = [
     ...flows
       .filter((flow) => includesEvent(flow, 'extTopic'))
-      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`),
+      .map((flow) => `${upperFirst(flow.flowTag)}HdrSqs`),
     ...flows
       .filter(
         (flow) =>
@@ -159,12 +158,7 @@ export function createResourceState({ objects, relationships, flows }) {
   for (const { flowTag, stepName } of flowExtTopicSteps(flows)) {
     customSqsQueues.push(`${flowTag}${stepName}HdrSqs`);
   }
-  for (const flow of flows) {
-    if (flowHasRbac(flow, objects)) {
-      const tag = upperFirst(flow.flowTag);
-      customSqsQueues.push(`${tag}RbacCallbackHdrSqs`);
-    }
-  }
+
   for (const flow of flows.filter((flow) => includesEvent(flow, 's3'))) {
     const tag = upperFirst(flow.flowTag);
     customSqsQueues.push(`${tag}CreatePreSignUrlHdrSqs`);

package/test/customFlowApplicationArtifacts.test.js

@@ -88,6 +88,15 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
   assert.match(iam, /ApiRole:/);
   assert.match(iam, /OwnRole:/);
   assert.match(iam, /UploadRole:/);
+  const customSqsYaml = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
+    ),
+    'utf8'
+  );
+  assert.match(customSqsYaml, /ExtHdrSqs:/);
+  assert.doesNotMatch(customSqsYaml, /ProcessExtHdrSqs/);
   assert.match(
     await readFile(
       join(
@@ -1412,4 +1421,121 @@ test('emits early return cacheMain on cache hit in FlowEndpoint_Main for storedC
   await parseAsEsm(mainPath);
 });
 
+test('does not emit RbacCallback artifacts or duplicate artifact paths for custom flow with RBAC', async () => {
+  const { generate } = await import('../src/generate.js');
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/ObjectSchemas/ComAcc.js'),
+    `export default {
+  objectType: 'comAcc',
+  belongTo: {
+    objectType: 'user',
+    serviceTag: 'UserAccount'
+  }
+};\n`
+  );
+  await writeFile(
+    join(
+      rootPath,
+      'app/src/schemas/FlowSchemas/CreateBusinessToComAcc.js'
+    ),
+    `export default {
+  flowTag: 'createBusinessToComAcc',
+  event: ['lambdaSyncInv', 'ownTopic'],
+  objType: {
+    objectType: 'comAcc',
+    serviceTag: 'ComAcc'
+  },
+  flowSteps: [{ stepName: 'Start' }]
+};\n`
+  );
+
+  const result = await generate(rootPath, {
+    serviceTag: 'BusinessService'
+  });
+  assert.ok(result);
+
+  const sourceDir = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/CreateBusinessToComAcc/source'
+  );
+  const mainPath = join(sourceDir, 'CreateBusinessToComAcc_Main.js');
+  const mainContent = await readFile(mainPath, 'utf8');
+  assert.match(mainContent, /checkRbacPermission/);
+  assert.doesNotMatch(mainContent, /CreateBusinessToComAccRbacCallback/);
+
+  await assert.rejects(
+    () =>
+      readFile(
+        join(sourceDir, 'CreateBusinessToComAccRbacCallback_Main.js'),
+        'utf8'
+      ),
+    { code: 'ENOENT' }
+  );
+  await assert.rejects(
+    () =>
+      readFile(
+        join(sourceDir, 'CreateBusinessToComAccRbacCallback_HdrSqs.js'),
+        'utf8'
+      ),
+    { code: 'ENOENT' }
+  );
+
+  const initialSetupConfigContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+    ),
+    'utf8'
+  );
+  assert.doesNotMatch(
+    initialSetupConfigContent,
+    /CreateBusinessToComAccRbacCallbackHdrSqs/
+  );
+});
+
+test('skips checkRbacPermission in FlowEndpoint_Main when initiateBy is systemNoUser', async () => {
+  const { generate } = await import('../src/generate.js');
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/ObjectSchemas/ComAcc.js'),
+    `export default {
+  objectType: 'comAcc',
+  belongTo: {
+    objectType: 'user',
+    serviceTag: 'UserAccount'
+  }
+};\n`
+  );
+  await writeFile(
+    join(
+      rootPath,
+      'app/src/schemas/FlowSchemas/SystemCronFlow.js'
+    ),
+    `export default {
+  flowTag: 'systemCronFlow',
+  event: ['ownTopic'],
+  initiateBy: 'systemNoUser',
+  objType: {
+    objectType: 'comAcc',
+    serviceTag: 'ComAcc'
+  },
+  flowSteps: [{ stepName: 'Start' }]
+};\n`
+  );
+
+  const result = await generate(rootPath, {
+    serviceTag: 'BusinessService'
+  });
+  assert.ok(result);
+
+  const mainPath = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/SystemCronFlow/source/SystemCronFlow_Main.js'
+  );
+  const mainContent = await readFile(mainPath, 'utf8');
+  assert.doesNotMatch(mainContent, /checkRbacPermission/);
+  await parseAsEsm(mainPath);
+});
+
 

package/test/relationshipApplicationArtifacts.test.js

@@ -125,6 +125,35 @@ test('emits relationship action and complete handlers with data-first function Y
   assert.match(yaml, /CreateRelationshipCompleteHdrSqs:/);
 });
 
+test('emits valid hook tags without trailing periods and with correct callingFlowProperties placement in relationship Main files', async () => {
+  const rootPath = await createProject(true);
+  await generateRelationshipApplicationArtifacts(rootPath, {
+    serviceTag: 'orders'
+  });
+
+  const actions = ['Create', 'Update', 'Delete', 'Move', 'Change'];
+  for (const action of actions) {
+    const mainContent = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowRelationships/${action}Relationship/source/${action}Relationship_Main.js`
+      ),
+      'utf8'
+    );
+    assert.doesNotMatch(mainContent, /\/\/\(<\/[^>]+>\)\./);
+  }
+
+  const changeMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowRelationships/ChangeRelationship/source/ChangeRelationship_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(changeMain, /\/\/\(<requestParamChangeRel>\)/);
+  assert.doesNotMatch(changeMain, /\/\/\(<requestParamCreateRel>\)/);
+});
+
 test('removes managed relationship artifacts after relationships are removed', async () => {
   const rootPath = await createProject(true);
   await generateRelationshipApplicationArtifacts(rootPath, {