rewire request urls

Author: lukqw

packages/frontend/src/config.tsx

@@ -1,28 +1,13 @@
-const turnToPreviewUrl = (url: string) => {
-  // Define a regular expression to match the required parts of the input URL
-  const regex = /^https:\/\/([a-zA-Z0-9-]+)\.execute-api\.localhost\.localstack\.cloud:(\d+)\/([^\/]+)\/(.+)$/;
+const getOrigin = () => {
+    const origin = window.location.origin;
+    if (origin.indexOf('localhost') !== -1) {
+        return 'http://localhost:4566';
+    }
+    return origin;
+}
 
-  // Use the regex to capture the relevant parts of the input URL
-  const matches = url.match(regex);
 
-  // Check if the URL matches the expected pattern
-  if (matches && matches.length === 5) {
-    const apiId = matches[1];
-    const port = matches[2];
-    const stage = matches[3];
-    const path = matches[4];
-
-    // Construct the transformed URL
-    const transformedUrl = `http://${window.location.origin}/restapis/${apiId}/${stage}/_user_request_/${path}`;
-
-    return transformedUrl;
-  } else {
-    // If the input URL doesn't match the expected pattern, return an error message
-    return 'Invalid input URL';
-  }
-};
-
-export const GATEWAY_URL = turnToPreviewUrl(import.meta.env.VITE_GATEWAY_URL);
+export const GATEWAY_URL = `${getOrigin()}/restapis/${import.meta.env.VITE_GATEWAY_ID}/prod/_user_request_/`;
 export const  MAX_FILE_SIZE = 500000;
 export const  FILES_BUCKET = import.meta.env.VITE_FILES_BUCKET;
 export const REGION = import.meta.env.VITE_REGION;

packages/infra/cdk/aws-sdk-js-notes-app-stack.ts

@@ -142,7 +142,7 @@ export class AwsSdkJsNotesAppStack extends Stack {
     });
 
     new CfnOutput(this, "FilesBucket", { value: filesBucket.bucketName });
-    new CfnOutput(this, "GatewayUrl", { value: api.url });
+    new CfnOutput(this, "GatewayId", { value: api.restApiId });
     new CfnOutput(this, "IdentityPoolId", { value: identityPool.ref });
     new CfnOutput(this, "Region", { value: this.region });
     new CfnOutput(this, "FrontendDistributionId", { value: distribution.distributionId });

packages/scripts/populate-frontend-config.js

@@ -35,7 +35,7 @@ const isLocal = process.argv.includes("--local");
     ];
     const envContent = `
     VITE_FILES_BUCKET=${cdkOutput.FilesBucket}
-    VITE_GATEWAY_URL=${cdkOutput.GatewayUrl}
+    VITE_GATEWAY_ID=${cdkOutput.GatewayId}
     VITE_IDENTITY_POOL_ID=${cdkOutput.IdentityPoolId}
     VITE_REGION=${cdkOutput.Region}
     VITE_BASE_URL=/cloudfront/${cdkOutput.FrontendDistributionId}/