ag-common 0.0.356 → 0.0.358

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

@@ -47,3 +47,25 @@ export declare const deleteFiles: ({ Bucket, Keys, }: {
     error?: string;
 }>;
 export declare function listFiles(bucketName: string): Promise<string[]>;
+/**
+ * allow uploading of file directly to s3
+ * @param param0
+ *
+ * @returns url to POST to, and fields to send, eg
+ * formData.append('Content-Type', file.type);
+      Object.entries(fields).forEach(([k, v]) => {
+        formData.append(k, v);
+      });
+
+      formData.append('file', file);
+      fetch.POST(url,formData)
+ */
+export declare function getPresignedPostURL({ bucket, key, maxMb, }: {
+    bucket: string;
+    key: string;
+    /** max filesize. default 5 */
+    maxMb?: number;
+}): Promise<{
+    url: string;
+    fields: Record<string, string>;
+}>;

package/dist/api/helpers/s3.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listFiles = exports.deleteFiles = exports.deleteFile = exports.uploadFile = exports.putS3Object = exports.getS3Objects = exports.getS3Object = exports.setS3 = void 0;
+exports.getPresignedPostURL = exports.listFiles = exports.deleteFiles = exports.deleteFile = exports.uploadFile = exports.putS3Object = exports.getS3Objects = exports.getS3Object = exports.setS3 = void 0;
 const s3_1 = __importDefault(require("aws-sdk/clients/s3"));
 const log_1 = require("../../common/helpers/log");
 const array_1 = require("../../common/helpers/array");
@@ -139,3 +139,34 @@ function listFiles(bucketName) {
     });
 }
 exports.listFiles = listFiles;
+/**
+ * allow uploading of file directly to s3
+ * @param param0
+ *
+ * @returns url to POST to, and fields to send, eg
+ * formData.append('Content-Type', file.type);
+      Object.entries(fields).forEach(([k, v]) => {
+        formData.append(k, v);
+      });
+
+      formData.append('file', file);
+      fetch.POST(url,formData)
+ */
+function getPresignedPostURL({ bucket, key, maxMb = 5, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ps = yield s3.createPresignedPost({
+            Bucket: bucket,
+            Fields: {
+                Key: key,
+            },
+            Expires: 600,
+            Conditions: [
+                ['content-length-range', 0, maxMb * 1049000],
+                ['starts-with', '$Content-Type', 'image/'],
+            ],
+        });
+        const fields = JSON.parse(JSON.stringify(ps.fields));
+        return { fields, url: ps.url };
+    });
+}
+exports.getPresignedPostURL = getPresignedPostURL;

package/dist/api/helpers/validateOpenApi.js

@@ -44,7 +44,7 @@ const getOperation = ({ path, method, resource, schema, }) => {
     return { operation, pathParams };
 };
 function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID, jwksRegion = 'ap-southeast-2', getAndValidateTokenOverride, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         if (!schema) {
             throw new Error('schema undefined!');
@@ -86,13 +86,15 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
         else {
             try {
                 request.params = opm.pathParams;
-                (0, log_1.info)('req=', JSON.stringify(request, null, 2));
+                (0, log_1.info)('req=', JSON.stringify(Object.assign(Object.assign({}, request), { body: ((_b = (_a = request.body) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 2000
+                        ? '(truncating long body)'
+                        : request.body }), null, 2));
                 const resp = new openapi_request_validator_1.default(Object.assign(Object.assign({}, opm.operation), { schemas: schema.components.schemas })).validateRequest(request);
                 if (resp) {
                     (0, log_1.warn)('bad request');
                     (0, log_1.warn)('opm=', JSON.stringify(opm, null, 2));
                     (0, log_1.warn)('resp=', JSON.stringify(resp, null, 2));
-                    return (0, api_1.returnCode)(400, `error:${(_b = (_a = resp === null || resp === void 0 ? void 0 : resp.errors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.message}`);
+                    return (0, api_1.returnCode)(400, `error:${(_d = (_c = resp === null || resp === void 0 ? void 0 : resp.errors) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message}`);
                 }
                 (0, log_1.debug)(`validated request:`, event.path);
             }
@@ -102,7 +104,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
         }
         let userProfile;
         let error;
-        const authHeader = ((_c = event.headers) === null || _c === void 0 ? void 0 : _c.Authorization) || ((_d = event.headers) === null || _d === void 0 ? void 0 : _d.authorization);
+        const authHeader = ((_e = event.headers) === null || _e === void 0 ? void 0 : _e.Authorization) || ((_f = event.headers) === null || _f === void 0 ? void 0 : _f.authorization);
         if (authorized === true || (authorized === 'optional' && authHeader)) {
             const vf = getAndValidateTokenOverride !== null && getAndValidateTokenOverride !== void 0 ? getAndValidateTokenOverride : validations_1.getAndValidateToken;
             ({ error, userProfile } = yield vf({
@@ -120,7 +122,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
             event,
             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 : ''),
+            lang: (0, i18n_1.getValidatedLang)((_g = event.headers['x-lang']) !== null && _g !== void 0 ? _g : ''),
         });
         return res;
     });

package/package.json

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