@lafken/auth 0.10.5 → 0.11.0

package/lib/resolver/auth/auth.d.ts

@@ -8,4 +8,6 @@ export declare class Auth extends Construct {
     constructor(scope: Construct, id: string, props: AuthOptions<any>);
     create(): Promise<void>;
     callExtends(): Promise<void>;
+    private createUserPool;
+    private createUserPoolClient;
 }

package/lib/resolver/auth/auth.js

@@ -17,34 +17,41 @@ class Auth extends constructs_1.Construct {
         this.props = props;
     }
     async create() {
+        this.createUserPool();
+        this.createUserPoolClient();
+    }
+    async callExtends() {
+        if (this.props.extend) {
+            await this.props.extend({
+                scope: this,
+                userPool: this.userPool,
+                userPoolClient: this.userPoolClient?.cognitoUserPoolClient,
+            });
+        }
+    }
+    createUserPool() {
         if (this.props.userPool?.isExternal) {
             this.userPool = new external_1.ExternalUserPool(this, this.id, this.props.userPool);
+            return;
         }
-        else {
-            this.userPool = new internal_1.InternalUserPool(this, this.id, this.props.userPool || {});
+        this.userPool = new internal_1.InternalUserPool(this, this.id, this.props.userPool || {});
+    }
+    createUserPoolClient() {
+        if (!this.props.userClient) {
+            return;
         }
         if (this.props.userClient?.isExternal) {
             this.userPoolClient = new external_2.ExternalUserPoolClient(this, this.id, {
                 userPoolId: this.userPool.id,
                 ...this.props.userClient,
             });
+            return;
         }
-        else {
-            this.userPoolClient = new internal_2.InternalUserPoolClient(this, this.id, {
-                userPoolId: this.userPool.id,
-                ...this.props.userClient,
-                attributeByName: this.userPool instanceof internal_1.InternalUserPool ? this.userPool.attributeByName : {},
-            });
-        }
-    }
-    async callExtends() {
-        if (this.props.extend) {
-            await this.props.extend({
-                scope: this,
-                userPool: this.userPool,
-                userPoolClient: this.userPoolClient.cognitoUserPoolClient,
-            });
-        }
+        this.userPoolClient = new internal_2.InternalUserPoolClient(this, this.id, {
+            userPoolId: this.userPool.id,
+            ...this.props.userClient,
+            attributeByName: this.userPool instanceof internal_1.InternalUserPool ? this.userPool?.attributeByName : {},
+        });
     }
 }
 exports.Auth = Auth;

package/lib/resolver/auth/user-pool/external/external.js

@@ -6,9 +6,11 @@ const resolver_1 = require("@lafken/resolver");
 class ExternalUserPool extends resolver_1.lafkenResource.make(data_aws_cognito_user_pool_1.DataAwsCognitoUserPool) {
     constructor(scope, id, props) {
         super(scope, `${id}-user-pool`, {
-            userPoolId: props.userPoolId,
+            userPoolId: typeof props.userPoolId === 'string'
+                ? props.userPoolId
+                : props.userPoolId((0, resolver_1.getExternalValues)(scope)),
         });
-        this.isGlobal('auth', id);
+        this.isGlobal('user-pool', id);
     }
 }
 exports.ExternalUserPool = ExternalUserPool;

package/lib/resolver/auth/user-pool/internal/internal.js

@@ -18,7 +18,7 @@ class InternalUserPool extends resolver_1.lafkenResource.make(cognito_user_pool_
         const attributes = InternalUserPool.getUserAttributes(props.attributes);
         super(scope, `${id}-user-pool`, {
             ...InternalUserPool.getMfaConfig(props.mfa),
-            name: id,
+            name: props.name || id,
             autoVerifiedAttributes: InternalUserPool.getAutoVerifiedAttributes(props.autoVerifyAttributes),
             accountRecoverySetting: InternalUserPool.getAccountRecoverySettings(props.accountRecovery),
             aliasAttributes: InternalUserPool.getAliasAttributes(props.signInAliases),
@@ -39,7 +39,7 @@ class InternalUserPool extends resolver_1.lafkenResource.make(cognito_user_pool_
         if (attributes?.attributeByName) {
             this.attributeByName = attributes.attributeByName;
         }
-        this.isGlobal('auth', id);
+        this.isGlobal('user-pool', id);
         this.assignIdentityProviders(props.identityProviders);
         new resolver_1.ResourceOutput(this, props.outputs);
     }

package/lib/resolver/auth/user-pool/user-pool.types.d.ts

@@ -1,4 +1,4 @@
-import type { ClassResource, ResourceOutputType } from '@lafken/common';
+import type { ClassResource, GetExternalValues, ResourceOutputType } from '@lafken/common';
 export type SignInAliases = 'email' | 'phone' | 'preferred_username';
 export type CognitoPlan = 'lite' | 'essentials' | 'plus';
 export type UserVerificationType = 'code' | 'link';
@@ -102,6 +102,7 @@ export interface OidcIdentityProvider<T extends Function> extends CommonIdentity
 }
 export type IdentityProvider<T extends ClassResource> = AmazonIdentityProvider<T> | AppleIdentityProvider<T> | FacebookIdentityProvider<T> | GoogleIdentityProvider<T> | OidcIdentityProvider<T>;
 export interface InternalUserPoolProps<T extends ClassResource> {
+    name?: string;
     isExternal?: never;
     /**
      * Defines the attributes for the Cognito User Pool.
@@ -258,6 +259,6 @@ export interface ExternalUserPoolProps {
      * This value is used to look up and integrate with a User Pool
      * that was created outside of the framework.
      */
-    userPoolId: string;
+    userPoolId: string | ((props: GetExternalValues) => string);
 }
 export type UserPoolProps<T extends ClassResource> = InternalUserPoolProps<T> | ExternalUserPoolProps;

package/lib/resolver/auth/user-pool-client/external/external.d.ts

@@ -1,7 +1,7 @@
-import { DataAwsCognitoUserPoolClient } from '@cdktn/provider-aws/lib/data-aws-cognito-user-pool-client';
 import { Construct } from 'constructs';
 import type { ExternalUserPoolClientProps } from '../user-pool-client.types';
+import { DataExternalUserPoolClient } from '../user-pool-client.utils';
 export declare class ExternalUserPoolClient extends Construct {
-    cognitoUserPoolClient: DataAwsCognitoUserPoolClient;
+    cognitoUserPoolClient: DataExternalUserPoolClient;
     constructor(scope: Construct, id: string, props: ExternalUserPoolClientProps);
 }

package/lib/resolver/auth/user-pool-client/external/external.js

@@ -1,16 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalUserPoolClient = void 0;
-const data_aws_cognito_user_pool_client_1 = require("@cdktn/provider-aws/lib/data-aws-cognito-user-pool-client");
+const resolver_1 = require("@lafken/resolver");
 const constructs_1 = require("constructs");
+const user_pool_client_utils_1 = require("../user-pool-client.utils");
 class ExternalUserPoolClient extends constructs_1.Construct {
     cognitoUserPoolClient;
     constructor(scope, id, props) {
         super(scope, 'user-pool-client');
-        this.cognitoUserPoolClient = new data_aws_cognito_user_pool_client_1.DataAwsCognitoUserPoolClient(this, id, {
-            clientId: props.clientId,
+        this.cognitoUserPoolClient = new user_pool_client_utils_1.DataExternalUserPoolClient(this, id, {
+            clientId: typeof props.clientId === 'string'
+                ? props.clientId
+                : props.clientId((0, resolver_1.getExternalValues)(scope)),
             userPoolId: props.userPoolId,
         });
+        this.cognitoUserPoolClient.isGlobal('user-pool-client', id);
     }
 }
 exports.ExternalUserPoolClient = ExternalUserPoolClient;

package/lib/resolver/auth/user-pool-client/internal/internal.d.ts

@@ -1,9 +1,9 @@
-import { CognitoUserPoolClient } from '@cdktn/provider-aws/lib/cognito-user-pool-client';
 import { Construct } from 'constructs';
 import type { InternalUserPoolClientProps } from '../user-pool-client.types';
+import { DataInternalUserPoolClient } from '../user-pool-client.utils';
 export declare class InternalUserPoolClient extends Construct {
     private props;
-    cognitoUserPoolClient: CognitoUserPoolClient;
+    cognitoUserPoolClient: DataInternalUserPoolClient;
     constructor(scope: Construct, id: string, props: InternalUserPoolClientProps);
     private getRefreshTokenRotation;
     private getExplicitAuthFlows;

package/lib/resolver/auth/user-pool-client/internal/internal.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalUserPoolClient = void 0;
-const cognito_user_pool_client_1 = require("@cdktn/provider-aws/lib/cognito-user-pool-client");
 const resolver_1 = require("@lafken/resolver");
 const constructs_1 = require("constructs");
 const auth_utils_1 = require("../../auth.utils");
+const user_pool_client_utils_1 = require("../user-pool-client.utils");
 class InternalUserPoolClient extends constructs_1.Construct {
     props;
     cognitoUserPoolClient;
     constructor(scope, id, props) {
         super(scope, 'user-pool-client');
         this.props = props;
-        this.cognitoUserPoolClient = new cognito_user_pool_client_1.CognitoUserPoolClient(this, id, {
+        this.cognitoUserPoolClient = new user_pool_client_utils_1.DataInternalUserPoolClient(this, id, {
             ...this.getValidity(props),
             ...this.getOauthConfig(props.oauth),
-            name: id,
+            name: props.name || id,
             userPoolId: props.userPoolId,
             enableTokenRevocation: props.enableTokenRevocation ?? true,
             generateSecret: props.generateSecret ?? false,
@@ -24,6 +24,7 @@ class InternalUserPoolClient extends constructs_1.Construct {
             readAttributes: this.getAttributes(props.readAttributes),
             writeAttributes: this.getAttributes(props.writeAttributes),
         });
+        this.cognitoUserPoolClient.isGlobal('user-pool-client', id);
         new resolver_1.ResourceOutput(this.cognitoUserPoolClient, props.outputs);
     }
     getRefreshTokenRotation(period) {
@@ -44,7 +45,7 @@ class InternalUserPoolClient extends constructs_1.Construct {
         return authFlows.map((flow) => flow.toUpperCase());
     }
     getOauthConfig(oauth) {
-        if (!oauth || !oauth.flows?.length) {
+        if (!oauth?.flows?.length) {
             return {};
         }
         return {

package/lib/resolver/auth/user-pool-client/user-pool-client.types.d.ts

@@ -1,4 +1,4 @@
-import type { ResourceOutputType } from '@lafken/common';
+import type { GetExternalValues, ResourceOutputType } from '@lafken/common';
 import type { CustomAttributesMetadata, StandardAttributeMetadata } from '../../../main';
 export type AuthFlow = 'allow_admin_user_password_auth' | 'allow_custom_auth' | 'allow_user_password_auth' | 'allow_user_srp_auth' | 'allow_refresh_token_auth' | 'allow_user_auth';
 export type OAuthFlow = 'code' | 'client_credentials' | 'implicit';
@@ -23,6 +23,14 @@ export interface OAuthConfig {
 }
 export interface InternalUserClientProps<T extends Function> {
     isExternal?: never;
+    /**
+     * Name of the Cognito User Pool Client.
+     *
+     * Specifies a custom name for the User Pool Client resource.
+     * If not provided, a default name is derived from the parent
+     * User Pool configuration.
+     */
+    name?: string;
     /**
      * Defines the authentication flows enabled for the Cognito User Pool Client.
      *
@@ -157,7 +165,7 @@ export interface ExternalUserClientProps {
      * This value is used to look up and integrate with a User Pool Client
      * that was created outside of the framework.
      */
-    clientId: string;
+    clientId: string | ((props: GetExternalValues) => string);
 }
 export type UserClientProps<T extends Function> = InternalUserClientProps<T> | ExternalUserClientProps;
 export interface InternalUserPoolClientProps extends InternalUserClientProps<any> {

package/lib/resolver/auth/user-pool-client/user-pool-client.utils.d.ts

@@ -0,0 +1,21 @@
+import { CognitoUserPoolClient } from '@cdktn/provider-aws/lib/cognito-user-pool-client';
+import { DataAwsCognitoUserPoolClient } from '@cdktn/provider-aws/lib/data-aws-cognito-user-pool-client';
+declare const DataInternalUserPoolClient_base: (new (...args: any[]) => {
+    isGlobal(module: import("@lafken/common").ModuleGlobalReferenceNames | (string & {}), id: string): void;
+    isDependent(resolveDependency: () => void): void;
+    readonly node: import("constructs").Node;
+    with(...mixins: import("constructs").IMixin[]): import("constructs").IConstruct;
+    toString(): string;
+}) & typeof CognitoUserPoolClient;
+export declare class DataInternalUserPoolClient extends DataInternalUserPoolClient_base {
+}
+declare const DataExternalUserPoolClient_base: (new (...args: any[]) => {
+    isGlobal(module: import("@lafken/common").ModuleGlobalReferenceNames | (string & {}), id: string): void;
+    isDependent(resolveDependency: () => void): void;
+    readonly node: import("constructs").Node;
+    with(...mixins: import("constructs").IMixin[]): import("constructs").IConstruct;
+    toString(): string;
+}) & typeof DataAwsCognitoUserPoolClient;
+export declare class DataExternalUserPoolClient extends DataExternalUserPoolClient_base {
+}
+export {};

package/lib/resolver/auth/user-pool-client/user-pool-client.utils.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataExternalUserPoolClient = exports.DataInternalUserPoolClient = void 0;
+const cognito_user_pool_client_1 = require("@cdktn/provider-aws/lib/cognito-user-pool-client");
+const data_aws_cognito_user_pool_client_1 = require("@cdktn/provider-aws/lib/data-aws-cognito-user-pool-client");
+const resolver_1 = require("@lafken/resolver");
+class DataInternalUserPoolClient extends resolver_1.lafkenResource.make(cognito_user_pool_client_1.CognitoUserPoolClient) {
+}
+exports.DataInternalUserPoolClient = DataInternalUserPoolClient;
+class DataExternalUserPoolClient extends resolver_1.lafkenResource.make(data_aws_cognito_user_pool_client_1.DataAwsCognitoUserPoolClient) {
+}
+exports.DataExternalUserPoolClient = DataExternalUserPoolClient;

package/lib/resolver/resolver.types.d.ts

@@ -9,7 +9,7 @@ import type { UserClientProps } from './auth/user-pool-client/user-pool-client.t
 export interface ExtendProps {
     scope: Construct;
     userPool: CognitoUserPool | DataAwsCognitoUserPool;
-    userPoolClient: CognitoUserPoolClient | DataAwsCognitoUserPoolClient;
+    userPoolClient?: CognitoUserPoolClient | DataAwsCognitoUserPoolClient;
 }
 export interface AuthOptions<T extends ClassResource> {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/auth",
-  "version": "0.10.5",
+  "version": "0.11.0",
   "private": false,
   "description": "Define Cognito User Pools using TypeScript decorators - simplified authentication infrastructure with Lafken",
   "keywords": [
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.10.5"
+    "@lafken/resolver": "0.11.0"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.5.0",
@@ -63,13 +63,13 @@
     "typescript": "6.0.2",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.2",
-    "@lafken/common": "0.10.5"
+    "@lafken/common": "0.11.0"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.10.5"
+    "@lafken/common": "0.11.0"
   },
   "engines": {
     "node": ">=20.19"