@takumi-stack/core 1.0.1 → 1.0.3

package/{.dist/prefab/auth/cognito-pool → prefab/auth/cognito-user-pool}/index.js

@@ -23,62 +23,50 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CognitoAuthPoolPrefab = void 0;
+exports.CognitoUserPoolPrefab = void 0;
 const awsCognito = __importStar(require("aws-cdk-lib/aws-cognito"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const aws_kms_1 = require("aws-cdk-lib/aws-kms");
-const aws_route53_1 = require("aws-cdk-lib/aws-route53");
-const aws_route53_targets_1 = require("aws-cdk-lib/aws-route53-targets");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-class CognitoAuthPoolPrefab extends constructs_1.Construct {
+class CognitoUserPoolPrefab extends common_1.Prefab {
     userPool;
     userPoolClient;
     userPoolDomain;
     frontendRefs;
     kmsKey;
-    props;
-    // public readonly googleProvider: awsCognito.UserPoolIdentityProviderGoogle | undefined;
-    /**
-     * Creates a Cognito UserPool
-     *
-     * @param service - The instance of StackService where the prefab will be deployed
-     * @param params - Prefab params
-     * @returns CognitoAuthPoolPrefab instance
-     */
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(CognitoAuthPoolPrefab.name));
-        this.props = service.props;
-        //User Pool
+    constructor(service, params, propsOverride) {
+        super(CognitoUserPoolPrefab.name, service, params, propsOverride);
+        //KMS Key
         if (params.enableCustomSender) {
-            this.kmsKey = new aws_kms_1.Key(this, (0, common_1.getResourceName)('kms', service.props), {
+            this.kmsKey = new aws_kms_1.Key(this, this.getId('kms-key'), {
                 keySpec: aws_kms_1.KeySpec.SYMMETRIC_DEFAULT,
-                alias: (0, common_1.getResourceName)('kms-alias', service.props),
+                alias: this.getResourceName('kms-alias'),
                 enableKeyRotation: false,
             });
             this.kmsKey.addToResourcePolicy(new aws_iam_1.PolicyStatement({
+                sid: this.getResourceName('policy'),
                 actions: ['kms:Encrypt'],
                 effect: aws_iam_1.Effect.ALLOW,
                 principals: [new aws_iam_1.ServicePrincipal('cognito-idp.amazonaws.com')],
                 resources: ['*'],
             }));
         }
-        const defaultUserPoolProps = {
-            userPoolName: (0, common_1.getResourceName)('', service.props),
+        //User Pool
+        this.userPool = new awsCognito.UserPool(this, this.getId('UserPool'), {
+            userPoolName: this.getResourceName('user-pool'),
             accountRecovery: awsCognito.AccountRecovery.EMAIL_ONLY,
             selfSignUpEnabled: true,
             autoVerify: { email: true },
             signInCaseSensitive: false,
             passwordPolicy: { minLength: 8, requireDigits: true },
             customSenderKmsKey: params.enableCustomSender ? this.kmsKey : undefined,
-            email: params.emailConfiguration && awsCognito.UserPoolEmail.withSES(params.emailConfiguration),
-        };
-        const userPool = new awsCognito.UserPool(this, 'UserPool', { ...defaultUserPoolProps, ...params.userPool });
+            // email: params.emailConfiguration && awsCognito.UserPoolEmail.withSES(params.emailConfiguration),
+        });
         // Social Login
         if (params.socialLogin?.google) {
-            const googleProvider = new awsCognito.UserPoolIdentityProviderGoogle(this, 'GoogleProvider', {
-                userPool: userPool,
+            const googleProvider = new awsCognito.UserPoolIdentityProviderGoogle(this, this.getId('GoogleProvider'), {
+                userPool: this.userPool,
                 scopes: ['openid', 'email', 'profile'],
                 attributeMapping: {
                     email: awsCognito.ProviderAttribute.GOOGLE_EMAIL,
@@ -87,20 +75,24 @@ class CognitoAuthPoolPrefab extends constructs_1.Construct {
                 },
                 ...params.socialLogin.google,
             });
-            userPool.registerIdentityProvider(googleProvider);
+            this.userPool.registerIdentityProvider(googleProvider);
         }
         if (params.socialLogin?.facebook) {
-            const facebookProvider = new awsCognito.UserPoolIdentityProviderFacebook(this, 'FacebookProvider', params.socialLogin.facebook);
-            userPool.registerIdentityProvider(facebookProvider);
+            const facebookProvider = new awsCognito.UserPoolIdentityProviderFacebook(this, this.getId('FacebookProvider'), {
+                userPool: this.userPool,
+                ...params.socialLogin.facebook,
+            });
+            this.userPool.registerIdentityProvider(facebookProvider);
         }
         if (params.socialLogin?.apple) {
-            const appleProvider = new awsCognito.UserPoolIdentityProviderApple(this, 'AppleProvider', params.socialLogin.apple);
-            userPool.registerIdentityProvider(appleProvider);
+            const appleProvider = new awsCognito.UserPoolIdentityProviderApple(this, this.getId('AppleProvider'), params.socialLogin.apple);
+            this.userPool.registerIdentityProvider(appleProvider);
         }
         // UserPoolClient
-        const callbackUrl = params.callbackUrl || (0, common_1.getDomain)('app', service.props, true);
-        const defaultUserClientProps = {
-            userPoolClientName: (0, common_1.getResourceName)('', service.props),
+        const callbackUrl = params.callbackUrl || this.getDomainName('app', { includeProtocol: true });
+        this.userPoolClient = new awsCognito.UserPoolClient(this, this.getId('UserPoolClient'), {
+            userPool: this.userPool,
+            userPoolClientName: this.getResourceName('user-pool-client'),
             authFlows: {
                 custom: true,
                 userSrp: true,
@@ -115,79 +107,45 @@ class CognitoAuthPoolPrefab extends constructs_1.Construct {
                 logoutUrls: [`${callbackUrl}/sign-in`, ...(service.props.envName === 'dev' ? ['http://localhost:3000/sign-in'] : [])],
             },
             preventUserExistenceErrors: true,
-            generateSecret: false,
-        };
-        const userPoolClient = new awsCognito.UserPoolClient(this, 'UserPoolClient', {
-            userPool,
-            ...defaultUserClientProps,
-            ...params.userPoolClient,
+            ...params.resourceProps?.userPoolClient,
         });
         // UserPoolDomain
-        const userPoolDomain = new awsCognito.UserPoolDomain(this, 'UserPoolDomain', {
-            userPool,
-            ...(params.userPoolDomain ? params.userPoolDomain : { cognitoDomain: { domainPrefix: (0, common_1.getDomain)('auth', service.props).replace(/\./g, '-') } }),
+        this.userPoolDomain = new awsCognito.UserPoolDomain(this, this.getId('UserPoolDomain'), {
+            userPool: this.userPool,
+            ...params.resourceProps?.userPoolDomain,
+            // ...(params.userPoolDomain
+            //   ? params.userPoolDomain
+            //   : { cognitoDomain: { domainPrefix: getDomain('auth', service.props).replace(/\./g, '-') } }),
         });
-        if (params.userPoolDomain) {
-            const hostedZone = aws_route53_1.HostedZone.fromLookup(this, 'HostedZoneEnvDns', { domainName: (0, common_1.getDomain)('', service.props) });
-            const record = new aws_route53_1.ARecord(service, 'Record', {
-                zone: hostedZone,
-                target: aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.UserPoolDomainTarget(userPoolDomain)),
-                recordName: params.userPoolDomain.customDomain?.domainName,
-            });
-            record.node.addDependency(userPoolDomain);
-        }
+        // if (params.userPoolDomain) {
+        //   const hostedZone = HostedZone.fromLookup(this, this.getId('HostedZoneEnvDns'), {
+        //     domainName: getDomain('', service.props),
+        //   });
+        //   const record = new ARecord(this, 'Record', {
+        //     zone: hostedZone,
+        //     target: RecordTarget.fromAlias(new UserPoolDomainTarget(userPoolDomain)),
+        //     recordName: params.userPoolDomain.customDomain?.domainName,
+        //   });
+        //   record.node.addDependency(userPoolDomain);
+        // }
         // Attributes and Outputs
-        const userPoolId = userPool.userPoolId;
-        const userPoolClientId = userPoolClient.userPoolClientId;
-        const userPoolDomainUrl = aws_cdk_lib_1.Fn.join('', ['https://', userPoolDomain.domainName, '.auth.us-east-1.amazoncognito.com']);
-        const userPoolRegion = service.props.regionName;
-        new aws_cdk_lib_1.CfnOutput(this, 'UserPoolId', { value: userPoolId });
-        new aws_cdk_lib_1.CfnOutput(this, 'UserPoolClientId', { value: userPoolClientId });
-        new aws_cdk_lib_1.CfnOutput(this, 'UserPoolDomainUrl', { value: userPoolDomainUrl });
-        new aws_cdk_lib_1.CfnOutput(this, 'UserPoolRegion', { value: userPoolRegion });
-        this.userPool = userPool;
-        this.userPoolClient = userPoolClient;
-        this.userPoolDomain = userPoolDomain;
+        const userPoolId = this.userPool.userPoolId;
+        const userPoolClientId = this.userPoolClient.userPoolClientId;
+        const userPoolDomainUrl = aws_cdk_lib_1.Fn.join('', ['https://', this.userPoolDomain.domainName, '.auth.us-east-1.amazoncognito.com']);
+        const userPoolRegion = this.props.regionName;
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('UserPoolId'), { value: userPoolId });
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('UserPoolClientId'), { value: userPoolClientId });
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('UserPoolDomainUrl'), { value: userPoolDomainUrl });
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('UserPoolRegion'), { value: userPoolRegion });
+        const prefix = params.clientRef?.prefix || 'REACT_APP_';
         this.frontendRefs = {
-            REACT_APP_COGNITO_USER_POOL_ID: userPoolId,
-            REACT_APP_COGNITO_WEB_CLIENT_ID: userPoolClientId,
-            REACT_APP_COGNITO_DOMAIN: userPoolDomainUrl,
-            REACT_APP_COGNITO_REGION: userPoolRegion,
+            [`${prefix}COGNITO_USER_POOL_ID`]: userPoolId,
+            [`${prefix}WEB_CLIENT_ID`]: userPoolClientId,
+            [`${prefix}COGNITO_DOMAIN`]: userPoolDomainUrl,
+            [`${prefix}COGNITO_REGION`]: userPoolRegion,
         };
     }
-    // MODS
-    useMod(mods) {
-        return (lambda) => {
-            lambda.addEnvironment('USER_POOL_ID', this.userPool.userPoolId);
-            lambda.addEnvironment('USER_POOL_CLIENT_ID', this.userPoolClient.userPoolClientId);
-            mods.map((fn) => fn(this.userPool)(lambda));
-        };
-    }
-    customSmsSenderMod() {
-        return (lambda) => {
-            if (!this.kmsKey)
-                throw new common_1.SynthError('enableCustomSender must be true to use customSmsSenderMod');
-            lambda.addEnvironment('KEY_ID', this.kmsKey.keyArn);
-            lambda.addEnvironment('KEY_ALIAS', `arn:aws:kms:${this.props.regionName}:${this.props.deployTarget['services'].account}:alias/${(0, common_1.getServiceName)('kms', this.props)}`);
-            lambda.role?.addToPrincipalPolicy(new aws_iam_1.PolicyStatement({
-                actions: [
-                    'cognito-idp:AdminConfirmSignUp',
-                    'cognito-idp:SignUp',
-                    'cognito-idp:InitiateAuth',
-                    'cognito-idp:ConfirmSignUp',
-                    'cognito-idp:ForgotPassword',
-                    'cognito-idp:ConfirmForgotPassword',
-                    'cognito-idp:ResendConfirmationCode',
-                ],
-                resources: ['*'],
-            }));
-            lambda.role?.addToPrincipalPolicy(new aws_iam_1.PolicyStatement({
-                actions: ['kms:Decrypt', 'kms:DescribeKey'],
-                resources: [this.kmsKey.keyArn],
-            }));
-        };
-    }
-    static modifier = {
+    static mods = {
         updateUserAtt: () => {
             return (lambda) => {
                 lambda.role?.addToPrincipalPolicy(new aws_iam_1.PolicyStatement({
@@ -234,7 +192,41 @@ class CognitoAuthPoolPrefab extends constructs_1.Construct {
                 }));
             };
         },
+        customSmsSenderMod: (cognitoUserPoolPrefab) => {
+            return (lambda) => {
+                if (!cognitoUserPoolPrefab.kmsKey)
+                    throw new Error('enableCustomSender must be true to use customSmsSenderMod');
+                lambda.addEnvironment('KEY_ID', cognitoUserPoolPrefab.kmsKey.keyId);
+                // lambda.addEnvironment(
+                //   'KEY_ALIAS',
+                //   `arn:aws:kms:${this.props.regionName}:${this.props.deployTarget['services']!.account}:alias/${getServiceName('kms', this.props)}`
+                // );
+                lambda.role?.addToPrincipalPolicy(new aws_iam_1.PolicyStatement({
+                    actions: [
+                        'cognito-idp:AdminConfirmSignUp',
+                        'cognito-idp:SignUp',
+                        'cognito-idp:InitiateAuth',
+                        'cognito-idp:ConfirmSignUp',
+                        'cognito-idp:ForgotPassword',
+                        'cognito-idp:ConfirmForgotPassword',
+                        'cognito-idp:ResendConfirmationCode',
+                    ],
+                    resources: ['*'],
+                }));
+                lambda.role?.addToPrincipalPolicy(new aws_iam_1.PolicyStatement({
+                    actions: ['kms:Decrypt', 'kms:DescribeKey'],
+                    resources: [cognitoUserPoolPrefab.kmsKey.keyArn],
+                }));
+            };
+        },
     };
+    applyMods(mods, userPoolEnvVar = 'USER_POOL_ID', userPoolClientEnvVar = 'USER_POOL_CLIENT_ID') {
+        return (lambda) => {
+            lambda.addEnvironment(userPoolEnvVar, this.userPool.userPoolId);
+            lambda.addEnvironment(userPoolClientEnvVar, this.userPoolClient.userPoolClientId);
+            mods.map((key) => CognitoUserPoolPrefab.mods[key](this)(lambda));
+        };
+    }
 }
-exports.CognitoAuthPoolPrefab = CognitoAuthPoolPrefab;
+exports.CognitoUserPoolPrefab = CognitoUserPoolPrefab;
 //# sourceMappingURL=index.js.map

package/prefab/auth/cognito-user-pool/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/auth/cognito-user-pool/index.ts"],"names":[],"mappings":"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"}

package/prefab/auth/index.d.ts

@@ -0,0 +1,2 @@
+export * from './cognito-user-pool';
+//# sourceMappingURL=index.d.ts.map

package/prefab/auth/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../prefab/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}

package/{.dist/prefab → prefab}/auth/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cognito-pool"), exports);
+__exportStar(require("./cognito-user-pool"), exports);
 //# sourceMappingURL=index.js.map

package/{.dist/prefab → prefab}/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../prefab/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../prefab/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC"}

package/prefab/cdn/api/index.d.ts

@@ -0,0 +1,54 @@
+import * as awsCloudfront from 'aws-cdk-lib/aws-cloudfront';
+import { HttpOriginProps } from 'aws-cdk-lib/aws-cloudfront-origins';
+import { ApplicationLoadBalancer } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
+import { BaseCustomConfigs, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
+import { PublicAlbPrefab, ApiRestPrefab } from '../../gateway';
+import { CertificatePrefab, HostedZonePrefab, WafPrefab } from '../../networking';
+import { BucketPrefabParams } from '../../storage/bucket';
+export type CdnApiPrefabParams<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> = {
+    name: string;
+    certificatePrefab: CertificatePrefab<CustomConfigs>;
+    albDefaultBehavior?: PublicAlbPrefab;
+    restApiDefaultBehavior?: ApiRestPrefab;
+    headersWhitelist?: string[];
+    waf?: WafPrefab;
+    dnsOptions?: {
+        hostedZonePrefab?: HostedZonePrefab<CustomConfigs>;
+        subdomain?: string;
+        customDomains?: string[];
+    };
+    resourceProps?: {
+        privateBucketPrefab?: Partial<BucketPrefabParams>;
+        distribution?: Partial<awsCloudfront.DistributionProps>;
+        cachePolicy?: Partial<awsCloudfront.CachePolicyProps>;
+        requestPolicy?: Partial<awsCloudfront.OriginRequestPolicyProps>;
+    };
+};
+export declare class CdnApiPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<CdnApiPrefabParams<CustomConfigs>, CustomConfigs> {
+    readonly url: string;
+    readonly domains: string[];
+    readonly distribution: awsCloudfront.Distribution;
+    private readonly apiGatewayRequestPolicy;
+    private readonly apiGatewayCachePolicy;
+    private readonly apiGatewayBehaviorOptions;
+    private readonly albBehaviorOptions;
+    /**
+     * Constructs a new instance of the CdnApiPrefab class.
+     *
+     * @param service - The ServiceStack instance for handling custom configurations.
+     * @param params - Parameters for configuring the CDN API prefab.
+     * @param propsOverride - Optional properties to override default prefab properties.
+     *
+     * @throws {Error} If both ALB and API Gateway default behaviors are specified.
+     *
+     * This constructor sets up the cache and request policies for the API Gateway,
+     * defines behavior options for both the API Gateway and unrestricted access,
+     * and configures the CloudFront distribution. It also handles Route53 DNS records
+     * if explicit domains are not provided.
+     */
+    constructor(service: TakumiStack<CustomConfigs>, params: CdnApiPrefabParams<CustomConfigs>, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+    addApiGateway(basePath: string, apiUrl: string, originOptions?: HttpOriginProps): void;
+    addAppSync(apiUrl: string, originOptions?: HttpOriginProps): void;
+    addAlb(basePath: string, alb: ApplicationLoadBalancer): void;
+}
+//# sourceMappingURL=index.d.ts.map

package/prefab/cdn/api/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/cdn/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAc,eAAe,EAAuC,MAAM,oCAAoC,CAAC;AACtH,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAIjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAgB,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,kBAAkB,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IAC5F,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACpD,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC,sBAAsB,CAAC,EAAE,aAAa,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,UAAU,CAAC,EAAE;QACX,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IACF,aAAa,CAAC,EAAE;QACd,mBAAmB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAClD,YAAY,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QACxD,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;KACjE,CAAC;CACH,CAAC;AAEF,qBAAa,YAAY,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACnG,kBAAkB,CAAC,aAAa,CAAC,EACjC,aAAa,CACd;IACC,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClC,SAAgB,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAoC;IAC5E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA4B;IAClE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAgD;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAgD;IAEnF;;;;;;;;;;;;;OAaG;gBAED,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,kBAAkB,CAAC,aAAa,CAAC,EACzC,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IA4H7C,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,eAAe,GAAG,IAAI;IAQtF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,eAAe,GAAG,IAAI;IAWjE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,uBAAuB,GAAG,IAAI;CAOpE"}

package/{.dist/prefab/cdn/cdn-api → prefab/cdn/api}/index.js

@@ -29,37 +29,46 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_cloudfront_origins_1 = require("aws-cdk-lib/aws-cloudfront-origins");
 const aws_route53_1 = require("aws-cdk-lib/aws-route53");
 const aws_route53_targets_1 = require("aws-cdk-lib/aws-route53-targets");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-const storage_1 = require("../../storage");
-class CdnApiPrefab extends constructs_1.Construct {
-    domain;
-    baseUrl;
-    service;
+const bucket_1 = require("../../storage/bucket");
+class CdnApiPrefab extends common_1.Prefab {
+    url;
+    domains;
     distribution;
     apiGatewayRequestPolicy;
     apiGatewayCachePolicy;
     apiGatewayBehaviorOptions;
-    unrestrictedBehaviorOptions;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(CdnApiPrefab.name, params.subDomain));
-        this.service = service;
-        this.domain = (0, common_1.getDomain)(params.subDomain, service.props);
-        this.baseUrl = `https://${this.domain}/`;
-        if (params.albDefaultBehavior && params.restApiDefaultBehavior)
-            throw new common_1.SynthError('Only alb or api can be default behavior', service.props);
-        // Api Gateway Policies
-        this.apiGatewayCachePolicy = new awsCloudfront.CachePolicy(this, 'CachePolicy', {
-            cachePolicyName: (0, common_1.getCloudFrontName)('ApiGateway', 'CachePolicy', this.service.props),
+    albBehaviorOptions;
+    /**
+     * Constructs a new instance of the CdnApiPrefab class.
+     *
+     * @param service - The ServiceStack instance for handling custom configurations.
+     * @param params - Parameters for configuring the CDN API prefab.
+     * @param propsOverride - Optional properties to override default prefab properties.
+     *
+     * @throws {Error} If both ALB and API Gateway default behaviors are specified.
+     *
+     * This constructor sets up the cache and request policies for the API Gateway,
+     * defines behavior options for both the API Gateway and unrestricted access,
+     * and configures the CloudFront distribution. It also handles Route53 DNS records
+     * if explicit domains are not provided.
+     */
+    constructor(service, params, propsOverride) {
+        super(CdnApiPrefab.name, service, params, propsOverride);
+        // Api Gateway CachePolicy
+        this.apiGatewayCachePolicy = new awsCloudfront.CachePolicy(this, this.getId('CachePolicy'), {
+            cachePolicyName: this.getResourceName('cache-policy'),
             queryStringBehavior: awsCloudfront.CacheQueryStringBehavior.all(),
             headerBehavior: {
                 behavior: 'whitelist',
                 headers: [...(params.headersWhitelist || []), 'Authorization'],
             },
-            ...params.cachePolicyProps,
+            ...params.resourceProps?.cachePolicy,
         });
-        this.apiGatewayRequestPolicy = new awsCloudfront.OriginRequestPolicy(this, 'OriginRequestPolicy', {
-            originRequestPolicyName: (0, common_1.getCloudFrontName)('ApiGateway', 'RequestPolicy', this.service.props),
+        // Api Gateway RequestPolicy
+        this.apiGatewayRequestPolicy = new awsCloudfront.OriginRequestPolicy(this, this.getId('OriginRequestPolicy'), {
+            originRequestPolicyName: this.getResourceName('request-policy'),
+            queryStringBehavior: awsCloudfront.OriginRequestQueryStringBehavior.all(),
             headerBehavior: {
                 behavior: 'whitelist',
                 headers: [
@@ -71,7 +80,7 @@ class CdnApiPrefab extends constructs_1.Construct {
                     'Origin',
                 ],
             },
-            queryStringBehavior: awsCloudfront.OriginRequestQueryStringBehavior.all(),
+            ...params.resourceProps?.requestPolicy,
         });
         this.apiGatewayBehaviorOptions = {
             compress: true,
@@ -81,72 +90,89 @@ class CdnApiPrefab extends constructs_1.Construct {
             viewerProtocolPolicy: awsCloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         };
         // Integrations Policies
-        this.unrestrictedBehaviorOptions = {
+        this.albBehaviorOptions = {
             compress: true,
             cachePolicy: awsCloudfront.CachePolicy.CACHING_DISABLED,
             originRequestPolicy: awsCloudfront.OriginRequestPolicy.ALL_VIEWER,
             allowedMethods: awsCloudfront.AllowedMethods.ALLOW_ALL,
             viewerProtocolPolicy: awsCloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         };
-        // Default Behavior
+        if (params.albDefaultBehavior && params.restApiDefaultBehavior) {
+            throw new Error('Invalid configuration: Both ALB and API Gateway default behaviors cannot be specified at the same time. Please choose one.');
+        }
+        // Default Behavior: IF none alb or api was passed, create a bucket
         let defaultBehavior = {
-            origin: new aws_cloudfront_origins_1.HttpOrigin(new storage_1.PrivateBucketPrefab(service, { bucketName: 'default-origin' }).bucket.bucketDomainName, {
-                originId: (0, common_1.getCloudFrontName)('Origin', 'Default', this.service.props),
+            origin: new aws_cloudfront_origins_1.HttpOrigin(new bucket_1.BucketPrefab(service, { name: `${params.name}-default-origin` }).bucket.bucketDomainName, {
+                originId: this.getResourceName('default-origin'),
             }),
             ...this.apiGatewayBehaviorOptions,
         };
         if (params.albDefaultBehavior) {
             defaultBehavior = {
                 origin: new aws_cloudfront_origins_1.LoadBalancerV2Origin(params.albDefaultBehavior.alb, {
-                    originId: (0, common_1.getCloudFrontName)('Origin', 'Default', this.service.props),
+                    originId: this.getResourceName('default-origin'),
                 }),
-                ...this.unrestrictedBehaviorOptions,
+                ...this.albBehaviorOptions,
             };
         }
         if (params.restApiDefaultBehavior) {
             defaultBehavior = {
                 origin: new aws_cloudfront_origins_1.RestApiOrigin(params.restApiDefaultBehavior.api, {
-                    originId: (0, common_1.getCloudFrontName)('Origin', 'Default', this.service.props),
+                    originId: this.getResourceName('default-origin'),
                 }),
-                ...this.unrestrictedBehaviorOptions,
-                originRequestPolicy: awsCloudfront.OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
+                ...this.apiGatewayBehaviorOptions,
             };
         }
+        // Domain Resolution
+        if (params.dnsOptions?.subdomain && params.dnsOptions?.customDomains) {
+            throw new Error('dnsOptions.subdomain cannot be used together with dnsOptions.customDomains');
+        }
+        this.domains = params.dnsOptions?.customDomains || [this.getDomainName(params.dnsOptions?.subdomain)];
         // Distribution
-        this.distribution = new awsCloudfront.Distribution(this, 'Distribution', {
+        this.distribution = new awsCloudfront.Distribution(this, this.getId('distro'), {
             enabled: true,
-            comment: (0, common_1.getResourceName)('cdn', service.props),
-            certificate: params.certificate,
-            domainNames: params.explicitDomains ?? [this.domain],
-            defaultBehavior,
-            ...(service.props.envName !== 'prod' ? { priceClass: awsCloudfront.PriceClass.PRICE_CLASS_100 } : {}),
+            comment: this.getResourceName('distro'),
+            certificate: params.certificatePrefab.certificate,
+            domainNames: this.domains,
+            defaultBehavior: defaultBehavior,
             webAclId: params.waf?.webACL?.attrArn,
+            ...(service.props.envName !== 'prod' ? { priceClass: awsCloudfront.PriceClass.PRICE_CLASS_100 } : {}),
+            ...params.resourceProps?.distribution,
         });
-        // Route53
-        if (!params.explicitDomains && !params.skipRecord) {
-            const hostedZone = aws_route53_1.HostedZone.fromLookup(this, 'HostedZoneEnvDns', { domainName: (0, common_1.getDomain)('', service.props) });
-            new aws_route53_1.ARecord(service, 'Record', {
-                zone: hostedZone,
-                target: aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.CloudFrontTarget(this.distribution)),
-                recordName: this.domain,
+        if (!params.dnsOptions?.customDomains) {
+            this.domains.map((d) => {
+                if (params.dnsOptions?.hostedZonePrefab) {
+                    new aws_route53_1.ARecord(service, this.getId(d.split('.')[0]), {
+                        zone: params.dnsOptions.hostedZonePrefab.hostedZone,
+                        target: aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.CloudFrontTarget(this.distribution)),
+                        recordName: d,
+                    });
+                }
             });
         }
-        new aws_cdk_lib_1.CfnOutput(this, 'Domain', { value: params.explicitDomains ? params.explicitDomains[0] : this.domain });
-        new aws_cdk_lib_1.CfnOutput(this, 'BaseUrl', {
-            value: params.explicitDomains ? `https://${params.explicitDomains[0]}/` : this.baseUrl,
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('Domain'), {
+            key: this.getId('Domain', { toPascalCase: true }),
+            exportName: this.getResourceName('domain'),
+            value: this.domains[0],
+        });
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('BaseUrl'), {
+            key: this.getId('BaseUrl', { toPascalCase: true }),
+            exportName: this.getResourceName('base-url'),
+            value: `https://${this.domains[0]}/`,
         });
+        this.url = `https://${this.domains[0]}/`;
     }
     addApiGateway(basePath, apiUrl, originOptions) {
-        this.distribution.addBehavior(`/${basePath}*`, new aws_cloudfront_origins_1.HttpOrigin(apiUrl, { originId: (0, common_1.getCloudFrontName)('Origin', basePath, this.service.props), ...originOptions }), this.apiGatewayBehaviorOptions);
+        this.distribution.addBehavior(basePath != '/' ? `/${basePath}*` : '/*', new aws_cloudfront_origins_1.HttpOrigin(apiUrl, { originId: this.getResourceName(basePath), ...originOptions }), this.apiGatewayBehaviorOptions);
     }
     addAppSync(apiUrl, originOptions) {
         this.distribution.addBehavior('/graphql*', new aws_cloudfront_origins_1.HttpOrigin(aws_cdk_lib_1.Fn.select(2, aws_cdk_lib_1.Fn.split('/', apiUrl)), {
-            originId: (0, common_1.getCloudFrontName)('Origin', 'graphql', this.service.props),
+            originId: this.getResourceName('graphql'),
             ...originOptions,
         }), this.apiGatewayBehaviorOptions);
     }
     addAlb(basePath, alb) {
-        this.distribution.addBehavior(`/${basePath}/*`, new aws_cloudfront_origins_1.LoadBalancerV2Origin(alb, { originId: (0, common_1.getCloudFrontName)('Origin', basePath, this.service.props) }), this.unrestrictedBehaviorOptions);
+        this.distribution.addBehavior(`/${basePath}/*`, new aws_cloudfront_origins_1.LoadBalancerV2Origin(alb, { originId: this.getResourceName(basePath) }), this.albBehaviorOptions);
     }
 }
 exports.CdnApiPrefab = CdnApiPrefab;

package/prefab/cdn/api/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/cdn/api/index.ts"],"names":[],"mappings":"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"}

package/prefab/cdn/assets/index.d.ts

@@ -0,0 +1,26 @@
+import * as awsCloudfront from 'aws-cdk-lib/aws-cloudfront';
+import { BaseCustomConfigs, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
+import { CertificatePrefab, HostedZonePrefab, WafPrefab } from '../../networking';
+import { AssetSourceOptions, BucketPrefab, BucketPrefabParams } from '../../storage/bucket';
+export type CdnAssetConstructProps<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> = {
+    name: string;
+    certificatePrefab: CertificatePrefab<CustomConfigs>;
+    assetSrc: AssetSourceOptions;
+    dnsOptions?: {
+        hostedZonePrefab?: HostedZonePrefab<CustomConfigs>;
+        subdomain?: string;
+        customDomains?: string[];
+    };
+    waf?: WafPrefab;
+    resourceProps?: {
+        privateBucketPrefab?: Partial<BucketPrefabParams>;
+        distribution?: Partial<awsCloudfront.DistributionProps>;
+    };
+};
+export declare class CdnAssetPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<CdnAssetConstructProps, CustomConfigs> {
+    readonly domains: string[];
+    readonly privateBucketPrefab: BucketPrefab<CustomConfigs>;
+    readonly distribution: awsCloudfront.Distribution;
+    constructor(service: TakumiStack<CustomConfigs>, params: CdnAssetConstructProps, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+}
+//# sourceMappingURL=index.d.ts.map

package/prefab/cdn/assets/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/cdn/assets/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAC;AAO5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,MAAM,MAAM,sBAAsB,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IAChG,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACpD,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,UAAU,CAAC,EAAE;QACX,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IACF,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,aAAa,CAAC,EAAE;QACd,mBAAmB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAClD,YAAY,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;KACzD,CAAC;CACH,CAAC;AAEF,qBAAa,cAAc,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACrG,sBAAsB,EACtB,aAAa,CACd;IACC,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClC,SAAgB,mBAAmB,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IACjE,SAAgB,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC;gBAGvD,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,sBAAsB,EAC9B,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;CA2ErD"}