Feat/passed context type converters

index.js

@@ -219,6 +219,12 @@ function createRequest(event, resource) {
 };
 
 
+const typeConverters = {
+	number: (value) => parseFloat(value),
+	int: (value) => parseInt(value, 10),
+	boolean: (value) => value === 'true' || value === '1',
+}
+
 function getPassedContext(event, body) {
 	body = body || event.body || {};
 	if (typeof body === 'string') {
@@ -232,17 +238,42 @@ function getPassedContext(event, body) {
 		(ctx, [key, value]) => {
 			let k;
 			if ((k = key.match(/^ctx[_-](.*)$/))) {
+
+				// Check for any type conversions on the query parameter
+				let type = event.queryStringParameters["t_" + key];
+				let converter = typeConverters[type];
+				if (converter) {
+					value = converter(value);					
+				}
 				ctx[k[1]] = value;
 			}
 			return ctx;
 		},
 		body._context || {}
 	);
+
+	// Multi value query parameters support (arrays) this is the default for HTTP requests to the API Gateway
+	if(event.multiValueQueryStringParameters) { 
+		Object.entries(event.multiValueQueryStringParameters).forEach(([key, values]) => {
+			let k;
+			if ((k = key.match(/^ctx[_-](.*)$/))) {
+
+				let type = event.multiValueQueryStringParameters["t_" + key];
+				let converter = typeConverters[type];
+				if (converter) {
+					values = values.map(v => converter(v));
+				}
+				context[k[1]] = values;
+			}
+		});
+	}
 	//delete body._context;
 	return context;
 }
 
 module.exports = {
+	typeConverters,
+	getPassedContext,
 	configuration: {
 		LeoAuth: AUTH_TABLE,
 		LeoAuthUser: USER_TABLE
@@ -276,7 +307,8 @@ module.exports = {
 				context: Object.assign(passedContext, {
 					key: id.identity.caller
 				}),
-				identities: ["role/aws_key"]
+				//prepend possible other passed in identities
+				identities: (Array.isArray(passedContext.identities) ? passedContext.identities.concat(["role/aws_key"]) : ["role/aws_key"])
 			});
 		} else {
 			if (id && id.identity) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "leo-auth",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Auth sdk",
   "homepage": "https://leoplatform.io",
   "main": "index.js",

test/index.utest.ts

@@ -228,6 +228,67 @@ describe('index', function () {
 				assert.deepEqual(user.identities, ["awesome-again"]);
 				assert.deepEqual(user.identity_id, "cognitoId-1234");
 			});
+
+			it("get user - custom querystring context with types", async () => {
+
+				let sdk = require("..");
+				let user = await sdk.getUser({
+					queryStringParameters: {
+						ctx_account: "98765",
+						"ctx-value": 3453,
+						ctx_account_id: "12345678910",
+						t_ctx_account_id: "int",
+						ctx_float_value: "1.23456789",
+						t_ctx_float_value: "number",
+						ctx_boolean_value: "true",
+						t_ctx_boolean_value: "boolean",
+						ctx_boolean_value_false: "false",
+						t_ctx_boolean_value_false: "boolean",
+						ctx_invalid_type: "test123",
+						t_ctx_invalid_type: "scalar",
+					},
+					requestContext: {
+						identity: {
+							caller: "identity-1234"
+						}
+					}
+				});
+
+				assert.deepEqual(user.context, { key: "identity-1234", account: "98765", value: 3453, account_id: 12345678910, float_value: 1.23456789, boolean_value: true, boolean_value_false: false, invalid_type: "test123" });
+			});
+
+			it("get user - custom multiValueQueryStringParameters with types", async() => {
+				let sdk = require("..");
+				let user = await sdk.getUser({
+					multiValueQueryStringParameters: {
+						ctx_array: ["1", "2"],
+						t_ctx_array: "int",
+						ctx_array_invalid: ["test123", "test456"],
+						t_ctx_array_invalid: "scalar"
+					},
+					requestContext: {
+						identity: {
+							caller: "identity-1234"
+						}
+					}
+				});
+				assert.deepEqual(user.context, { key: "identity-1234", array: [1, 2], array_invalid: ["test123", "test456"] });
+			});
+
+			it("get user - custom identities", async() => {
+				let sdk = require("..");
+				let user = await sdk.getUser({
+					requestContext: {
+						identity: {
+							caller: "identity-1234"
+						}
+					},
+					multiValueQueryStringParameters: {
+						ctx_identities: ["role/test2", "role/test3"]
+					}
+				});
+				assert.deepEqual(user.identities, [ "role/test2", "role/test3", "role/aws_key" ]);
+			});
 		});
 
 		describe("auth user", () => {