ag-common 0.0.91 → 0.0.95

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

@@ -0,0 +1,11 @@
+export declare const enforceDynamoProvisionCap: ({ tables, readsMax, writesMax, }: {
+    tables: any[];
+    /**
+     * default 25
+     */
+    readsMax?: number | undefined;
+    /**
+     * default 25
+     */
+    writesMax?: number | undefined;
+}) => void;

package/dist/api/helpers/enforceDynamoProvisionCap.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enforceDynamoProvisionCap = void 0;
+const log_1 = require("../../common/helpers/log");
+const math_1 = require("../../common/helpers/math");
+const string_1 = require("../../common/helpers/string");
+const extractSum = ({ str, regex }) => {
+    var _a;
+    return (0, math_1.sumArray)(((_a = str
+        .match(regex)) === null || _a === void 0 ? void 0 : _a.map((s2) => (0, string_1.trim)(s2.substring(s2.indexOf(':') + 1), ':', ',', ' ')).filter((r) => r && Number(r)).map((r) => Number(r))) || []);
+};
+const enforceDynamoProvisionCap = ({ tables, readsMax = 25, writesMax = 25, }) => {
+    if (!tables || tables.length === 0) {
+        (0, log_1.warn)('error in dynamo FT enforce');
+        return;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const t = tables[0];
+    const s = (0, string_1.safeStringify)(t.node._children.Resource.node.scope);
+    const reads = extractSum({ str: s, regex: /readCapacityUnits.*/gim });
+    const writes = extractSum({ str: s, regex: /writeCapacityUnits.*/gim });
+    if (reads > readsMax) {
+        throw new Error(`dynamo table provisioned reads:${reads} greater than max:${readsMax}`);
+    }
+    if (writes > writesMax) {
+        throw new Error(`dynamo table provisioned writes:${writes} greater than max:${writesMax}`);
+    }
+    (0, log_1.warn)(`dynamo provisioned total: R=${reads} W=${writes}`);
+};
+exports.enforceDynamoProvisionCap = enforceDynamoProvisionCap;

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

@@ -1,6 +1,7 @@
 export * from './api';
 export * from './aws';
 export * from './dynamo';
+export * from './enforceDynamoProvisionCap';
 export * from './dynamoInfra';
 export * from './openApiHelpers';
 export * from './s3';

package/dist/api/helpers/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
 __exportStar(require("./aws"), exports);
 __exportStar(require("./dynamo"), exports);
+__exportStar(require("./enforceDynamoProvisionCap"), exports);
 __exportStar(require("./dynamoInfra"), exports);
 __exportStar(require("./openApiHelpers"), exports);
 __exportStar(require("./s3"), exports);

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

@@ -8,10 +8,14 @@ export declare type NextType<T> = ({ event, body, params, userProfile, lang, }:
     userProfile?: User;
     lang: TLang;
 }) => Promise<APIGatewayProxyResult>;
-export declare function validateOpenApi<T>({ event, next, authorized, schema, COGNITO_USER_POOL_ID, }: {
+export declare function validateOpenApi<T>({ event, next, authorized, schema, COGNITO_USER_POOL_ID, jwksRegion, }: {
     COGNITO_USER_POOL_ID: string;
     schema: any;
     event: APIGatewayEvent;
     next: NextType<T>;
     authorized?: true | false | 'optional';
+    /**
+     * default ap-southeast-2
+     */
+    jwksRegion?: string;
 }): Promise<APIGatewayProxyResult>;

package/dist/api/helpers/validateOpenApi.js

@@ -43,7 +43,7 @@ const getOperation = ({ path, method, resource, schema, }) => {
     const pathParams = (re === null || re === void 0 ? void 0 : re.groups) && JSON.parse(JSON.stringify(re === null || re === void 0 ? void 0 : re.groups));
     return { operation, pathParams };
 };
-function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID, }) {
+function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID, jwksRegion = 'ap-southeast-2', }) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         if (!schema) {
@@ -107,6 +107,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
             ({ error, userProfile } = yield (0, validations_1.getAndValidateToken)({
                 tokenRaw: authHeader,
                 COGNITO_USER_POOL_ID,
+                jwksRegion,
             }));
             if (error) {
                 return error;

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

@@ -2,6 +2,9 @@ import { error } from '../../common/helpers/log';
 import { User } from '../../ui/helpers/jwt';
 import { APIGatewayProxyResult } from '../types';
 export declare const getAndValidateToken: ({ tokenRaw, jwksRegion, COGNITO_USER_POOL_ID, }: {
+    /**
+     * default ap-southeast-2
+     */
     jwksRegion?: string | undefined;
     tokenRaw?: string | undefined;
     COGNITO_USER_POOL_ID: string;

package/dist/api/helpers/validations.js

@@ -65,17 +65,32 @@ const getAndValidateToken = ({ tokenRaw, jwksRegion = 'ap-southeast-2', COGNITO_
     let token = '';
     try {
         if (!tokenRaw) {
-            (0, log_1.error)('no auth headers');
+            const m = 'auth error: no auth headers';
+            (0, log_1.error)(m);
             return {
-                error: (0, api_1.returnCode)(403, 'auth failed'),
+                error: (0, api_1.returnCode)(403, m),
             };
         }
         token = tokenRaw.substring(tokenRaw.indexOf(' ') + 1);
+        if (!token) {
+            const m = 'auth error: no token';
+            (0, log_1.error)(m);
+            return {
+                error: (0, api_1.returnCode)(403, m),
+            };
+        }
         let subject;
         try {
             yield jwtVerify({ token, jwksUri, issuer });
             const decoded = (0, jsonwebtoken_1.decode)(token);
             (0, log_1.debug)(`decoded=${JSON.stringify(decoded, null, 2)}`);
+            if (!decoded.email) {
+                const m = 'auth error, no email';
+                (0, log_1.error)(m);
+                return {
+                    error: (0, api_1.returnCode)(403, m),
+                };
+            }
             subject = decoded === null || decoded === void 0 ? void 0 : decoded.sub;
             if (!subject) {
                 const mess = 'user should have responded with subject (sub) field';
@@ -96,12 +111,6 @@ const getAndValidateToken = ({ tokenRaw, jwksRegion = 'ap-southeast-2', COGNITO_
                 picture,
                 updatedAt: parseInt(`${decoded.auth_time}000`, 10),
             };
-            if (!userProfile || !token || !userProfile.userId) {
-                (0, log_1.error)('auth fail');
-                return {
-                    error: (0, api_1.returnCode)(403, 'auth fail'),
-                };
-            }
             return { token, userProfile };
         }
         catch (e) {
@@ -114,9 +123,10 @@ const getAndValidateToken = ({ tokenRaw, jwksRegion = 'ap-southeast-2', COGNITO_
         }
     }
     catch (e) {
-        (0, log_1.error)('auth error', e);
+        const m = 'auth error:' + JSON.stringify(e, null, 2);
+        (0, log_1.error)(m);
         return {
-            error: (0, api_1.returnCode)(403, 'auth fail'),
+            error: (0, api_1.returnCode)(403, m),
         };
     }
 });

package/dist/common/helpers/string.d.ts

@@ -24,3 +24,10 @@ export declare function toTitleCase(str: string): string;
  */
 export declare function replaceRemove(str: string, ...params: string[]): string;
 export declare function containsInsensitive(str: string, ...args: string[]): boolean;
+/**
+ * safely handles circular references
+ * @param obj
+ * @param indent
+ * @returns
+ */
+export declare const safeStringify: (obj: any, indent?: number) => string;

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsInsensitive = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
+exports.safeStringify = exports.containsInsensitive = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
 const csvJSON = (csv) => {
     const lines = csv.split('\n');
     const result = [];
@@ -117,3 +117,22 @@ function containsInsensitive(str, ...args) {
     return !!args.find((a) => l.includes(a));
 }
 exports.containsInsensitive = containsInsensitive;
+/**
+ * safely handles circular references
+ * @param obj
+ * @param indent
+ * @returns
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const safeStringify = (obj, indent = 2) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let cache = [];
+    const retVal = JSON.stringify(obj, (_key, value) => typeof value === 'object' && value !== null
+        ? cache.includes(value)
+            ? undefined // Duplicate reference found, discard key
+            : cache.push(value) && value // Store value in our collection
+        : value, indent);
+    cache = null;
+    return retVal;
+};
+exports.safeStringify = safeStringify;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.91",
+  "version": "0.0.95",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",