@infoxchange/make-it-so 2.11.0-internal-testing-vdt-199-add-auth-token-verify-function-2.2 → 2.11.0-internal-testing-vdt-199-add-auth-token-verify-function-2.4

package/dist/cdk-constructs/SiteOidcAuth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/SiteOidcAuth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,GAAG,MAAM,aAAa,CAAC;AAE9B,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AAOtC,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9D,MAAM,MAAM,KAAK,GAAG;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAIjD,qBAAa,YAAa,SAAQ,SAAS;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAER,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK;IAQhE,oBAAoB,CAAC,SAAS,SAAS,uBAAuB,EAC5D,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,SAAS,EACpB,EAAE,MAA+B,EAAE,GAAE,cAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4C1D,iBAAiB,CAAC,SAAS,SAAS,uBAAuB,EACzD,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,SAAS,EACpB,EAAE,MAA+B,EAAE,GAAE,cAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqC1D,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,yCAAyC;IAejD,OAAO,CAAC,sBAAsB;CAiF/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/SiteOidcAuth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,GAAG,MAAM,aAAa,CAAC;AAE9B,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AAOtC,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9D,MAAM,MAAM,KAAK,GAAG;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAIjD,qBAAa,YAAa,SAAQ,SAAS;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAER,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK;IAQhE,oBAAoB,CAAC,SAAS,SAAS,uBAAuB,EAC5D,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,SAAS,EACpB,EAAE,MAA+B,EAAE,GAAE,cAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4C1D,iBAAiB,CAAC,SAAS,SAAS,uBAAuB,EACzD,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,SAAS,EACpB,EAAE,MAA+B,EAAE,GAAE,cAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqC1D,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,yCAAyC;IAmBjD,OAAO,CAAC,sBAAsB;CAiF/B"}

package/dist/cdk-constructs/SiteOidcAuth/index.js

@@ -94,6 +94,7 @@ export class SiteOidcAuth extends Construct {
     // Get the CloudFront Function Association for auth checking
     // Roughly based off https://github.com/sst/v2/blob/4283d706f251724308b397996ff307929bf3a976/packages/sst/src/constructs/SsrSite.ts#L941
     getFunctionAssociation(scope, jwtSecret, authRoutePrefix) {
+        console.log("---- 1");
         const authCheckFunction = new CloudFront.Function(scope, `${this.id}AuthCheckFunction`, {
             code: CloudFront.FunctionCode.fromInline(this.convertToCloudFrontFunctionCompatibleCode(`function handler(event) {
               var request = event.request;
@@ -103,6 +104,7 @@ export class SiteOidcAuth extends Construct {
             // We could specify the JS v2.0 runtime here but for SSR sites SST does the function creation and that currently
             // uses JS v1.0 so no point using v2.0 here as the code has to be compatible with v1.0 anyway.
         });
+        console.log("---- 2");
         return {
             function: authCheckFunction,
             eventType: CloudFront.FunctionEventType.VIEWER_REQUEST,
@@ -119,7 +121,11 @@ export class SiteOidcAuth extends Construct {
         // JS runtime 1.0.
         sourceCode = sourceCode
             .replaceAll(/const /g, "var ")
-            .replaceAll(/let /g, "var ");
+            .replaceAll(/let /g, "var ")
+            // When typescript builds the make-it-so code including it may add an "export {}" at the end to make it a module.
+            // This will cause a syntax error in CloudFront Functions so remove it here.
+            .replace(/export {};\s*$/g, "");
+        console.log("---- 3", sourceCode);
         return transformSync(sourceCode, {
             minify: true,
             target: "es5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "2.11.0-internal-testing-vdt-199-add-auth-token-verify-function-2.2",
+  "version": "2.11.0-internal-testing-vdt-199-add-auth-token-verify-function-2.4",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "type": "module",

package/src/cdk-constructs/SiteOidcAuth/index.ts

@@ -149,6 +149,7 @@ export class SiteOidcAuth extends Construct {
     jwtSecret: SecretsManager.Secret,
     authRoutePrefix: string,
   ): CloudFront.FunctionAssociation {
+    console.log("---- 1")
     const authCheckFunction = new CloudFront.Function(
       scope,
       `${this.id}AuthCheckFunction`,
@@ -166,6 +167,7 @@ export class SiteOidcAuth extends Construct {
         // uses JS v1.0 so no point using v2.0 here as the code has to be compatible with v1.0 anyway.
       },
     );
+    console.log("---- 2")
 
     return {
       function: authCheckFunction,
@@ -196,7 +198,11 @@ export class SiteOidcAuth extends Construct {
     // JS runtime 1.0.
     sourceCode = sourceCode
       .replaceAll(/const /g, "var ")
-      .replaceAll(/let /g, "var ");
+      .replaceAll(/let /g, "var ")
+      // When typescript builds the make-it-so code including it may add an "export {}" at the end to make it a module.
+      // This will cause a syntax error in CloudFront Functions so remove it here.
+      .replace(/export {};\s*$/g, "");
+    console.log("---- 3", sourceCode)
     return transformSync(sourceCode, {
       minify: true,
       target: "es5",