@aws/nx-plugin 0.26.0 → 0.28.0

package/src/trpc/backend/files/backend/src/client/index.ts.template

@@ -3,18 +3,38 @@ import {
   httpLink,
   HTTPLinkOptions,
 } from '@trpc/client';
-
+<%_ if (auth === 'IAM') { _%>
+import { AwsClient } from 'aws4fetch';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+<%_ } _%>
 import { AppRouter } from "../router.js";
-import { sigv4Fetch } from './sigv4.js';
 
+<%_ if (auth === 'IAM') { %>
+const credentialProvider = fromNodeProviderChain();
+
+const sigv4Fetch = (async (...args) => {
+  const client = new AwsClient(await credentialProvider());
+  return client.fetch(...args);
+}) satisfies AwsClient['fetch'];
+
+<%_ } _%>
 export interface <%= apiNameClassName %>ClientConfig {
   readonly url: string;
+  <%_ if (auth === 'Cognito') { _%>
+  readonly token: string;
+  <%_ } _%>
 }
 
 export const create<%= apiNameClassName %>Client = (config: <%= apiNameClassName %>ClientConfig) => {
   const linkOptions: HTTPLinkOptions<any> = {
     url: config.url,
+    <%_ if (auth === 'IAM') { _%>
     fetch: sigv4Fetch,
+    <%_ } else if (auth === 'Cognito') { _%>
+    headers: {
+      Authorization: `Bearer ${config.token}`,
+    },
+    <%_ } _%>
   };
   return createTRPCClient<AppRouter>({
     links: [httpLink(linkOptions)],

package/src/trpc/backend/files/backend/src/middleware/index.ts.template

@@ -1,6 +1,5 @@
 import { CreateAWSLambdaContextOptions } from '@trpc/server/adapters/aws-lambda';
-<%_ const eventType = computeType === 'ServerlessApiGatewayRestApi' ? 'APIGatewayProxyEvent' : 'APIGatewayProxyEventV2WithIAMAuthorizer'; _%>
-import type { <%- eventType %> } from 'aws-lambda';
+import type { <%- apiGatewayEventType %> } from 'aws-lambda';
 import { ILoggerContext } from './logger.js';
 import { IMetricsContext } from './metrics.js';
 import { ITracerContext } from './tracer.js';
@@ -10,7 +9,7 @@ export * from './metrics.js';
 export * from './tracer.js';
 export * from './error.js';
 
-export type IMiddlewareContext = CreateAWSLambdaContextOptions<<%- eventType %>>
+export type IMiddlewareContext = CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>
   & ILoggerContext
   & IMetricsContext
   & ITracerContext;

package/src/trpc/backend/files/backend/src/router.ts.template

@@ -4,8 +4,7 @@ import {
 } from '@trpc/server/adapters/aws-lambda';
 import { echo } from './procedures/echo.js';
 import { t } from './init.js';
-<%_ const eventType = computeType === 'ServerlessApiGatewayRestApi' ? 'APIGatewayProxyEvent' : 'APIGatewayProxyEventV2WithIAMAuthorizer'; _%>
-import type { <%- eventType %> } from 'aws-lambda';
+import type { <%- apiGatewayEventType %> } from 'aws-lambda';
 
 export const router = t.router;
 
@@ -15,7 +14,7 @@ export const appRouter = router({
 
 export const handler = awsLambdaRequestHandler({
   router: appRouter,
-  createContext: (ctx: CreateAWSLambdaContextOptions<<%- eventType %>>) => ctx,
+  createContext: (ctx: CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>) => ctx,
   <%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
   responseMeta: () => ({
     headers: {

package/src/trpc/backend/generator.js

@@ -26,18 +26,18 @@ function tsTrpcApiGenerator(tree, options) {
         var _a;
         yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
         const apiNamespace = (0, npm_scope_1.getNpmScopePrefix)(tree);
-        const apiNameKebabCase = (0, lodash_kebabcase_1.default)(options.apiName);
-        const apiNameClassName = (0, names_1.toClassName)(options.apiName);
+        const apiNameKebabCase = (0, lodash_kebabcase_1.default)(options.name);
+        const apiNameClassName = (0, names_1.toClassName)(options.name);
         const projectRoot = (0, devkit_1.joinPathFragments)((_a = options.directory) !== null && _a !== void 0 ? _a : '.', apiNameKebabCase);
         const schemaRoot = (0, devkit_1.joinPathFragments)(projectRoot, 'schema');
         const backendRoot = (0, devkit_1.joinPathFragments)(projectRoot, 'backend');
-        const backendName = `${apiNameKebabCase}-backend`;
+        const backendName = apiNameKebabCase;
         const schemaName = `${apiNameKebabCase}-schema`;
         const backendProjectName = `${apiNamespace}${backendName}`;
         const schemaProjectName = `${apiNamespace}${schemaName}`;
         const enhancedOptions = Object.assign({ backendProjectName, backendProjectAlias: (0, npm_scope_1.toScopeAlias)(backendProjectName), schemaProjectName, schemaProjectAlias: (0, npm_scope_1.toScopeAlias)(schemaProjectName), apiNameKebabCase,
             apiNameClassName,
-            backendRoot, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec }, options);
+            backendRoot, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec, apiGatewayEventType: getApiGatewayEventType(options) }, options);
         yield (0, generator_1.default)(tree, {
             name: backendName,
             directory: projectRoot,
@@ -57,12 +57,14 @@ function tsTrpcApiGenerator(tree, options) {
                 projectAlias: enhancedOptions.backendProjectAlias,
                 dir: backendRoot,
             },
+            auth: options.auth,
         });
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(backendRoot, 'project.json'), (config) => {
             var _a;
             config.metadata = {
-                apiName: options.apiName,
+                apiName: options.name,
                 apiType: 'trpc',
+                auth: options.auth,
             };
             config.targets.serve = {
                 executor: 'nx:run-commands',
@@ -121,6 +123,8 @@ function tsTrpcApiGenerator(tree, options) {
         ]), (0, versions_1.withVersions)(['@types/aws-lambda', 'esbuild', 'tsx']));
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'package.json'));
         tree.delete((0, devkit_1.joinPathFragments)(schemaRoot, 'package.json'));
+        (0, nx_1.addGeneratorMetadata)(tree, backendName, exports.TRPC_BACKEND_GENERATOR_INFO);
+        (0, nx_1.addGeneratorMetadata)(tree, schemaName, exports.TRPC_BACKEND_GENERATOR_INFO);
         yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TRPC_BACKEND_GENERATOR_INFO]);
         yield (0, format_1.formatFilesInSubtree)(tree);
         return () => {
@@ -128,5 +132,17 @@ function tsTrpcApiGenerator(tree, options) {
         };
     });
 }
+const getApiGatewayEventType = (options) => {
+    if (options.computeType === 'ServerlessApiGatewayRestApi') {
+        return 'APIGatewayProxyEvent';
+    }
+    if (options.auth === 'IAM') {
+        return 'APIGatewayProxyEventV2WithIAMAuthorizer';
+    }
+    else if (options.auth === 'Cognito') {
+        return 'APIGatewayProxyEventV2WithJWTAuthorizer';
+    }
+    return 'APIGatewayProxyEventV2';
+};
 exports.default = tsTrpcApiGenerator;
 //# sourceMappingURL=generator.js.map

package/src/trpc/backend/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}

package/src/trpc/backend/schema.d.ts

@@ -5,7 +5,8 @@
 import { Linter } from '@nx/eslint';
 
 export interface TsTrpcApiGeneratorSchema {
-  apiName: string;
+  name: string;
   computeType: 'ServerlessApiGatewayRestApi' | 'ServerlessApiGatewayHttpApi';
+  auth: 'IAM' | 'Cognito' | 'None';
   directory?: TsLibGeneratorSchema['directory'];
 }

package/src/trpc/backend/schema.json

@@ -4,7 +4,7 @@
   "title": "",
   "type": "object",
   "properties": {
-    "apiName": {
+    "name": {
       "type": "string",
       "description": "The name of the API (required). Used to generate class names and file paths.",
       "$default": {
@@ -21,6 +21,14 @@
       "x-prompt": "What compute type would you like to deploy your API with?",
       "x-priority": "important"
     },
+    "auth": {
+      "type": "string",
+      "description": "The method used to authenticate with your API. Choose between IAM (default), Cognito or None.",
+      "default": "IAM",
+      "enum": ["IAM", "Cognito", "None"],
+      "x-prompt": "How would you like users to authenticate with your API?",
+      "x-priority": "important"
+    },
     "directory": {
       "description": "The directory to store the application in.",
       "type": "string",
@@ -30,5 +38,5 @@
       "x-prompt": "What directory would you like to store your application in?"
     }
   },
-  "required": ["apiName"]
+  "required": ["name"]
 }

package/src/trpc/react/__snapshots__/generator.spec.ts.snap

@@ -1,104 +1,217 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`trpc react generator > should generate trpc react files > TrpcClients-TrpcApis.tsx 1`] = `
-"import {
-  AppRouter as TestApiAppRouter,
-  Context as TestApiContext,
-} from 'backend';
-import { createTrpcClientProvider } from './TrpcProvider';
-export default {
-  TestApi: createTrpcClientProvider<TestApiAppRouter, TestApiContext>(),
-};
-"
-`;
+exports[`trpc react generator > should generate trpc react files > TestApiClientProvider.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
+import { createTRPCContext } from '@trpc/tanstack-react-query';
+import { FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
+
+const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
 
-exports[`trpc react generator > should generate trpc react files > TrpcClients-TrpcClientProviders.tsx 1`] = `
-"import TrpcApis from './TrpcApis';
-import { useRuntimeConfig } from '../../hooks/useRuntimeConfig';
-import { FC, PropsWithChildren } from 'react';
+export const useTestApi = useTRPC;
 
-const TrpcClientProviders: FC<PropsWithChildren> = ({ children }) => {
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
   const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+
+  const trpcClient = useMemo(() => {
+    const linkOptions: HTTPLinkOptions<any> = {
+      url: apiUrl,
+    };
+
+    return createTRPCClient<AppRouter>({
+      links: [httpLink(linkOptions)],
+    });
+  }, [apiUrl]);
+
   return (
-    <TrpcApis.TestApi.Provider apiUrl={runtimeConfig.apis.TestApi}>
+    <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
       {children}
-    </TrpcApis.TestApi.Provider>
+    </TRPCProvider>
   );
 };
 
-export default TrpcClientProviders;
+export default TestApiClientProvider;
+"
+`;
+
+exports[`trpc react generator > should generate trpc react files > useTestApi.tsx 1`] = `
+"import { useTestApi as useClient } from '../components/TestApiClientProvider';
+
+export const useTestApi = useClient;
 "
 `;
 
-exports[`trpc react generator > should generate trpc react files > TrpcClients-TrpcProvider.tsx 1`] = `
-"import { useQueryClient } from '@tanstack/react-query';
+exports[`trpc react generator > should handle Cognito auth option > TestApiClientProvider-Cognito.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
 import { createTRPCContext } from '@trpc/tanstack-react-query';
-import { httpLink, HTTPLinkOptions, createTRPCClient } from '@trpc/client';
-import { FC, useMemo, PropsWithChildren } from 'react';
+import { FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
+import { useAuth } from 'react-oidc-context';
 
-import { AnyTRPCRouter } from '@trpc/server';
+const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
 
-export interface TrpcClientProviderProps extends PropsWithChildren {
-  readonly apiUrl: string;
-}
+export const useTestApi = useTRPC;
 
-export const createTrpcClientProvider = <
-  TAppRouter extends AnyTRPCRouter,
-  TContext,
->() => {
-  const { TRPCProvider, useTRPC } = createTRPCContext<TAppRouter>();
-
-  const TrpcClientProvider: FC<TrpcClientProviderProps> = ({
-    apiUrl,
-    children,
-  }) => {
-    const queryClient = useQueryClient();
-
-    const trpcClient = useMemo(() => {
-      const linkOptions: HTTPLinkOptions<any> = {
-        url: apiUrl,
-      };
-
-      return createTRPCClient({
-        links: [httpLink(linkOptions)],
-      });
-    }, [apiUrl]);
-
-    return (
-      <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
-        {children}
-      </TRPCProvider>
-    );
-  };
-
-  return {
-    useTRPC,
-    Provider: TrpcClientProvider,
-  };
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+
+  const { user } = useAuth();
+
+  const trpcClient = useMemo(() => {
+    const linkOptions: HTTPLinkOptions<any> = {
+      url: apiUrl,
+      headers: {
+        Authorization: \`Bearer \${user?.id_token}\`,
+      },
+    };
+
+    return createTRPCClient<AppRouter>({
+      links: [httpLink(linkOptions)],
+    });
+  }, [apiUrl, user]);
+
+  return (
+    <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
+      {children}
+    </TRPCProvider>
+  );
 };
+
+export default TestApiClientProvider;
 "
 `;
 
-exports[`trpc react generator > should generate trpc react files > TrpcClients-index.tsx 1`] = `
-"import TrpcClientProviders from './TrpcClientProviders';
-import _TrpcApis from './TrpcApis';
+exports[`trpc react generator > should handle IAM auth option > TestApiClientProvider-IAM.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
+import { createTRPCContext } from '@trpc/tanstack-react-query';
+import { FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import { HTTPLinkOptions, createTRPCClient, httpLink } from '@trpc/client';
+import { useSigV4 } from '../hooks/useSigV4';
+
+const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
+
+export const useTestApi = useTRPC;
+
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+
+  const sigv4Client = useSigV4();
+
+  const trpcClient = useMemo(() => {
+    const linkOptions: HTTPLinkOptions<any> = {
+      url: apiUrl,
+      fetch: sigv4Client,
+    };
+
+    return createTRPCClient<AppRouter>({
+      links: [httpLink(linkOptions)],
+    });
+  }, [apiUrl, sigv4Client]);
+
+  return (
+    <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
+      {children}
+    </TRPCProvider>
+  );
+};
 
-export const TrpcApis = _TrpcApis;
-export default TrpcClientProviders;
+export default TestApiClientProvider;
 "
 `;
 
-exports[`trpc react generator > should generate trpc react files > useTestApi.tsx 1`] = `
-"import { TrpcApis } from '../components/TrpcClients';
+exports[`trpc react generator > should handle IAM auth option > useSigV4.tsx 1`] = `
+"import { AwsClient } from 'aws4fetch';
+import { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity';
+import { fromCognitoIdentityPool } from '@aws-sdk/credential-provider-cognito-identity';
+import { useCallback, useState } from 'react';
+import { useAuth } from 'react-oidc-context';
+import { useRuntimeConfig } from './useRuntimeConfig';
+import {
+  AwsCredentialIdentity,
+  AwsCredentialIdentityProvider,
+} from '@smithy/types';
+
+// Credential expiration grace time before considering credentials as expired
+const CREDENTIAL_EXPIRY_OFFSET_MILLIS = 30 * 1000;
+
+export const useSigV4 = () => {
+  const { cognitoProps } = useRuntimeConfig();
+  const { user } = useAuth();
+
+  const [cachedCredentials, setCachedCredentials] = useState<{
+    [key: string]: AwsCredentialIdentity;
+  }>({});
+
+  const withCachedCredentials = useCallback(
+    async (
+      provider: AwsCredentialIdentityProvider,
+      ...cacheKeys: string[]
+    ): Promise<AwsCredentialIdentity> => {
+      const key = \`sigv4/\${cacheKeys.join('/')}\`;
+      const cachedCreds = cachedCredentials[key];
+      if (
+        cachedCreds &&
+        cachedCreds.expiration &&
+        cachedCreds.expiration.getTime() >
+          Date.now() + CREDENTIAL_EXPIRY_OFFSET_MILLIS
+      ) {
+        return cachedCreds;
+      }
+      const credentials = await provider();
+      setCachedCredentials((prev) => ({ ...prev, [key]: credentials }));
+      return credentials;
+    },
+    [cachedCredentials, setCachedCredentials],
+  );
 
-export const useTestApi = () => TrpcApis.TestApi.useTRPC();
+  return useCallback(
+    async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
+      if (!cognitoProps) {
+        throw new Error('cognitoProps is undefined!');
+      }
+      if (!user?.id_token) {
+        throw new Error('user.id_token is undefined!');
+      }
+
+      const credentialsFromCognitoIdentityPool = fromCognitoIdentityPool({
+        client: new CognitoIdentityClient({ region: cognitoProps.region }),
+        identityPoolId: cognitoProps.identityPoolId,
+        logins: {
+          [\`cognito-idp.\${cognitoProps.region}.amazonaws.com/\${cognitoProps.userPoolId}\`]:
+            user.id_token,
+        },
+      });
+      const cognitoidentity = new CognitoIdentityClient({
+        credentials: credentialsFromCognitoIdentityPool,
+      });
+      const credential = await withCachedCredentials(
+        cognitoidentity.config.credentials,
+        cognitoProps.identityPoolId,
+        user.profile.sub,
+      );
+      const awsClient = new AwsClient(credential);
+      return awsClient.fetch(input, init);
+    },
+    [cognitoProps, user?.id_token, user?.profile.sub, withCachedCredentials],
+  );
+};
 "
 `;
 
-exports[`trpc react generator > should handle IAM auth option > TRPCClientProvider-IAM.tsx 1`] = `null`;
-
 exports[`trpc react generator > should modify main.tsx correctly > main.tsx 1`] = `
-"import TrpcClientProviders from './components/TrpcClients';
+"import TestApiClientProvider from './components/TestApiClientProvider';
 import QueryClientProvider from './components/QueryClientProvider';
 import RuntimeConfigProvider from './components/RuntimeConfig';
 import { App } from './app';
@@ -108,9 +221,9 @@ export function Main() {
   return (
     <RuntimeConfigProvider>
       <QueryClientProvider>
-        <TrpcClientProviders>
+        <TestApiClientProvider>
           <RouterProvider router={router} />
-        </TrpcClientProviders>
+        </TestApiClientProvider>
       </QueryClientProvider>
     </RuntimeConfigProvider>
   );

package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template

@@ -0,0 +1,54 @@
+import { AppRouter } from "<%- backendProjectAlias %>";
+import { useQueryClient } from "@tanstack/react-query";
+import { createTRPCContext } from "@trpc/tanstack-react-query";
+import { FC, PropsWithChildren, useMemo } from "react";
+import { useRuntimeConfig } from "../hooks/useRuntimeConfig";
+import { HTTPLinkOptions, createTRPCClient, httpLink } from "@trpc/client";
+<%_ if (auth === 'IAM') { _%>
+import { useSigV4 } from "../hooks/useSigV4";
+<%_ } else if (auth === 'Cognito') { _%>
+import { useAuth } from "react-oidc-context";
+<%_ } _%>
+
+const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>();
+
+export const use<%= apiNameClassName %> = useTRPC;
+
+export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
+  children,
+}) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.<%= apiNameClassName %>;
+
+  <%_ if (auth === 'IAM') { _%>
+  const sigv4Client = useSigV4();
+  <%_ } else if (auth === 'Cognito') { _%>
+  const { user } = useAuth();
+  <%_ } _%>
+
+  const trpcClient = useMemo(() => {
+    const linkOptions: HTTPLinkOptions<any> = {
+      url: apiUrl,
+      <%_ if (auth === 'IAM') { _%>
+      fetch: sigv4Client,
+      <%_ } else if (auth === 'Cognito') { _%>
+      headers: {
+        Authorization: `Bearer ${user?.id_token}`,
+      },
+      <%_ } _%>
+    };
+
+    return createTRPCClient<AppRouter>({
+      links: [httpLink(linkOptions)],
+    });
+  }, [apiUrl<% if (auth === 'IAM') { %>, sigv4Client<% } else if (auth === 'Cognito') { %>, user<% } %>]);
+
+  return (
+    <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
+      {children}
+    </TRPCProvider>
+  );
+};
+
+export default <%= apiNameClassName %>ClientProvider;

package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template

@@ -1,3 +1,3 @@
-import { TrpcApis } from '../components/TrpcClients';
+import { use<%- apiNameClassName %> as useClient } from '../components/<%- apiNameClassName %>ClientProvider';
 
-export const use<%= apiNameClassName %> = () => TrpcApis.<%= apiNameClassName %>.useTRPC();
+export const use<%- apiNameClassName %> = useClient;