@izara_project/izara-core-generate-service-code 1.0.77 → 1.0.79

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

@@ -20,198 +20,29 @@ import {
   identifierUuid
 } from '@izara_project/izara-shared-core';
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
-import { consts as middlewareConsts } from '@izara_project/izara-middleware';
 import {
   sns,
   lambda
 } from '@izara_project/izara-core-library-external-request';
-import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import {
   consts,
   getObjectSchema,
-  dataDetailsLib,
-  identifiersObject,
   utils
 } from '@izara_project/izara-core-library-service-schemas';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
 
-const { createObjType } = utils;
-const { createDeleteDataDetail } = dataDetailsLib;
-const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
-const { TOPIC_NAME_GENERATE_CODE } = consts;
+import { <%- flowTag %>LogicalLib } from './<%- upperCaseFlowTag %>LogicalLib.js';
 
 //(<optionalRequire>)
 //(</optionalRequire>)
 
-/**
- * Core logical processing after beforeLogical phase completes
- * Called by both deleteMain (no beforeLogical) and deleteBeforeLogicalMain (after callback)
- * @param {Object} _izContext - Context object with logger
- * @param {Object} requestParams - { identifiers, objectType }
- * @param {Object} callingFlowConfig - Calling flow configuration
- * @param {Object} beforeLogicalResults - Results from beforeLogical phase
- * @returns {Promise<Object>}
- */
-export async function <%- flowTag %>MainLogical(
-  _izContext,
-  requestParams,
-  callingFlowConfig = {},
-  errorsFound = [],
-  beforeLogicalResults = {}
-) {
-  try {
-    _izContext.logger.debug('[<%- flowTag %>MainLogical] started', {
-      requestParams,
-      callingFlowConfig,
-      beforeLogicalResults
-    });
-
-    //(<beforeDeleteMainLogical>)
-    //(</beforeDeleteMainLogical>)
-
-    const objType = createObjType(requestParams.objectType);
-
-    // ── Load schema ───────────────────────────────────────────────────────────
-    const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(
-      _izContext,
-      objType
-    );
-    _izContext.logger.debug('objectSchema', objectSchema);
-
-    // ── Build deleteDataDetails ───────────────────────────────────────────────
-    const deleteDataDetails = await createDeleteDataDetail(
-      _izContext,
-      objectSchema
-    );
-    _izContext.logger.debug('deleteDataDetails', deleteDataDetails);
-
-    if (objectSchema.canDelete === false || objectSchema.canDelete == null) {
-      errorsFound.push("this objectSchema can't delete");
-    }
-
-    // ── Early exit on errors ──────────────────────────────────────────────────
-    if (errorsFound.length) {
-      const deleteNodeCompleteMessage =
-        callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
-          callingFlowConfig,
-          {
-            objType,
-            identifiers: requestParams.identifiers,
-            status: 'error',
-            errorsFound
-          }
-        );
-
-      _izContext.logger.debug(
-        'messageParams OutDeleteNodeComplete::',
-        deleteNodeCompleteMessage
-      );
-      await sns.publishAsync(_izContext, {
-        Message: JSON.stringify(deleteNodeCompleteMessage),
-        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-          _izContext,
-          TOPIC_NAME_GENERATE_CODE.outDeleteNodeComplete
-        )
-      });
-
-      return {
-        objType,
-        identifiers: requestParams.identifiers,
-        status: 'error',
-        errorsFound
-      };
-    }
-
-    //(<validateBeforeDelete>)
-    //(</validateBeforeDelete>)
-
-    // ── Process storage resources ─────────────────────────────────────────────
-    for (const [storageTag, deleteDataDetail] of Object.entries(
-      deleteDataDetails
-    )) {
-      //(<beforeDelete>)
-      //(</beforeDelete>)
-
-      if (deleteDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
-        //(<beforeDeleteRecordDynamo>)
-        //(</beforeDeleteRecordDynamo>)
-        _izContext.logger.debug('::::::DynamoDB::::::', { storageTag });
-
-        const identifiersForDeleteData =
-          await dynamoDbIdentifiersByStorageResource(
-            _izContext,
-            objectSchema,
-            deleteDataDetail,
-            requestParams.identifiers
-          );
-        _izContext.logger.debug(
-          'identifiersForDeleteData',
-          identifiersForDeleteData
-        );
-
-        await dynamodbSharedLib.deleteItem(
-          _izContext,
-          await dynamodbSharedLib.tableName(
-            _izContext,
-            deleteDataDetail.tableName,
-            deleteDataDetail.serviceTag
-          ),
-          identifiersForDeleteData
-        );
-
-        //(<afterDeleteRecordDynamo>)
-        //(</afterDeleteRecordDynamo>)
-      }
-    }
-
-    // ── Complete ──────────────────────────────────────────────────────────────
-    const outMessage =
-      callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
-        callingFlowConfig,
-        {
-          objType,
-          identifiers: requestParams.identifiers,
-          status: 'complete',
-          errorsFound
-        }
-      );
-
-    if (
-      callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]
-    ) {
-      _izContext.logger.debug('HAVE CallingFlow');
-      await sns.publishAsync(_izContext, {
-        Message: JSON.stringify(outMessage),
-        MessageAttributes: sns.createStringMessageAttributes(
-          _izContext,
-          callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
-            callingFlowConfig,
-            {}
-          )
-        ),
-        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-          _izContext,
-          TOPIC_NAME_GENERATE_CODE.outDeleteNodeComplete
-        )
-      });
-    }
-
-    return {
-      objType,
-      identifiers: requestParams.identifiers,
-      status: 'complete',
-      errorsFound
-    };
-  } catch (err) {
-    throw err;
-  }
-}
+const { createObjType } = utils;
 
 /**
- * Deletes an object instance — handles beforeLogical phase routing or proceeds directly to logical
+ * Deletes an object instance with optional RBAC routing
  * @param {Object} _izContext - Context object with logger
  * @param {Object} requestParams - { identifiers, objectType }
  * @param {Object} callingFlowConfig - Calling flow configuration
@@ -220,7 +51,7 @@ export async function <%- flowTag %>MainLogical(
 export default async function <%- flowTag %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {}
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
@@ -255,27 +86,80 @@ export default async function <%- flowTag %>(
     //(<beforeQuery>)
     //(</beforeQuery>)
 
-    // ── Build identifiers (used for hash in beforeLogical) ──────────────────
+    // ── Build identifiers used by asynchronous processing ────────────────────
     const identifiers = requestParams.identifiers;
 
     if (errorsFound.length > 0)
-      return await createMainLogical(
+      return await <%- flowTag %>LogicalLib(
         _izContext,
         requestParams,
         callingFlowConfig,
         errorsFound
       );
 
-    // ── beforeLogical phase check ─────────────────────────────────────────────
     <%_
-    const groupedByObjType = generateCode
-      .filter(c => c.codeHookTag === 'beforeLogical')
-      .reduce((acc, config) => {
-        const key = config.objType.objectType;
-        if (!acc[key]) acc[key] = [];
-        acc[key].push(config);
-        return acc;
-      }, {});
+    const rbacObjects = objects.filter(o => (o?.generatedBy === 'userGenerated' || o?.generatedBy === 'systemGenerated') && hasRbacAddOn(o));
+    const rbacObjectTypes = rbacObjects.map(o => o.objectType);
+    const rbacServiceTagMap = {};
+    for (const o of rbacObjects) {
+      const belongToTargets = o?.belongTo
+        ? Array.isArray(o.belongTo)
+          ? o.belongTo
+          : [o.belongTo]
+        : [];
+      if (belongToTargets.length > 0 && belongToTargets[0]?.serviceTag) {
+        rbacServiceTagMap[o.objectType] = `'${belongToTargets[0].serviceTag}'`;
+      } else if (o?.belongToSchema?.serviceTag) {
+        rbacServiceTagMap[o.objectType] = `'${o.belongToSchema.serviceTag}'`;
+      } else if (o?.serviceTag) {
+        rbacServiceTagMap[o.objectType] = `'${o.serviceTag}'`;
+      } else {
+        rbacServiceTagMap[o.objectType] = 'process.env.iz_serviceTag';
+      }
+    }
+    const rbacServiceTags = Array.from(new Set(Object.values(rbacServiceTagMap)));
+    _%>
+    <%_ if (rbacObjectTypes.length > 0) { _%>
+    // ── rbacCallback phase check ─────────────────────────────────────────────
+    if ([<%- rbacObjectTypes.map(t => `'${t}'`).join(', ') %>].includes(requestParams.objectType)) {
+      const { checkRbacPermission } =
+        await import('@izara_project/izara-authorization');
+
+      //(<rbacParameterGroups_<%- flowTag %>)
+      const parameterGroups = {};
+      //(</rbacParameterGroups_<%- flowTag %>)
+
+      const resultPermissionCheck = await checkRbacPermission(
+        _izContext,
+        {
+          flowTag: '<%- flowTag %>',
+          serviceTag: process.env.iz_serviceTag
+        },
+        parameterGroups,
+        {
+          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: '<%- flowTag %>RbacCallback'
+        }
+      );
+
+      _izContext.logger.debug(
+        '[lib:auth:checkRbacPermission] resultPermissionCheck:',
+        resultPermissionCheck
+      );
+
+      //(<rbacPublish_<%- flowTag %>)
+      //(</rbacPublish_<%- flowTag %>)
+
+      return resultPermissionCheck;
+    }
+    <%_ } _%>
+
+    // ── Optional phase extension point ────────────────────────────────────────
+    <%_
+    const groupedByObjType = [];
     _%>
     <%_ Object.entries(groupedByObjType).forEach(([objectType, configs]) => { _%>
     <%_
@@ -299,7 +183,7 @@ export default async function <%- flowTag %>(
           .then((returnValue) => ({
             flowTag: '<%= config.flowTag %>',
             returnValue
-          })) /*__EJS_COMMA_13__*/
+          })) /*__EJS_COMMA_14__*/
         // lambdaSyncInv <%= config.flowTag %>
         <%_ }) _%>
       ]);
@@ -318,7 +202,7 @@ export default async function <%- flowTag %>(
       awaitingMultipleStepIds.push({
         awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
           hash(identifiers),
-          '<%= config.codeHookTag %>_<%= objectType %>_<%= config.flowTag.charAt(0).toUpperCase() + config.flowTag.slice(1) %>'
+          'logical_<%= objectType %>_<%= config.flowTag.charAt(0).toUpperCase() + config.flowTag.slice(1) %>'
         ),
         additionalAttributes: {}
       });
@@ -332,7 +216,7 @@ export default async function <%- flowTag %>(
               //(<callingFlowProperties_<%= config.flowTag %>>)
               await lambdaSharedLib.lambdaFunctionName(
                 _izContext,
-                '<%= config.generatedCodeTag %><%= config.codeHookTag.charAt(0).toUpperCase() + config.codeHookTag.slice(1) %>'
+                '<%= flowTag.toLowerCase() %>Complete'
               ),
               {}
               //(</callingFlowProperties_<%= config.flowTag %>>)
@@ -349,7 +233,7 @@ export default async function <%- flowTag %>(
         awaitingMultipleStepIds.push({
           awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
             hash(identifiers),
-            '<%= configs[0].codeHookTag %>_<%= objectType %>_' + syncResult.flowTag
+            'logical_<%= objectType %>_' + syncResult.flowTag
           ),
           additionalAttributes: {
             complete: true,
@@ -363,8 +247,8 @@ export default async function <%- flowTag %>(
       await asyncFlowSharedLib.createAwaitingMultipleSteps(
         _izContext,
         asyncFlowSharedLib.createPendingStepId(
-          hash(identifiers),
-          'beforeLogical_<%= objectType %>'
+          _izContext.uniqueRequestId,
+          'logical_<%= objectType %>'
         ),
         awaitingMultipleStepIds
       );
@@ -393,20 +277,20 @@ export default async function <%- flowTag %>(
         });
       }
 
-      return 'complete beforeLogical <%= objectType %>';
+      return 'complete logical <%= objectType %>';
 
       <%_ } else { _%>
-      // ── lambdaSyncInv only — collect results and proceed to deleteMainLogical
-      const beforeLogicalResults = lambdaSyncInvResults.reduce((acc, r) => {
-        acc[r.flowTag] = r.returnValue;
-        return acc;
-      }, {});
+      // ── lambdaSyncInv only — collect results and proceed to deleteLogicalLib
+      const phaseResults = Object.fromEntries(
+        lambdaSyncInvResults.map(({ flowTag: tag, returnValue }) => [tag, returnValue])
+      );
 
-      return await <%- flowTag %>MainLogical(
+      return await <%- flowTag %>LogicalLib(
         _izContext,
         requestParams,
         callingFlowConfig,
-        beforeLogicalResults
+        errorsFound,
+        phaseResults
       );
       <%_ } _%>
     }
@@ -415,11 +299,12 @@ export default async function <%- flowTag %>(
     //(<beforeDeleteMainLogical>)
     //(</beforeDeleteMainLogical>)
 
-    // ── No beforeLogical → proceed directly to logical ────────────────────────
-    return await <%- flowTag %>MainLogical(
+    // ── No optional phase → proceed directly to logical ──────────────────────
+    return await <%- flowTag %>LogicalLib(
       _izContext,
       requestParams,
-      callingFlowConfig
+      callingFlowConfig,
+      errorsFound
     );
   } catch (err) {
     throw err;

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

@@ -0,0 +1,213 @@
+/*
+Copyright (C) 2021 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import {
+  objectHash as hash,
+  identifierUuid
+} from '@izara_project/izara-shared-core';
+import { consts as coreConsts } from '@izara_project/izara-core-library-core';
+import { consts as middlewareConsts } from '@izara_project/izara-middleware';
+import {
+  sns,
+  lambda
+} from '@izara_project/izara-core-library-external-request';
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
+import {
+  consts,
+  getObjectSchema,
+  dataDetailsLib,
+  identifiersObject,
+  utils
+} from '@izara_project/izara-core-library-service-schemas';
+
+const { createObjType } = utils;
+const { createDeleteDataDetail } = dataDetailsLib;
+const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
+const { TOPIC_NAME_GENERATE_CODE } = consts;
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+/**
+ * Core logical processing library
+ * @param {Object} _izContext - Context object with logger
+ * @param {Object} requestParams - { identifiers, objectType }
+ * @param {Object} callingFlowConfig - Calling flow configuration
+ * @param {Object} phaseResults - Results from preceding phases
+ * @returns {Promise<Object>}
+ */
+export async function <%- flowTag %>LogicalLib(
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  errorsFound = [],
+  phaseResults = {}
+) {
+  try {
+    _izContext.logger.debug('[<%- flowTag %>LogicalLib] started', {
+      requestParams,
+      callingFlowConfig,
+      phaseResults
+    });
+
+    //(<beforeDeleteMainLogical>)
+    //(</beforeDeleteMainLogical>)
+
+    const objType = createObjType(requestParams.objectType);
+
+    // ── Load schema ───────────────────────────────────────────────────────────
+    const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(
+      _izContext,
+      objType
+    );
+    _izContext.logger.debug('objectSchema', objectSchema);
+
+    // ── Build deleteDataDetails ───────────────────────────────────────────────
+    const deleteDataDetails = await createDeleteDataDetail(
+      _izContext,
+      objectSchema
+    );
+    _izContext.logger.debug('deleteDataDetails', deleteDataDetails);
+
+    if (objectSchema.canDelete === false || objectSchema.canDelete == null) {
+      errorsFound.push("this objectSchema can't delete");
+    }
+
+    // ── Early exit on errors ──────────────────────────────────────────────────
+    if (errorsFound.length) {
+      const deleteNodeCompleteMessage =
+        callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+          callingFlowConfig,
+          {
+            objType,
+            identifiers: requestParams.identifiers,
+            status: 'error',
+            errorsFound
+          }
+        );
+
+      _izContext.logger.debug(
+        'messageParams OutDeleteNodeComplete::',
+        deleteNodeCompleteMessage
+      );
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify(deleteNodeCompleteMessage),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outDeleteNodeComplete
+        )
+      });
+
+      return {
+        objType,
+        identifiers: requestParams.identifiers,
+        status: 'error',
+        errorsFound
+      };
+    }
+
+    //(<validateBeforeDelete>)
+    //(</validateBeforeDelete>)
+
+    // ── Process storage resources ─────────────────────────────────────────────
+    for (const [storageTag, deleteDataDetail] of Object.entries(
+      deleteDataDetails
+    )) {
+      //(<beforeDelete>)
+      //(</beforeDelete>)
+
+      if (deleteDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
+        //(<beforeDeleteRecordDynamo>)
+        //(</beforeDeleteRecordDynamo>)
+        _izContext.logger.debug('::::::DynamoDB::::::', { storageTag });
+
+        const identifiersForDeleteData =
+          await dynamoDbIdentifiersByStorageResource(
+            _izContext,
+            objectSchema,
+            deleteDataDetail,
+            requestParams.identifiers
+          );
+        _izContext.logger.debug(
+          'identifiersForDeleteData',
+          identifiersForDeleteData
+        );
+
+        await dynamodbSharedLib.deleteItem(
+          _izContext,
+          await dynamodbSharedLib.tableName(
+            _izContext,
+            deleteDataDetail.tableName,
+            deleteDataDetail.serviceTag
+          ),
+          identifiersForDeleteData
+        );
+
+        //(<afterDeleteRecordDynamo>)
+        //(</afterDeleteRecordDynamo>)
+      }
+    }
+
+    // ── Complete ──────────────────────────────────────────────────────────────
+    const outMessage =
+      callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+        callingFlowConfig,
+        {
+          objType,
+          identifiers: requestParams.identifiers,
+          status: 'complete',
+          errorsFound
+        }
+      );
+
+    if (
+      callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]
+    ) {
+      _izContext.logger.debug('HAVE CallingFlow');
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify(outMessage),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
+            callingFlowConfig,
+            {}
+          )
+        ),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outDeleteNodeComplete
+        )
+      });
+    }
+
+    return {
+      objType,
+      identifiers: requestParams.identifiers,
+      status: 'complete',
+      errorsFound
+    };
+  } catch (err) {
+    throw err;
+  }
+}
+
+export const <%- flowTag %>MainLogical = <%- flowTag %>LogicalLib;
+export default <%- flowTag %>LogicalLib;