ag-common 0.0.67 → 0.0.71

package/dist/api/helpers/api.d.ts

@@ -2,7 +2,7 @@ import { APIGatewayProxyResult, DYNAMOKEYS } from '../types';
 export declare const returnCode: <T>(statusCode: number, body?: T | undefined, extraHeaders?: {
     [a: string]: string;
 } | undefined, fullSiteUrl?: string | undefined) => APIGatewayProxyResult;
-export declare const stripPKs: <T>(r: T, removePK?: boolean) => T;
+export declare const stripPKs: <T>(r: T, excludePK?: boolean) => T;
 export declare const generateDynamoPKS: ({ type, L1, L2, L3, L4, L5, L6, additionalPKValues, }: {
     type: string;
     L1: string;

package/dist/api/helpers/api.js

@@ -34,7 +34,12 @@ const returnCode = (statusCode, body, extraHeaders, fullSiteUrl) => {
 };
 exports.returnCode = returnCode;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const stripPKs = (r, removePK = true) => {
+const stripPKs = (r, 
+/**
+ * default true
+ * if true, will keep PK
+ */
+excludePK = true) => {
     if (!r) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return null;
@@ -42,7 +47,7 @@ const stripPKs = (r, removePK = true) => {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const { PK, PK1, PK2, PK3, PK4, PK5, L1, L2, L3, L4, L5, L6 } = r, rest = __rest(r, ["PK", "PK1", "PK2", "PK3", "PK4", "PK5", "L1", "L2", "L3", "L4", "L5", "L6"]);
-    if (removePK) {
+    if (!excludePK) {
         //@ts-ignore
         rest.PK = PK;
     }

package/dist/api/helpers/openApiHelpers.d.ts

@@ -11,4 +11,13 @@ export declare const openApiImpl: (p: {
     certificate: certmgr.ICertificate;
     hostedZone: route53.IHostedZone;
     shortStackName: string;
+    /**
+     * defaults:
+     * allowOrigins: apigw.Cors.ALL_ORIGINS,
+      allowHeaders: apigw.Cors.DEFAULT_HEADERS,
+     */
+    cors?: {
+        allowOrigins: string[];
+        allowHeaders: string[];
+    };
 }) => void;

package/dist/api/helpers/openApiHelpers.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.openApiImpl = void 0;
 /* eslint-disable no-new */
 const aws_cdk_lib_1 = require("aws-cdk-lib");
+const __1 = require("../..");
 const distinctBy_1 = require("../../common/helpers/distinctBy");
 const log_1 = require("../../common/helpers/log");
 // eslint-disable-next-line
@@ -11,11 +12,12 @@ const getPaths = (schema) => Object.entries(schema.paths).map(([fullPath, verbs]
     pathList: fullPath.split('/').filter((s) => s),
     verbs: Object.keys(verbs),
 }));
-const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortStackName, }) => {
+const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortStackName, cors = {
+    allowOrigins: aws_cdk_lib_1.aws_apigateway.Cors.ALL_ORIGINS,
+    allowHeaders: aws_cdk_lib_1.aws_apigateway.Cors.DEFAULT_HEADERS,
+}, }) => {
     const api = new aws_cdk_lib_1.aws_apigateway.RestApi(stack, `${shortStackName}-api-${NODE_ENV}`, {
-        defaultCorsPreflightOptions: {
-            allowOrigins: aws_cdk_lib_1.aws_apigateway.Cors.ALL_ORIGINS,
-        },
+        defaultCorsPreflightOptions: Object.assign({}, (cors || {})),
     });
     const dn = new aws_cdk_lib_1.aws_apigateway.DomainName(stack, 'domain', {
         domainName: `api.${baseUrl}`,
@@ -33,7 +35,7 @@ const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortSt
     return api;
 };
 const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
-    const pathCompute = pathV + '-' + verb;
+    const pathCompute = pathV + '/' + verb;
     const lp = lambdaPermissions === null || lambdaPermissions === void 0 ? void 0 : lambdaPermissions[pathCompute];
     if (lp) {
         seenPermissions[pathCompute] = true;
@@ -48,30 +50,25 @@ const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions,
     //
     const readTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.reads) || []), ...((lp === null || lp === void 0 ? void 0 : lp.reads) || [])], (s) => s.shortName);
     const writeTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.writes) || []), ...((lp === null || lp === void 0 ? void 0 : lp.writes) || [])], (s) => s.shortName);
+    const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(__1.notEmpty);
     const tables = [...readTables, ...writeTables];
     const environment = {};
     Object.values(tables).forEach((v) => {
         environment[v.shortName] = v.table.tableName;
     });
-    return { environment, readTables, writeTables };
+    return { environment, readTables, writeTables, policies };
 };
-const addApiPaths = (api, subs, apiRoots) => {
-    let apiPath;
-    subs.forEach((s, i) => {
-        if (i === 0) {
-            if (apiRoots[s]) {
-                apiPath = apiRoots[s];
-            }
-            else {
-                apiPath = api.root.addResource(s);
-                apiRoots[s] = apiPath;
-            }
+const addApiPaths = (api, pathList, apiRoots) => {
+    let pathBuild = '';
+    let apiPath = api.root;
+    pathList.forEach((path) => {
+        pathBuild += '/' + path;
+        if (apiRoots[pathBuild]) {
+            apiPath = apiRoots[pathBuild];
         }
         else {
-            if (!apiPath) {
-                throw new Error('no apipath');
-            }
-            apiPath = apiPath.addResource(s);
+            apiRoots[pathBuild] = apiPath.addResource(path);
+            apiPath = apiRoots[pathBuild];
         }
     });
     if (!apiPath) {
@@ -92,13 +89,14 @@ const openApiImpl = (p) => {
     paths.forEach(({ fullPath, verbs, pathList }) => {
         const apiPath = addApiPaths(api, pathList, apiRoots);
         verbs.forEach((verb) => {
-            const { environment, readTables, writeTables } = getDynamoPermissions({
+            const { environment, readTables, writeTables, policies } = getDynamoPermissions({
                 lambdaPermissions,
                 pathV: fullPath,
                 verb,
                 seenPermissions,
             });
             const lambdaName = lambdaNameSafe(`${p.shortStackName}-${fullPath}-${verb}-${NODE_ENV}`);
+            const entry = `${endpointsBase}${fullPath}/${verb.toUpperCase()}.ts`;
             const lambdaV = new aws_cdk_lib_1.aws_lambda_nodejs.NodejsFunction(stack, lambdaName, {
                 functionName: lambdaName,
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_14_X,
@@ -107,7 +105,7 @@ const openApiImpl = (p) => {
                 memorySize: 128,
                 timeout: aws_cdk_lib_1.Duration.seconds(30),
                 description: '(cdk)',
-                entry: `${endpointsBase}${fullPath}/${verb.toUpperCase()}.ts`,
+                entry: entry,
                 bundling: {
                     externalModules: ['aws-sdk', 'aws-lambda'],
                 },
@@ -116,6 +114,7 @@ const openApiImpl = (p) => {
             });
             readTables.forEach((t) => t.table.grantReadData(lambdaV));
             writeTables.forEach((t) => t.table.grantReadWriteData(lambdaV));
+            policies.forEach((p1) => lambdaV.addToRolePolicy(p1));
             //
             apiPath.addMethod(verb.toUpperCase(), new aws_cdk_lib_1.aws_apigateway.LambdaIntegration(lambdaV, {}));
         });

package/dist/api/types/index.d.ts

@@ -1,4 +1,4 @@
-import { aws_dynamodb as dynamodb } from 'aws-cdk-lib';
+import { aws_dynamodb as dynamodb, aws_iam as iam } from 'aws-cdk-lib';
 import { Key } from './aws';
 export interface DYNAMOKEYS {
     type: string;
@@ -21,10 +21,12 @@ export interface ILambdaPermissions {
     [pathHyphenVerb: string]: {
         reads?: IGeneratedDynamoData[];
         writes?: IGeneratedDynamoData[];
+        policies?: iam.PolicyStatement[];
     } & {
         default?: {
             reads?: IGeneratedDynamoData[];
             writes?: IGeneratedDynamoData[];
+            policies?: iam.PolicyStatement[];
         };
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.67",
+  "version": "0.0.71",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -13,10 +13,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.7.0",
-    "aws-sdk": "2.1056.0",
+    "aws-cdk-lib": "2.8.0",
+    "aws-sdk": "2.1058.0",
     "axios": "0.24.0",
-    "constructs": "10.0.32",
+    "constructs": "10.0.36",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
     "openapi-request-validator": "10.0.0",
@@ -27,8 +27,8 @@
     "typescript": "4.5.4"
   },
   "devDependencies": {
-    "@types/jsonwebtoken": "8.5.7",
-    "@types/node": "17.0.8",
+    "@types/jsonwebtoken": "8.5.8",
+    "@types/node": "17.0.9",
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
     "@types/styled-components": "5.1.20",