@infoxchange/make-it-so 2.11.0-internal-testing-vdt-199-add-auth-token-verify-function.2 → 2.11.0-internal-testing-vdt-199-add-auth-token-verify-function.4

package/README.md

@@ -294,7 +294,7 @@ const vpcDetails = new IxVpcDetails(scope, "VpcDetails");
 <summary><strong>CloudFrontOidcAuth</strong> - Adds OIDC authentication to a CloudFront distribution.</summary>
 
 ```typescript
-import { CloudWatchOidcAuth } from "@infoxchange/make-it-so/cdk-constructs";
+import { CloudFrontOidcAuth } from "@infoxchange/make-it-so/cdk-constructs";
 
 // You first create an instance of CloudFrontOidcAuth
 const auth = new CloudFrontOidcAuth(stack, "CloudFrontOidcAuth", {

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

@@ -3,14 +3,15 @@
 // For example, no external libraries can be used, and the runtime is more limited.
 import crypto from "crypto";
 import cf from "cloudfront";
+const kvsKey = "__placeholder-for-jwt-secret-key__";
+const authRoutePrefix = "__placeholder-for-auth-route-prefix__";
 //Response when JWT is not valid.
 const redirectResponse = {
     statusCode: 302,
     headers: {
-        location: { value: "/auth/oidc/authorize" },
+        location: { value: `${authRoutePrefix}/oidc/authorize` },
     },
 };
-const kvsKey = "__placeholder-for-jwt-secret-key__";
 // Set to true to enable console logging
 const loggingEnabled = false;
 function jwtDecode(token, key, noVerify) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudFrontOidcAuth/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;IA8H9B,OAAO,CAAC,sBAAsB;CA8E/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cdk-constructs/CloudFrontOidcAuth/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;IAwC5E,OAAO,CAAC,sBAAsB;IAgI9B,OAAO,CAAC,sBAAsB;CA8E/B"}

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

@@ -22,6 +22,7 @@ export class CloudFrontOidcAuth extends Construct {
         this.id = id;
     }
     addToDistributionDefinition(scope, { distributionDefinition, prefix = "/auth", }) {
+        prefix = prefix.replace(/\/$/, ""); // Remove trailing slash from prefix if it has one
         const updatedDistributionDefinition = { ...distributionDefinition };
         const behaviourName = `${prefix.replace(/^\//g, "")}/*`;
         updatedDistributionDefinition.additionalBehaviors =
@@ -47,14 +48,14 @@ export class CloudFrontOidcAuth extends Construct {
             functionAssociations: [
                 ...(updatedDistributionDefinition.defaultBehavior
                     ?.functionAssociations || []),
-                this.getFunctionAssociation(scope, jwtSecret),
+                this.getFunctionAssociation(scope, jwtSecret, prefix),
             ],
         };
         updatedDistributionDefinition.additionalBehaviors[behaviourName] =
             this.getAuthBehaviorOptions(scope, jwtSecret, prefix);
         return updatedDistributionDefinition;
     }
-    getFunctionAssociation(scope, jwtSecret) {
+    getFunctionAssociation(scope, jwtSecret, authRoutePrefix) {
         const cfKeyValueStore = new CloudFront.KeyValueStore(scope, `${this.id}CFKeyValueStore`);
         const kvStoreId = cfKeyValueStore.keyValueStoreId; // Your KV store ID
         const key = "jwt-secret";
@@ -128,7 +129,8 @@ export class CloudFrontOidcAuth extends Construct {
         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)),
+                .replace("__placeholder-for-jwt-secret-key__", key)
+                .replace("__placeholder-for-auth-route-prefix__", authRoutePrefix)),
             runtime: CloudFront.FunctionRuntime.JS_2_0,
             keyValueStore: cfKeyValueStore,
         });

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",
+  "version": "2.11.0-internal-testing-vdt-199-add-auth-token-verify-function.4",
   "description": "Makes deploying services to IX infra easy",
   "repository": "github:infoxchange/make-it-so",
   "type": "module",
@@ -17,7 +17,7 @@
   "exports": {
     "./cdk-constructs": "./dist/cdk-constructs/index.js",
     "./deployConfig": "./dist/deployConfig.js",
-    "./auth": "./dist/lib/auth.js"
+    "./auth": "./dist/lib/auth/index.js"
   },
   "lint-staged": {
     "**/*": [

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

@@ -4,15 +4,17 @@
 import crypto from "crypto";
 import cf from "cloudfront";
 
+const kvsKey = "__placeholder-for-jwt-secret-key__";
+const authRoutePrefix = "__placeholder-for-auth-route-prefix__";
+
 //Response when JWT is not valid.
 const redirectResponse = {
   statusCode: 302,
   headers: {
-    location: { value: "/auth/oidc/authorize" },
+    location: { value: `${authRoutePrefix}/oidc/authorize` },
   },
 };
 
-const kvsKey = "__placeholder-for-jwt-secret-key__";
 // Set to true to enable console logging
 const loggingEnabled = false;
 

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

@@ -47,6 +47,7 @@ export class CloudFrontOidcAuth extends Construct {
       prefix = "/auth",
     }: { distributionDefinition: Mutable<DistributionProps>; prefix?: string },
   ) {
+    prefix = prefix.replace(/\/$/, ""); // Remove trailing slash from prefix if it has one
     const updatedDistributionDefinition = { ...distributionDefinition };
     const behaviourName = `${prefix.replace(/^\//g, "")}/*`;
     updatedDistributionDefinition.additionalBehaviors =
@@ -76,7 +77,7 @@ export class CloudFrontOidcAuth extends Construct {
       functionAssociations: [
         ...(updatedDistributionDefinition.defaultBehavior
           ?.functionAssociations || []),
-        this.getFunctionAssociation(scope, jwtSecret),
+        this.getFunctionAssociation(scope, jwtSecret, prefix),
       ],
     };
     updatedDistributionDefinition.additionalBehaviors[behaviourName] =
@@ -87,6 +88,7 @@ export class CloudFrontOidcAuth extends Construct {
   private getFunctionAssociation(
     scope: ConstructScope,
     jwtSecret: SecretsManager.Secret,
+    authRoutePrefix: string,
   ): CloudFront.FunctionAssociation {
     const cfKeyValueStore = new CloudFront.KeyValueStore(
       scope,
@@ -197,7 +199,8 @@ export class CloudFrontOidcAuth extends Construct {
               path.join(import.meta.dirname, "auth-check.js"),
               "utf8",
             )
-            .replace("__placeholder-for-jwt-secret-key__", key),
+            .replace("__placeholder-for-jwt-secret-key__", key)
+            .replace("__placeholder-for-auth-route-prefix__", authRoutePrefix),
         ),
         runtime: CloudFront.FunctionRuntime.JS_2_0,
         keyValueStore: cfKeyValueStore,