Merge pull request #365 from jaulz/patch-1

fix: hide stage in URL in REST scenario
getlift · Nov 7, 2023 · a91e293 · a91e293
2 parents fc3cfc3 + edb1fd5
commit a91e293
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/constructs/aws/ServerSideWebsite.ts b/src/constructs/aws/ServerSideWebsite.ts
@@ -128,13 +128,17 @@ export class ServerSideWebsite extends AwsConstruct {
                 ? acm.Certificate.fromCertificateArn(this, "Certificate", configuration.certificate)
                 : undefined;
 
+        // Hide the stage in the URL in REST scenario
+        const originPath = configuration.apiGateway === "rest" ? "/" + (provider.getStage() ?? "") : undefined;
+
         this.distribution = new Distribution(this, "CDN", {
             comment: `${provider.stackName} ${id} website CDN`,
             defaultBehavior: {
                 // Origins are where CloudFront fetches content
                 origin: new HttpOrigin(apiGatewayDomain, {
                     // API Gateway only supports HTTPS
                     protocolPolicy: OriginProtocolPolicy.HTTPS_ONLY,
+                    originPath,
                 }),
                 // For a backend app we all all methods
                 allowedMethods: AllowedMethods.ALLOW_ALL,

diff --git a/src/providers/AwsProvider.ts b/src/providers/AwsProvider.ts
@@ -141,6 +141,15 @@ export class AwsProvider implements ProviderInterface {
         return this.serverless.service.provider.vpc ?? null;
     }
 
+    /**
+     * Returns name of the stage.
+     *
+     * @internal
+     */
+    getStage(): string | undefined {
+        return this.serverless.service.provider.stage;
+    }
+
     /**
      * Resolves the value of a CloudFormation stack output.
      */

diff --git a/test/unit/serverSideWebsite.test.ts b/test/unit/serverSideWebsite.test.ts
@@ -260,6 +260,7 @@ describe("server-side website", () => {
                                     [{ Ref: "ApiGatewayRestApi" }, "execute-api.us-east-1.amazonaws.com"],
                                 ],
                             },
+                            OriginPath: "/dev",
                         },
                     ],
                 },
-Original file line number
+Diff line change
@@ Expand Up / @@ -260,6 +260,7 @@ describe("server-side website", () => { @@
                                         [{ Ref: "ApiGatewayRestApi" }, "execute-api.us-east-1.amazonaws.com"],
                                     ],
                                 },
+                                OriginPath: "/dev",
                             },
                         ],
                     },
@@ Expand Down @@