quidproquo-deploy-awscdk 0.0.149 → 0.0.151

package/lib/commonjs/lambdas/lambdaAPIGatewayEvent_redirect.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeAPIGatewayEvent = void 0;
 const executeAPIGatewayEvent = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
-    // console.log('event: ', JSON.stringify(event, null, 2));
-    // console.log('process.env: ', JSON.stringify(process.env, null, 2));
+    console.log('event: ', JSON.stringify(event, null, 2));
+    console.log('process.env: ', JSON.stringify(process.env, null, 2));
     const redirectConfig = JSON.parse(process.env.redirectConfig);
     // For direct urls ~ Go straight to the url
     let redirectUrl = redirectConfig.redirectUrl;
@@ -21,7 +21,7 @@ const executeAPIGatewayEvent = (event, context) => __awaiter(void 0, void 0, voi
         const environment = JSON.parse(process.env.environment);
         const featureEnvironment = JSON.parse(process.env.featureEnvironment || '""');
         let baseDomain = redirectConfig.redirectUrl;
-        if (redirectConfig.addEnvironment) {
+        if (redirectConfig.addEnvironment && environment !== 'production') {
             baseDomain = `${environment}.${baseDomain}`;
         }
         if (redirectConfig.addFeatureEnvironment && featureEnvironment) {
@@ -29,6 +29,15 @@ const executeAPIGatewayEvent = (event, context) => __awaiter(void 0, void 0, voi
         }
         redirectUrl = `https://${baseDomain}${event.path}`;
     }
+    // Add query parameters if they exist
+    const queryParams = event.queryStringParameters;
+    if (queryParams) {
+        const queryString = Object.entries(queryParams)
+            .filter(([, value]) => value !== undefined) // Filter out undefined values
+            .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+            .join('&');
+        redirectUrl += `?${queryString}`;
+    }
     return {
         statusCode: 301,
         body: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.149",
+  "version": "0.0.151",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "types": "./lib/commonjs/index.d.js",

package/src/lambdas/lambdaAPIGatewayEvent_redirect.ts

@@ -2,8 +2,8 @@ import { APIGatewayEvent, Context } from 'aws-lambda';
 import { SubdomainRedirectQPQWebServerConfigSetting } from 'quidproquo-webserver';
 
 export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Context) => {
-  // console.log('event: ', JSON.stringify(event, null, 2));
-  // console.log('process.env: ', JSON.stringify(process.env, null, 2));
+  console.log('event: ', JSON.stringify(event, null, 2));
+  console.log('process.env: ', JSON.stringify(process.env, null, 2));
 
   const redirectConfig: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
     process.env.redirectConfig as string,
@@ -14,18 +14,17 @@ export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Co
 
   // Otherwise it must be a domain redirect
   if (!redirectConfig.redirectUrl.startsWith('http')) {
-    const environment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
-      process.env.environment as string,
-    );
+    const environment: string = JSON.parse(process.env.environment as string);
 
-    const featureEnvironment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
+    const featureEnvironment: string = JSON.parse(
       (process.env.featureEnvironment as string | undefined) || '""',
     );
 
     let baseDomain = redirectConfig.redirectUrl;
-    if (redirectConfig.addEnvironment) {
+    if (redirectConfig.addEnvironment && environment !== 'production') {
       baseDomain = `${environment}.${baseDomain}`;
     }
+
     if (redirectConfig.addFeatureEnvironment && featureEnvironment) {
       baseDomain = `${featureEnvironment}.${baseDomain}`;
     }
@@ -33,6 +32,16 @@ export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Co
     redirectUrl = `https://${baseDomain}${event.path}`;
   }
 
+  // Add query parameters if they exist
+  const queryParams = event.queryStringParameters;
+  if (queryParams) {
+    const queryString = Object.entries(queryParams)
+      .filter(([, value]) => value !== undefined) // Filter out undefined values
+      .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value as string)}`)
+      .join('&');
+    redirectUrl += `?${queryString}`;
+  }
+
   return {
     statusCode: 301,
     body: '',