idea-aws 3.13.4 → 3.13.7

package/dist/src/resourceController.d.ts

@@ -9,6 +9,7 @@ import { GenericController, GenericControllerOptions } from './genericController
 export declare abstract class ResourceController extends GenericController {
     protected event: APIGatewayProxyEventV2 | APIGatewayProxyEvent;
     protected callback: Callback;
+    protected initError: boolean;
     protected authorization: string;
     protected claims: any;
     protected principalId: string;
@@ -31,6 +32,10 @@ export declare abstract class ResourceController extends GenericController {
     constructor(event: APIGatewayProxyEventV2 | APIGatewayProxyEvent, callback: Callback, options?: ResourceControllerOptions);
     private initFromEventV2;
     private initFromEventV1;
+    /**
+     * Force the parsing of a query parameter as an array of strings.
+     */
+    protected getQueryParamAsArray(paramName: string): string[];
     handleRequest: () => Promise<void>;
     private controlHandlerError;
     protected done(err: any, res?: any, statusCode?: number): void;

package/dist/src/resourceController.js

@@ -13,12 +13,15 @@ const genericController_1 = require("./genericController");
 class ResourceController extends genericController_1.GenericController {
     constructor(event, callback, options = {}) {
         super(event, callback, options);
+        this.initError = false;
         this.logger = new logger_1.Logger();
         this.templateMatcher = /{{\s?([^{}\s]*)\s?}}/g;
         ///
         /// REQUEST HANDLERS
         ///
         this.handleRequest = async () => {
+            if (this.initError)
+                return;
             try {
                 await this.checkAuthBeforeRequest();
                 try {
@@ -85,24 +88,30 @@ class ResourceController extends genericController_1.GenericController {
         };
         this.event = event;
         this.callback = callback;
-        if (event.version === '2.0')
-            this.initFromEventV2(event, options);
-        else
-            this.initFromEventV1(event, options);
-        this.logRequestsWithKey = options.logRequestsWithKey;
-        // acquire some info about the client, if available
-        let version = '?', platform = '?';
-        if (this.queryParams['_v']) {
-            version = this.queryParams['_v'];
-            delete this.queryParams['_v'];
+        try {
+            if (event.version === '2.0')
+                this.initFromEventV2(event, options);
+            else
+                this.initFromEventV1(event, options);
+            this.logRequestsWithKey = options.logRequestsWithKey;
+            // acquire some info about the client, if available
+            let version = '?', platform = '?';
+            if (this.queryParams['_v']) {
+                version = this.queryParams['_v'];
+                delete this.queryParams['_v'];
+            }
+            if (this.queryParams['_p']) {
+                platform = this.queryParams['_p'];
+                delete this.queryParams['_p'];
+            }
+            // print the initial log
+            const info = { principalId: this.principalId, queryParams: this.queryParams, body: this.body, version, platform };
+            this.logger.info(`START: ${this.httpMethod} ${this.path}`, info);
         }
-        if (this.queryParams['_p']) {
-            platform = this.queryParams['_p'];
-            delete this.queryParams['_p'];
+        catch (err) {
+            this.initError = true;
+            this.done(this.controlHandlerError(err, 'INIT-ERROR', 'Malformed request'));
         }
-        // print the initial log
-        const info = { principalId: this.principalId, queryParams: this.queryParams, body: this.body, version, platform };
-        this.logger.info(`START: ${this.httpMethod} ${this.path}`, info);
     }
     initFromEventV2(event, options) {
         this.authorization = event.headers.authorization;
@@ -119,7 +128,12 @@ class ResourceController extends genericController_1.GenericController {
             this.pathParameters[param] = event.pathParameters[param] ? decodeURIComponent(event.pathParameters[param]) : null;
         this.resourceId = this.pathParameters[options.resourceId || 'proxy'];
         this.queryParams = event.queryStringParameters || {};
-        this.body = (event.body ? JSON.parse(event.body) : {}) || {};
+        try {
+            this.body = (event.body ? JSON.parse(event.body) : {}) || {};
+        }
+        catch (error) {
+            throw new RCError('Malformed body');
+        }
     }
     initFromEventV1(event, options) {
         this.authorization = event.headers.Authorization;
@@ -135,7 +149,23 @@ class ResourceController extends genericController_1.GenericController {
             this.pathParameters[param] = event.pathParameters[param] ? decodeURIComponent(event.pathParameters[param]) : null;
         this.resourceId = this.pathParameters[options.resourceId || 'proxy'];
         this.queryParams = event.queryStringParameters || {};
-        this.body = (event.body ? JSON.parse(event.body) : {}) || {};
+        try {
+            this.body = (event.body ? JSON.parse(event.body) : {}) || {};
+        }
+        catch (error) {
+            throw new RCError('Malformed body');
+        }
+    }
+    /**
+     * Force the parsing of a query parameter as an array of strings.
+     */
+    getQueryParamAsArray(paramName) {
+        if (!this.queryParams[paramName])
+            return [];
+        else if (Array.isArray(this.queryParams[paramName]))
+            return this.queryParams[paramName];
+        else
+            return String(this.queryParams[paramName]).split(',');
     }
     controlHandlerError(err = {}, context, replaceWithErrorMessage) {
         if (err instanceof RCError)

package/dist/src/s3.js

@@ -72,7 +72,7 @@ class S3 {
      * Get an object from a S3 bucket.
      */
     async getObject(options) {
-        logger.debug(`S3 get object: ${options.type}`);
+        logger.debug(`S3 get object: ${options.key}`);
         const result = await this.s3.getObject({ Bucket: options.bucket, Key: options.key }).promise();
         switch (options.type) {
             case GetObjectTypes.JSON:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idea-aws",
-  "version": "3.13.4",
+  "version": "3.13.7",
   "description": "AWS wrappers to use in IDEA's back-ends",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",