ag-common 0.0.83 → 0.0.87

package/dist/api/helpers/openApiHelpers.js

@@ -34,7 +34,8 @@ const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortSt
     });
     return api;
 };
-const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
+const setupLambda = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
+    var _a, _b, _c, _d;
     const pathCompute = pathV + '/' + verb;
     const lp = lambdaPermissions === null || lambdaPermissions === void 0 ? void 0 : lambdaPermissions[pathCompute];
     if (lp) {
@@ -48,11 +49,12 @@ const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions,
         seenPermissions.default = true;
     }
     //
-    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 readTables = (0, distinctBy_1.distinctBy)([...(((_a = def === null || def === void 0 ? void 0 : def.dynamo) === null || _a === void 0 ? void 0 : _a.reads) || []), ...(((_b = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _b === void 0 ? void 0 : _b.reads) || [])], (s) => s.shortName);
+    const writeTables = (0, distinctBy_1.distinctBy)([...(((_c = def === null || def === void 0 ? void 0 : def.dynamo) === null || _c === void 0 ? void 0 : _c.writes) || []), ...(((_d = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _d === void 0 ? void 0 : _d.writes) || [])], (s) => s.shortName);
     const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(__1.notEmpty);
+    const env = Object.assign(Object.assign({}, (def.env || {})), ((lp === null || lp === void 0 ? void 0 : lp.env) || {}));
     const tables = [...readTables, ...writeTables];
-    const environment = {};
+    const environment = env;
     Object.values(tables).forEach((v) => {
         environment[v.shortName] = v.table.tableName;
     });
@@ -89,7 +91,7 @@ const openApiImpl = (p) => {
     paths.forEach(({ fullPath, verbs, pathList }) => {
         const apiPath = addApiPaths(api, pathList, apiRoots);
         verbs.forEach((verb) => {
-            const { environment, readTables, writeTables, policies } = getDynamoPermissions({
+            const { environment, readTables, writeTables, policies } = setupLambda({
                 lambdaPermissions,
                 pathV: fullPath,
                 verb,

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

@@ -13,3 +13,12 @@ export declare const putS3Object: ({ Body, Bucket, Key, ContentType, }: {
     Bucket: string;
     Key: string;
 }) => Promise<void>;
+export declare const uploadFile: ({ Bucket, Key, Body, }: {
+    Bucket: string;
+    Key: string;
+    Body: string;
+}) => Promise<string>;
+export declare const deleteFile: ({ Bucket, Key, }: {
+    Bucket: string;
+    Key: string;
+}) => Promise<void>;

package/dist/api/helpers/s3.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.putS3Object = exports.getS3Object = exports.setS3 = void 0;
+exports.deleteFile = exports.uploadFile = exports.putS3Object = exports.getS3Object = exports.setS3 = void 0;
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 let s3 = new aws_sdk_1.default.S3();
 const setS3 = (region) => {
@@ -35,3 +35,15 @@ const putS3Object = ({ Body, Bucket, Key, ContentType, }) => __awaiter(void 0, v
         .promise();
 });
 exports.putS3Object = putS3Object;
+const uploadFile = ({ Bucket, Key, Body, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield s3.upload({ Bucket, Key, Body }).promise();
+    return res.Location;
+});
+exports.uploadFile = uploadFile;
+const deleteFile = ({ Bucket, Key, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield s3.deleteObject({ Bucket, Key }).promise();
+    if (res.$response.error) {
+        throw res.$response.error;
+    }
+});
+exports.deleteFile = deleteFile;

package/dist/api/helpers/validateOpenApi.js

@@ -58,7 +58,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             params: undefined,
             query: event.queryStringParameters,
-            body: event.body && JSON.parse(event.body),
+            body: (0, object_1.tryJsonParse)(event.body, event.body),
             headers: (0, object_1.objectKeysToLowerCase)(event === null || event === void 0 ? void 0 : event.headers),
         };
         const method = event.requestContext.httpMethod.toLowerCase();
@@ -116,7 +116,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
         const res = yield next({
             params,
             event,
-            body: (event.body && JSON.parse(event.body)),
+            body: (0, object_1.tryJsonParse)(event.body, event.body),
             userProfile,
             lang: (0, i18n_1.getValidatedLang)((_e = event.headers['x-lang']) !== null && _e !== void 0 ? _e : ''),
         });

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

@@ -17,17 +17,17 @@ export interface IGeneratedDynamoData {
     table: dynamodb.ITable;
     shortName: string;
 }
-export interface ILambdaPermissions {
-    [pathHyphenVerb: string]: {
+export interface ILambdaPermission {
+    dynamo?: {
         reads?: IGeneratedDynamoData[];
         writes?: IGeneratedDynamoData[];
-        policies?: iam.PolicyStatement[];
-    } & {
-        default?: {
-            reads?: IGeneratedDynamoData[];
-            writes?: IGeneratedDynamoData[];
-            policies?: iam.PolicyStatement[];
-        };
+    };
+    policies?: iam.PolicyStatement[];
+    env?: Record<string, string>;
+}
+export interface ILambdaPermissions {
+    [pathHyphenVerb: string]: ILambdaPermission & {
+        default?: ILambdaPermission;
     };
 }
 export interface IQueryDynamo {

package/dist/ui/helpers/types.d.ts

@@ -10,4 +10,5 @@ export interface ICallOpenApi<T, TDefaultApi> {
     logout: () => void;
     refreshToken: () => Promise<User | undefined>;
     newDefaultApi: (config: any) => TDefaultApi;
+    disabled?: boolean;
 }

package/dist/ui/helpers/useCallOpenApi.js

@@ -34,7 +34,7 @@ const useCallOpenApi = (p) => {
             });
         }
         const { error, loaded, loading, loadcount } = data;
-        if (loaded || loading || (error && loadcount < 2)) {
+        if (p.disabled || loaded || loading || (error && loadcount < 2)) {
             return;
         }
         setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.83",
+  "version": "0.0.87",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -13,7 +13,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "aws-sdk": "2.1060.0",
+    "aws-sdk": "2.1062.0",
     "axios": "0.25.0",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
@@ -31,7 +31,7 @@
     "@types/node": "17.0.10",
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
-    "@types/styled-components": "5.1.20",
+    "@types/styled-components": "5.1.21",
     "@typescript-eslint/eslint-plugin": "5.10.0",
     "@typescript-eslint/parser": "5.10.0",
     "eslint": "8.7.0",