@infoxchange/make-it-so 2.10.0-internal-testing-vdt-199-add-oidc-auth.5 → 2.10.0-internal-testing-vdt-199-add-oidc-auth.6

package/dist/cdk-constructs/CloudWatchOidcAuth/auth-check.d.ts

@@ -1,10 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
-export declare const handler: (event: AWSCloudFrontFunction.Event, context: AWSCloudFrontFunction.Context) => Promise<{
-    statusCode: number;
-    headers: {
-        location: {
-            value: string;
-        };
-    };
-} | AWSCloudFrontFunction.Request>;
+export {};
 //# sourceMappingURL=auth-check.d.ts.map

package/dist/cdk-constructs/CloudWatchOidcAuth/auth-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-check.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudWatchOidcAuth/auth-check.ts"],"names":[],"mappings":";AA8FA,eAAO,MAAM,OAAO,UAAiB,2BAA2B,WAAW,sBAAsB,OAAO;;;;;;;kCAkCvG,CAAA"}
+{"version":3,"file":"auth-check.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudWatchOidcAuth/auth-check.ts"],"names":[],"mappings":""}

package/dist/cdk-constructs/CloudWatchOidcAuth/auth-check.js

@@ -1,4 +1,6 @@
 // Based off: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/example_cloudfront_functions_kvs_jwt_verify_section.html
+// Note that as a CloudFront Function, this code has limitations compared to a Lambda@Edge function.
+// For example, no external libraries can be used, and the runtime is more limited.
 import crypto from "crypto";
 import cf from "cloudfront";
 //Response when JWT is not valid.
@@ -73,7 +75,7 @@ function _sign(input, key, method) {
 function _base64urlDecode(str) {
     return Buffer.from(str, "base64url").toString();
 }
-export const handler = async (event, context) => {
+async function handler(event, context) {
     console.log("🟢 Auth check event:", event);
     console.log("🔵 Auth check context:", context);
     const request = event.request;
@@ -85,7 +87,7 @@ export const handler = async (event, context) => {
     // console.log(request.cookies);
     // console.log(request.cookies["auth-token"]);
     // console.log(Object.keys(request.cookies));
-    const jwtToken = request.cookies["auth-token"]?.value;
+    const jwtToken = request.cookies["auth-token"] && request.cookies["auth-token"].value;
     console.log("jwtToken:", jwtToken);
     // console.log(Object.keys(request.cookies));
     // If no JWT token, then generate HTTP redirect 401 response.
@@ -104,7 +106,7 @@ export const handler = async (event, context) => {
     // delete request.querystring.jwt;
     log("Valid JWT token");
     return request;
-};
+}
 // Get secret from key value store
 async function getSecret() {
     try {
@@ -116,8 +118,13 @@ async function getSecret() {
         return null;
     }
 }
-const log = (...args) => {
+const log = function () {
     if (loggingEnabled) {
-        console.log(...args);
+        // @ts-expect-error We can't use spread or rest parameters in CloudFront Functions
+        // eslint-disable-next-line prefer-spread, prefer-rest-params
+        console.log.apply(console, arguments);
     }
 };
+// This serves no purpose other than to make TypeScript and eslint happy by showing that that handler is used. We can't
+// export handler as an alterative because CloudFront Functions don't support exports.
+handler;

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

@@ -126,7 +126,7 @@ export class CloudWatchOidcAuth extends Construct {
             throw new Error("Could not find the underlying Lambda function of the AwsCustomResource");
         }
         fn.addEnvironment("NODE_OPTIONS", "--require=@aws-sdk/signature-v4-crt");
-        const edgeFuncAuthCheck = new CloudFront.Function(scope, `${this.id}EdgeFunctionAuthCheck`, {
+        const edgeFuncAuthCheck = new CloudFront.Function(scope, `${this.id}AuthCheckFunction`, {
             code: CloudFront.FunctionCode.fromInline(fs.readFileSync(path.join(import.meta.dirname, "auth-check.js"), "utf8").replace("__placeholder-for-jwt-secret-key__", key)),
             runtime: CloudFront.FunctionRuntime.JS_2_0,
             keyValueStore: cfKeyValueStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infoxchange/make-it-so",
-  "version": "2.10.0-internal-testing-vdt-199-add-oidc-auth.5",
+  "version": "2.10.0-internal-testing-vdt-199-add-oidc-auth.6",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "type": "module",

package/src/cdk-constructs/CloudWatchOidcAuth/auth-check.ts

@@ -1,4 +1,7 @@
 // Based off: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/example_cloudfront_functions_kvs_jwt_verify_section.html
+// Note that as a CloudFront Function, this code has limitations compared to a Lambda@Edge function.
+// For example, no external libraries can be used, and the runtime is more limited.
+
 
 import crypto from "crypto";
 import cf from "cloudfront";
@@ -92,7 +95,7 @@ function _base64urlDecode(str: string) {
   return Buffer.from(str, "base64url").toString();
 }
 
-export const handler = async (event: AWSCloudFrontFunction.Event, context: AWSCloudFrontFunction.Context) => {
+async function handler(event: AWSCloudFrontFunction.Event, context: AWSCloudFrontFunction.Context) {
   console.log("🟢 Auth check event:", event);
   console.log("🔵 Auth check context:", context);
   const request = event.request;
@@ -106,7 +109,7 @@ export const handler = async (event: AWSCloudFrontFunction.Event, context: AWSCl
   // console.log(request.cookies);
   // console.log(request.cookies["auth-token"]);
   // console.log(Object.keys(request.cookies));
-  const jwtToken = request.cookies["auth-token"]?.value;
+  const jwtToken = request.cookies["auth-token"] && request.cookies["auth-token"].value;
   console.log("jwtToken:", jwtToken);
   // console.log(Object.keys(request.cookies));
 
@@ -139,8 +142,14 @@ async function getSecret() {
   }
 }
 
-const log: typeof console.log = (...args) => {
+const log: typeof console.log = function () {
   if (loggingEnabled) {
-    console.log(...args);
+    // @ts-expect-error We can't use spread or rest parameters in CloudFront Functions
+    // eslint-disable-next-line prefer-spread, prefer-rest-params
+    console.log.apply(console, arguments);
   }
 }
+
+// This serves no purpose other than to make TypeScript and eslint happy by showing that that handler is used. We can't
+// export handler as an alterative because CloudFront Functions don't support exports.
+handler;

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

@@ -195,7 +195,7 @@ export class CloudWatchOidcAuth extends Construct {
 
     const edgeFuncAuthCheck = new CloudFront.Function(
       scope,
-      `${this.id}EdgeFunctionAuthCheck`,
+      `${this.id}AuthCheckFunction`,
       {
         code: CloudFront.FunctionCode.fromInline(
           fs.readFileSync(path.join(import.meta.dirname, "auth-check.js"), "utf8").replace("__placeholder-for-jwt-secret-key__", key),