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

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

@@ -25,7 +25,7 @@ export const handler = addRequiredContext(AuthHandler({
             clientID: oidcClientId,
             scope: oidcScope,
             onSuccess: async (tokenset, client) => {
-                console.log("🟢", client);
+                console.log("🟣", client);
                 // Payload to include in the token
                 const payload = {
                     userID: tokenset.claims().sub,

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudWatchOidcAuth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAI1E,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,KAAK,OAAO,CAAC,CAAC,IAAI;IAChB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,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,2BAA2B,CACzB,iBAAiB,SAAS,4BAA4B,EAEtD,KAAK,EAAE,cAAc,EACrB,EACE,sBAAsB,EACtB,MAAgB,GACjB,EAAE;QAAE,sBAAsB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IA6C5E,OAAO,CAAC,sBAAsB;IAyH9B,OAAO,CAAC,sBAAsB;CA0E/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudWatchOidcAuth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAI1E,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,KAAK,OAAO,CAAC,CAAC,IAAI;IAChB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,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,2BAA2B,CACzB,iBAAiB,SAAS,4BAA4B,EAEtD,KAAK,EAAE,cAAc,EACrB,EACE,sBAAsB,EACtB,MAAgB,GACjB,EAAE;QAAE,sBAAsB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAuC5E,OAAO,CAAC,sBAAsB;IAyH9B,OAAO,CAAC,sBAAsB;CA0E/B"}

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

@@ -22,7 +22,6 @@ export class CloudWatchOidcAuth extends Construct {
         this.id = id;
     }
     addToDistributionDefinition(scope, { distributionDefinition, prefix = "/auth", }) {
-        console.log("------", import.meta.dirname, import.meta.url, import.meta.filename);
         const updatedDistributionDefinition = { ...distributionDefinition };
         const behaviourName = `${prefix.replace(/^\//g, "")}/*`;
         updatedDistributionDefinition.additionalBehaviors =
@@ -126,18 +125,18 @@ 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}AuthCheckFunction`, {
+        const authCheckFunction = 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,
         });
         return {
-            function: edgeFuncAuthCheck,
+            function: authCheckFunction,
             eventType: CloudFront.FunctionEventType.VIEWER_REQUEST,
         };
     }
     getAuthBehaviorOptions(scope, jwtSecret, prefix) {
-        const edgeFuncAuth = new SST.Function(scope, `${this.id}EdgeFunctionAuth`, {
+        const authRouteFunction = new SST.Function(scope, `${this.id}AuthRouteFunction`, {
             runtime: "nodejs20.x",
             handler: path.join(import.meta.dirname, "auth-route.handler"),
             environment: {
@@ -147,7 +146,7 @@ export class CloudWatchOidcAuth extends Construct {
                 JWT_SECRET: jwtSecret.secretValue.toString(),
             },
         });
-        // edgeFuncAuth uses SST's AuthHandler construct which is normally run inside a lambda that's
+        // authRouteFunction uses SST's AuthHandler construct which is normally run inside a lambda that's
         // created by SST's Auth construct. AuthHandler expects certain environment variables to be set
         // by the Auth construct so we have to set them ourselves here to keep it happy.
         const envVarName = SSTInternalConfig.envFor({
@@ -155,8 +154,8 @@ export class CloudWatchOidcAuth extends Construct {
             id: "id", // It seems like the env var will still be found no matter what this value is
             prop: "prefix",
         });
-        edgeFuncAuth.addEnvironment(envVarName, prefix);
-        const edgeFuncAuthUrl = edgeFuncAuth.addFunctionUrl({
+        authRouteFunction.addEnvironment(envVarName, prefix);
+        const authRouteFunctionUrl = authRouteFunction.addFunctionUrl({
             authType: Lambda.FunctionUrlAuthType.NONE,
         });
         const forwardHostHeaderCfFunction = new CloudFront.Function(scope, `${this.id}ForwardHostHeaderFunction`, {
@@ -170,7 +169,7 @@ export class CloudWatchOidcAuth extends Construct {
             runtime: CloudFront.FunctionRuntime.JS_2_0,
         });
         return {
-            origin: new CloudFrontOrigins.HttpOrigin(CDK.Fn.parseDomainName(edgeFuncAuthUrl.url)),
+            origin: new CloudFrontOrigins.HttpOrigin(CDK.Fn.parseDomainName(authRouteFunctionUrl.url)),
             allowedMethods: CloudFront.AllowedMethods.ALLOW_ALL,
             cachePolicy: new CloudFront.CachePolicy(scope, `${this.id}AllowAllCookiesPolicy`, {
                 cachePolicyName: "AllowAllCookiesPolicy",

package/package.json

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

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

@@ -31,7 +31,7 @@ export const handler = addRequiredContext(
         clientID: oidcClientId,
         scope: oidcScope,
         onSuccess: async (tokenset, client) => {
-          console.log("🟢", client);
+          console.log("🟣", client);
           // Payload to include in the token
           const payload = {
             userID: tokenset.claims().sub,

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

@@ -47,12 +47,6 @@ export class CloudWatchOidcAuth extends Construct {
       prefix = "/auth",
     }: { distributionDefinition: Mutable<DistributionProps>; prefix?: string },
   ) {
-    console.log(
-      "------",
-      import.meta.dirname,
-      import.meta.url,
-      import.meta.filename,
-    );
     const updatedDistributionDefinition = { ...distributionDefinition };
     const behaviourName = `${prefix.replace(/^\//g, "")}/*`;
     updatedDistributionDefinition.additionalBehaviors =
@@ -193,7 +187,7 @@ export class CloudWatchOidcAuth extends Construct {
     }
     fn.addEnvironment("NODE_OPTIONS", "--require=@aws-sdk/signature-v4-crt");
 
-    const edgeFuncAuthCheck = new CloudFront.Function(
+    const authCheckFunction = new CloudFront.Function(
       scope,
       `${this.id}AuthCheckFunction`,
       {
@@ -206,7 +200,7 @@ export class CloudWatchOidcAuth extends Construct {
     );
 
     return {
-      function: edgeFuncAuthCheck,
+      function: authCheckFunction,
       eventType: CloudFront.FunctionEventType.VIEWER_REQUEST,
     };
   }
@@ -216,7 +210,7 @@ export class CloudWatchOidcAuth extends Construct {
     jwtSecret: SecretsManager.Secret,
     prefix: string,
   ): CloudFront.BehaviorOptions {
-    const edgeFuncAuth = new SST.Function(scope, `${this.id}EdgeFunctionAuth`, {
+    const authRouteFunction = new SST.Function(scope, `${this.id}AuthRouteFunction`, {
       runtime: "nodejs20.x",
       handler: path.join(import.meta.dirname, "auth-route.handler"),
       environment: {
@@ -227,7 +221,7 @@ export class CloudWatchOidcAuth extends Construct {
       },
     });
 
-    // edgeFuncAuth uses SST's AuthHandler construct which is normally run inside a lambda that's
+    // authRouteFunction uses SST's AuthHandler construct which is normally run inside a lambda that's
     // created by SST's Auth construct. AuthHandler expects certain environment variables to be set
     // by the Auth construct so we have to set them ourselves here to keep it happy.
     const envVarName = SSTInternalConfig.envFor({
@@ -235,9 +229,9 @@ export class CloudWatchOidcAuth extends Construct {
       id: "id", // It seems like the env var will still be found no matter what this value is
       prop: "prefix",
     });
-    edgeFuncAuth.addEnvironment(envVarName, prefix);
+    authRouteFunction.addEnvironment(envVarName, prefix);
 
-    const edgeFuncAuthUrl = edgeFuncAuth.addFunctionUrl({
+    const authRouteFunctionUrl = authRouteFunction.addFunctionUrl({
       authType: Lambda.FunctionUrlAuthType.NONE,
     });
     const forwardHostHeaderCfFunction = new CloudFront.Function(
@@ -257,7 +251,7 @@ export class CloudWatchOidcAuth extends Construct {
 
     return {
       origin: new CloudFrontOrigins.HttpOrigin(
-        CDK.Fn.parseDomainName(edgeFuncAuthUrl.url),
+        CDK.Fn.parseDomainName(authRouteFunctionUrl.url),
       ),
       allowedMethods: CloudFront.AllowedMethods.ALLOW_ALL,
       cachePolicy: new CloudFront.CachePolicy(