@izara_project/izara-core-generate-service-code 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/get/template.ejs

@@ -84,15 +84,6 @@ export default async function getMain(
     const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
     _izContext.logger.debug('objectSchema:', objectSchema);
 
-    // ── Validate user context ─────────────────────────────────────────────────
-    if (objectSchema.generatedBy === 'userGenerated') {
-      const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
-      const targetId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
-      if (!userId) throw new Error('Not have userId');
-      if (objectSchema.hasOwnProperty('belongTo') && !targetId)
-        throw new Error('not have targetId');
-    }
-
     // ── Build getDataDetails ──────────────────────────────────────────────────
     const getDataDetails = await createGetDataDetails(_izContext, objectSchema);
     _izContext.logger.debug('getDataDetails:', getDataDetails);

package/src/generateCode/generateSchema/rbac/dynamoDb/data.js

@@ -36,47 +36,9 @@ const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
   const defaultDynamoDataLists = [];
 
   defaultDynamoDataLists.push(
-    {
-      tableName: 'Permission',
-      resourceName: 'Permission',
-      attributes: [
-        {
-          keyType: 'partitionKey',
-          AttributeName: 'targetObjTypeConcat',
-          AttributeType: 'S'
-        }
-      ]
-    },
     {
       tableName: 'RolePermissions',
       resourceName: 'RolePermissions',
-      attributes: [
-        {
-          keyType: 'partitionKey',
-          AttributeName: 'roleIdKey',
-          AttributeType: 'S'
-        },
-        {
-          keyType: 'sortKey',
-          AttributeName: 'service_resource_action',
-          AttributeType: 'S'
-        }
-      ]
-    },
-    {
-      tableName: 'Roles',
-      resourceName: 'Roles',
-      attributes: [
-        {
-          keyType: 'partitionKey',
-          AttributeName: 'roleIdKey',
-          AttributeType: 'S'
-        }
-      ]
-    },
-    {
-      tableName: 'UserRoles',
-      resourceName: 'UserRoles',
       attributes: [
         {
           keyType: 'partitionKey',
@@ -85,7 +47,7 @@ const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
         },
         {
           keyType: 'sortKey',
-          AttributeName: 'roleIdKey',
+          AttributeName: 'flowTypeWithTargetIdConcat',
           AttributeType: 'S'
         }
       ]

package/src/generateCode/generateSchema/rbac/index.js

@@ -20,12 +20,9 @@ import { join } from 'path';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 const { getAllLocalObjectSchemasWithHierarchy } = getObjectSchema;
 
-// lambda
-import authInvHandler from './lambda/authInv/handler/data.js'
-import authInvMain from './lambda/authInv/mainFunction/data.js'
-
 // auth for api
-import authApi from './lambda/authApi/data.js'
+import authHandler from './lambda/handler/data.js'
+import authMainFunction from './lambda/mainFunction/data.js'
 // yaml
 import authYaml from './lambda/yaml/data.js';
 // dynamo
@@ -45,19 +42,16 @@ async function generateCodeWithTemplate(
   try {
     const createSourceParams = [];
     if (allObjSchemas.records.some(objectSchema => objectSchema.addOnDataStructure?.some(addOn => addOn.type === 'rbac'))) {
-      const handlerInvComponent = authInvHandler(_izContext, appPath);
-      const mainFunctionInvComponent = authInvMain(_izContext, appPath);
-      const authApiComponent = authApi(_izContext, appPath);
       const yamlInvComponent = await authYaml(_izContext, appPath);
       const dynamoRbacPermission = dynamo(_izContext, appPath);
-
+      const handler = authHandler(_izContext, appPath);
+      const mainFunction = authMainFunction(_izContext, appPath);
 
       createSourceParams.push(
-        mainFunctionInvComponent,
-        handlerInvComponent,
-        authApiComponent,
         ...yamlInvComponent,
-        ...dynamoRbacPermission
+        ...dynamoRbacPermission,
+        handler,
+        mainFunction
       );
 
     }

package/src/generateCode/generateSchema/rbac/lambda/{authApi → handler}/data.js

@@ -27,12 +27,14 @@ const __dirname = path.dirname(__filename);
 
 const {
   SOURCE_PATH,
+  HANDLER
 } = consts;
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } =
   utils;
 
-const templatePathInv = path.join(__dirname, 'templateInv.ejs');
+const templatePathInv = path.join(__dirname, 'template.ejs');
+
 
 /**
  * Generates yaml source params for a given action and handler
@@ -50,9 +52,7 @@ function data(
   appPath,
 ) {
   const functionName = "Authorization";
-
-
-  const fileName = upperCase(functionName);
+  const fileName = `${upperCase(functionName)}_${upperCase(HANDLER.hdrInv)}`;
 
   return {
     templatePath: templatePathInv,

package/src/generateCode/generateSchema/rbac/lambda/{authApi/templateInv.ejs → handler/template.ejs}

@@ -37,7 +37,7 @@ export const main = middleware.wrap(async (event, context, callback) => {
   try {
 
     // invoke LambdaFunction
-    return await <%- functionName %>.<%- functionName %>(
+    return await <%- functionName %>(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       event,
       callingFlowSharedLib.addCallingFlowToPassOnProperties(event)

package/src/generateCode/generateSchema/rbac/lambda/mainFunction/template.ejs

@@ -0,0 +1,111 @@
+/*
+Copyright (C) 2020 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 { consts } from '@izara_project/izara-core-library-core';
+import dynamoDBSharedLibs from '@izara_project/izara-core-library-dynamodb';
+import { utils } from '@izara_project/izara-core-library-service-schemas';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import { sns } from '@izara_project/izara-core-library-external-request';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+/**
+ * Gets an object by processing storage resources (DynamoDB, Graph)
+ * @param {Object} _izContext - Context object with logger
+ * @param {Object} requestParams - { objectType, identifiers, additionalParams }
+ * @param {Object} callingFlowConfig - Calling flow configuration
+ * @returns {Promise<Object>} Collected get result
+ */
+export default async function Authorization(
+  _izContext,
+  requestParams,
+  callingFlowConfig = {}
+) {
+  try {
+    _izContext.logger.debug('rbacValidator ::: ', {
+      requestParams,
+      callingFlowConfig
+    });
+
+    const identifier = requestParams?.identifier || null;
+    let flowTypeConcat = requestParams?.flowTypeConcat || null;
+
+    if (!identifier || !flowTypeConcat) {
+      throw new Error(
+        'Missing required request parameters: identifier or flowTagConcat'
+      );
+    }
+    if (typeof flowTypeConcat === 'object') {
+      flowTypeConcat = utils.createFlowTypeConcat(flowTypeConcat)
+    }
+
+    if (typeof flowTypeConcat !== 'string') {
+      throw new Error('flowTypeConcat must be a string');
+    }
+
+    const userId = _izContext.correlationIds.get(consts.BASE_USER_ID);
+    _izContext.logger.debug('userId', userId);
+
+    if (!userId) {
+      throw new Error('User ID not found in correlation IDs');
+    };
+
+    const targetId = _izContext.correlationIds.get(consts.TARGET_ID);
+    _izContext.logger.debug('targetId', targetId);
+
+    if (!targetId) {
+      throw new Error('Target ID not found in correlation IDs');
+    };
+
+    const rolePermissionTableName = dynamoDBSharedLibs.tableName(_izContext, "RolePermission");
+
+    const resultRolePermissions = await dynamoDBSharedLibs.getItem(_izContext, rolePermissionTableName, {
+      userId: userId,
+      flowTypeWithTargetIdConcat: `${flowTypeConcat}_${targetId}`
+    });
+
+    if (!resultRolePermissions) {
+      throw new Error('User roles not found for the given user');
+    };
+
+    if (resultRolePermissions.permission === true) {
+      // will check app level permission
+      const messageObject = {
+        requestParams: {
+          identifier: identifier,
+          flowTypeConcat: flowTypeConcat,
+        },
+        callingFlow: callingFlowConfig || {}
+      };
+
+
+      const sendMessageToCheckRbacAppLevel = {
+        Message: JSON.stringify(messageObject),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(_izContext, "RbacValidator_In", "TestRbac")
+      };
+
+      await sns.publishAsync(_izContext, sendMessageToCheckRbacAppLevel)
+    };
+
+  } catch (err) {
+    _izContext.logger.error('error GetMain:', err);
+    throw err;
+  }
+}

package/src/generateCode/generateSchema/rbac/lambda/yaml/data.js

@@ -29,9 +29,8 @@ const {
   RESOURCE_CLASSES,
   SOURCE_PATH,
   SAVE_FILE_NAME,
-  LAMBDA_RESOURCE,
   DYNAMO_RESOURCE,
-  S3_RESOURCE
+  SNS_RESOURCE
 } = consts;
 
 const {
@@ -46,11 +45,6 @@ const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } =
 
 const templatePath = path.join(__dirname, 'template.ejs');
 
-const HANDLER = {
-  hdrInv: "hdrInv",
-  hdrApi: "hdrApi"
-}
-
 /**
  * Generates yaml source params for a given action and handler
  * @param {Object} _izContext - Context object with logger
@@ -72,56 +66,40 @@ async function data(
 
   additionalResourcePermission.push(
     createIamRole({
-      [RESOURCE_CLASSES.lambda]: LAMBDA_RESOURCE.invokeFunction
+      [RESOURCE_CLASSES.sns]: SNS_RESOURCE.publish,
     },
-      externalResourceYaml(RESOURCE_CLASSES.lambda, "CheckPermissionHdrInv", "Permission")),
+      externalResourceYaml(RESOURCE_CLASSES.sns, "RbacValidator_In", "TestRbac")),
     createIamRole({
       [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.getItem, DYNAMO_RESOURCE.putItem]
     },
       [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "User"),
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "UserRoles"),
-      ]),
-    createIamRole({
-      [RESOURCE_CLASSES.s3]: [S3_RESOURCE.getObject]
-    },
-      [
-        resourceNames(RESOURCE_CLASSES.s3, "perServiceSchemas/*/Relationships/*.json"),
-        resourceNames(RESOURCE_CLASSES.s3, "perServiceSchemas/*/ObjectSchemaAll/*.json"),
-        resourceNames(RESOURCE_CLASSES.s3, "perServiceSchemas/*/FlowSchema/*.json"),
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "RolePermissions"),
       ])
   );
 
-
-  for (const handler of Object.values(HANDLER)) {
-    const fileName = upperCase(functionName) + '_' + upperCase(handler);
-    const functionNameConfig = functionName + upperCase(handler);
-
-
-    allCreateSources.push(
-      {
-        templatePath,
-        templateData: {
-          functionName: functionName + upperCase(handler),
-          handlerPath: path.join(
-            SOURCE_PATH.resourceLocationRbac,
-            `${fileName}.main`
-          ),
-          additionalResourcePermission,
-          roleName: "Authorization",
-          hookTagSetting: `${functionName}FunctionSetting`,
-          handlerType: handler,
-          functionNameConfig
-        },
-        setting: {
-          savePath: path.join(appPath, SOURCE_PATH.appYaml),
-          saveFileName: SAVE_FILE_NAME.rbac,
-          fileExtension: '.yml',
-          isAppend: true
-        }
+  allCreateSources.push(
+    {
+      templatePath,
+      templateData: {
+        functionName: functionName,
+        handlerPath: path.join(
+          SOURCE_PATH.resourceLocationRbac,
+          `${functionName}.main`
+        ),
+        additionalResourcePermission,
+        roleName: "Authorization",
+        hookTagSetting: `${functionName}FunctionSetting`,
+        functionNameConfig: functionName
+      },
+      setting: {
+        savePath: path.join(appPath, SOURCE_PATH.appYaml),
+        saveFileName: SAVE_FILE_NAME.rbac,
+        fileExtension: '.yml',
+        isAppend: true
       }
-    );
-  };
+    }
+  );
+
   return allCreateSources;
 };
 

package/src/generateCode/generateSchema/rbac/lambda/authInv/handler/data.js

@@ -1,70 +0,0 @@
-/*
-Copyright (C) 2020 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/>.
-*/
-
-// yaml data.js
-import path from 'path';
-import { fileURLToPath } from 'url';
-import consts from '#libs/Consts.js';
-import utils from '#libs/Utils.js';
-import libs from '#libs/Libs.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const {
-  SOURCE_PATH,
-  HANDLER
-} = consts;
-
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } =
-  utils;
-
-const templatePathInv = path.join(__dirname, 'templateInv.ejs');
-
-
-/**
- * Generates yaml source params for a given action and handler
- * @param {Object} _izContext - Context object with logger
- * @param {Array} allObjSchemas - All object schemas
- * @param {string} appPath - Source path
- * @param {string} action - Action name (create/update/get/delete)
- * @param {string} handler - Handler type (hdrApi/hdrSqs/hdrDsq/hdrInv)
- * @param {string|null} functionNameConfig - Override for yaml key (null = derive from action+handler)
- * @param {string} handlerSuffix - Suffix for fnName across all fields (e.g. 'BeforeLogical')
- * @returns {Promise<Array>} Array containing source param object
- */
-function data(
-  _izContext,
-  appPath,
-) {
-  const functionName = "Authorization";
-  const handler = HANDLER.hdrInv;
-  const fileName = upperCase(functionName) + '_' + upperCase(handler);
-
-  return {
-    templatePath: templatePathInv,
-    templateData: { functionName },
-    setting: {
-      savePath: path.join(appPath, SOURCE_PATH.rbac),
-      saveFileName: fileName,
-      fileExtension: '.js',
-      isAppend: true
-    }
-  };
-}
-
-export default data;

package/src/generateCode/generateSchema/rbac/lambda/authInv/handler/templateInv.ejs

@@ -1,52 +0,0 @@
-/*
-Copyright (C) 2020 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 { middlewareHandler as middleware } from "@izara_project/izara-middleware";
-import Logger from '@izara_project/izara-core-library-logger';
-import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
-
-import <%- functionName %> from './<%- functionName %>_Main.js';
-
-// validate event params in middleware before into function.
-const validatorSchema = {
-  //(<validatorSchema>)
-  //(</validatorSchema>)
-};
-middleware.setValidatorSchema(validatorSchema)
-
-export const main = middleware.wrap(async (event, context, callback) => {
-  event._izContext.logger.debug('Event:', event);
-  event._izContext.logger.debug('context:', context);
-
-  try {
-
-    // invoke LambdaFunction
-    return await <%- functionName %>.<%- functionName %>(
-      event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
-      event,
-      callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
-      //(<additionalParams>)
-      //(</additionalParams>)
-    );
-
-  } catch (err) {
-    event._izContext.logger.error('Error, LambdaFunctionHdrInv: ', err);
-    throw (err);
-  }
-});

package/src/generateCode/generateSchema/rbac/lambda/authInv/mainFunction/template.ejs

@@ -1,42 +0,0 @@
-/*
-Copyright (C) 2020 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 />.
-*/
-
-
-//(<optionalRequire>)
-//(</optionalRequire>)
-
-/**
- * Gets an object by processing storage resources (DynamoDB, Graph)
- * @param {Object} _izContext - Context object with logger
- * @param {Object} requestParams - { objectType, identifiers, additionalParams }
- * @param {Object} callingFlowConfig - Calling flow configuration
- * @returns {Promise<Object>} Collected get result
- */
-export default async function <%- functionName %>(
-  _izContext,
-  requestParams,
-  callingFlowConfig = {}
-
-) {
-  try {
-
-  } catch (err) {
-    _izContext.logger.error('error GetMain:', err);
-    throw err;
-  }
-}