@ttoss/appsync-api 0.6.0 → 0.7.1

package/dist/esm/{chunk-MENSBKNQ.js → chunk-F5DPPZQE.js}

@@ -539,7 +539,7 @@ var getPackageLambdaLayerStackName = (packageName) => {
 // package.json
 var package_default = {
   name: "@ttoss/appsync-api",
-  version: "0.6.0",
+  version: "0.7.1",
   description: "A library for building GraphQL APIs for AWS AppSync.",
   license: "UNLICENSED",
   author: "ttoss",
@@ -583,8 +583,8 @@ var package_default = {
   },
   devDependencies: {
     "@ttoss/config": "^1.27.0",
-    "@types/aws-lambda": "^8.10.109",
-    carlin: "^1.22.0",
+    "@types/aws-lambda": "^8.10.110",
+    carlin: "^1.22.1",
     graphql: "^16.6.0",
     "graphql-compose": "^9.0.10"
   },
@@ -616,10 +616,12 @@ var AppSyncLambdaFunctionLogicalId = "AppSyncLambdaFunction";
 var AppSyncLambdaFunctionAppSyncDataSourceLogicalId = "AppSyncLambdaFunctionAppSyncDataSource";
 var AppSyncGraphQLApiKeyLogicalId = "AppSyncGraphQLApiKey";
 var createApiTemplate = ({
-  apiKey,
+  additionalAuthenticationProviders,
+  authenticationType = "AMAZON_COGNITO_USER_POOLS",
   schemaComposer,
   dataSource,
-  lambdaFunction
+  lambdaFunction,
+  userPoolConfig
 }) => {
   const sdl = schemaComposer.toSDL();
   graphql.validateSchema(schemaComposer.buildSchema());
@@ -671,7 +673,7 @@ var createApiTemplate = ({
       [AppSyncGraphQLApiLogicalId]: {
         Type: "AWS::AppSync::GraphQLApi",
         Properties: {
-          AuthenticationType: "AWS_IAM",
+          AuthenticationType: authenticationType,
           Name: {
             "Fn::Join": [
               ":",
@@ -719,10 +721,28 @@ var createApiTemplate = ({
       }
     },
     Outputs: {
-      [AppSyncGraphQLApiLogicalId]: {
+      AppSyncApiGraphQLUrl: {
+        Export: {
+          Name: {
+            "Fn::Join": [
+              ":",
+              [{ Ref: "AWS::StackName" }, "AppSyncApiGraphQLUrl"]
+            ]
+          }
+        },
         Value: {
           "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "GraphQLUrl"]
         }
+      },
+      AppSyncApiArn: {
+        Export: {
+          Name: {
+            "Fn::Join": [":", [{ Ref: "AWS::StackName" }, "AppSyncApiArn"]]
+          }
+        },
+        Value: {
+          "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "Arn"]
+        }
       }
     }
   };
@@ -743,12 +763,16 @@ var createApiTemplate = ({
       }
     };
   });
+  const apiKey = additionalAuthenticationProviders?.includes("API_KEY") || authenticationType === "API_KEY";
+  const cognitoUserPoolAuth = additionalAuthenticationProviders?.includes("AMAZON_COGNITO_USER_POOLS") || authenticationType === "AMAZON_COGNITO_USER_POOLS";
+  if (additionalAuthenticationProviders) {
+    template.Resources[AppSyncGraphQLApiLogicalId].Properties.AdditionalAuthenticationProviders = additionalAuthenticationProviders?.map((provider) => {
+      return {
+        AuthenticationType: provider
+      };
+    });
+  }
   if (apiKey) {
-    template.Resources[AppSyncGraphQLApiLogicalId].Properties.AdditionalAuthenticationProvider = [
-      {
-        AuthenticationType: "API_KEY"
-      }
-    ];
     template.Resources[AppSyncGraphQLApiKeyLogicalId] = {
       Type: "AWS::AppSync::ApiKey",
       Properties: {
@@ -764,6 +788,24 @@ var createApiTemplate = ({
       }
     };
   }
+  if (cognitoUserPoolAuth) {
+    if (!userPoolConfig) {
+      throw new Error(
+        "userPoolConfig is required when using AMAZON_COGNITO_USER_POOLS authentication."
+      );
+    }
+    template.Resources[AppSyncGraphQLApiLogicalId].Properties.UserPoolConfig = {
+      AppIdClientRegex: userPoolConfig.appIdClientRegex,
+      AwsRegion: userPoolConfig.awsRegion,
+      DefaultAction: userPoolConfig.defaultAction,
+      UserPoolId: userPoolConfig.userPoolId
+    };
+  }
+  if (lambdaFunction.environment?.variables) {
+    template.Resources[AppSyncLambdaFunctionLogicalId].Properties.Environment = {
+      Variables: lambdaFunction.environment.variables
+    };
+  }
   return template;
 };
 

package/dist/esm/cli.js

@@ -1,7 +1,7 @@
 /** Powered by @ttoss/config. https://ttoss.dev/docs/modules/packages/config/ */
 import {
   AppSyncGraphQLSchemaLogicalId
-} from "./chunk-MENSBKNQ.js";
+} from "./chunk-F5DPPZQE.js";
 import "./chunk-NQOARNEJ.js";
 
 // src/cli.ts

package/dist/esm/index.js

@@ -1,25 +1,21 @@
 /** Powered by @ttoss/config. https://ttoss.dev/docs/modules/packages/config/ */
 import {
   createApiTemplate
-} from "./chunk-MENSBKNQ.js";
+} from "./chunk-F5DPPZQE.js";
 import "./chunk-NQOARNEJ.js";
 
-// src/index.ts
-import { schemaComposer } from "graphql-compose";
-
 // src/createAppSyncResolverHandler.ts
 var createAppSyncResolverHandler = ({
-  schemaComposer: schemaComposer2
+  schemaComposer
 }) => {
   return async (event, context) => {
     const { info, arguments: args, source } = event;
     const { parentTypeName, fieldName } = info;
-    const resolver = schemaComposer2.getResolveMethods()[parentTypeName][fieldName];
-    return resolver(source, args, context, info);
+    const resolver = schemaComposer.getResolveMethods()[parentTypeName][fieldName];
+    return resolver(source, args, { ...context, ...event.identity }, info);
   };
 };
 export {
   createApiTemplate,
-  createAppSyncResolverHandler,
-  schemaComposer
+  createAppSyncResolverHandler
 };

package/dist/index.d.ts

@@ -1,20 +1,31 @@
 import { SchemaComposer } from 'graphql-compose';
-export { ResolverResolveParams, schemaComposer } from 'graphql-compose';
 import { CloudFormationTemplate } from '@ttoss/cloudformation';
 import { AppSyncResolverHandler as AppSyncResolverHandler$1 } from 'aws-lambda';
+export { AppSyncIdentityCognito } from 'aws-lambda';
 
-type Role = string | {
+type StringOrImport = string | {
     'Fn::ImportValue': string;
 };
-declare const createApiTemplate: ({ apiKey, schemaComposer, dataSource, lambdaFunction, }: {
-    apiKey?: boolean | undefined;
+type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS' | 'API_KEY';
+declare const createApiTemplate: ({ additionalAuthenticationProviders, authenticationType, schemaComposer, dataSource, lambdaFunction, userPoolConfig, }: {
+    additionalAuthenticationProviders?: AuthenticationType[] | undefined;
+    authenticationType?: AuthenticationType | undefined;
     schemaComposer: SchemaComposer<any>;
     dataSource: {
-        roleArn: Role;
+        roleArn: StringOrImport;
     };
     lambdaFunction: {
-        roleArn: Role;
+        environment?: {
+            variables: Record<string, string>;
+        };
+        roleArn: StringOrImport;
     };
+    userPoolConfig?: {
+        appIdClientRegex: StringOrImport;
+        awsRegion: StringOrImport;
+        defaultAction: 'ALLOW' | 'DENY';
+        userPoolId: StringOrImport;
+    } | undefined;
 }) => CloudFormationTemplate;
 
 type AppSyncResolverHandler<TArguments, TResult, TSource = Record<string, any> | null> = AppSyncResolverHandler$1<TArguments, TResult, TSource>;

package/dist/index.js

@@ -471,11 +471,9 @@ var require_tslib = __commonJS({
 var src_exports = {};
 __export(src_exports, {
   createApiTemplate: () => createApiTemplate,
-  createAppSyncResolverHandler: () => createAppSyncResolverHandler,
-  schemaComposer: () => import_graphql_compose2.schemaComposer
+  createAppSyncResolverHandler: () => createAppSyncResolverHandler
 });
 module.exports = __toCommonJS(src_exports);
-var import_graphql_compose2 = require("graphql-compose");
 
 // src/createApiTemplate.ts
 var import_graphql_compose = require("graphql-compose");
@@ -572,7 +570,7 @@ var getPackageLambdaLayerStackName = (packageName) => {
 // package.json
 var package_default = {
   name: "@ttoss/appsync-api",
-  version: "0.6.0",
+  version: "0.7.1",
   description: "A library for building GraphQL APIs for AWS AppSync.",
   license: "UNLICENSED",
   author: "ttoss",
@@ -616,8 +614,8 @@ var package_default = {
   },
   devDependencies: {
     "@ttoss/config": "^1.27.0",
-    "@types/aws-lambda": "^8.10.109",
-    carlin: "^1.22.0",
+    "@types/aws-lambda": "^8.10.110",
+    carlin: "^1.22.1",
     graphql: "^16.6.0",
     "graphql-compose": "^9.0.10"
   },
@@ -649,14 +647,16 @@ var AppSyncLambdaFunctionLogicalId = "AppSyncLambdaFunction";
 var AppSyncLambdaFunctionAppSyncDataSourceLogicalId = "AppSyncLambdaFunctionAppSyncDataSource";
 var AppSyncGraphQLApiKeyLogicalId = "AppSyncGraphQLApiKey";
 var createApiTemplate = ({
-  apiKey,
-  schemaComposer: schemaComposer2,
+  additionalAuthenticationProviders,
+  authenticationType = "AMAZON_COGNITO_USER_POOLS",
+  schemaComposer,
   dataSource,
-  lambdaFunction
+  lambdaFunction,
+  userPoolConfig
 }) => {
-  const sdl = schemaComposer2.toSDL();
-  import_graphql_compose.graphql.validateSchema(schemaComposer2.buildSchema());
-  const resolveMethods = schemaComposer2.getResolveMethods();
+  const sdl = schemaComposer.toSDL();
+  import_graphql_compose.graphql.validateSchema(schemaComposer.buildSchema());
+  const resolveMethods = schemaComposer.getResolveMethods();
   const resolveMethodsEntries = Object.entries(resolveMethods).flatMap(
     ([typeName, fieldResolvers]) => {
       return Object.entries(fieldResolvers).map(([fieldName]) => {
@@ -704,7 +704,7 @@ var createApiTemplate = ({
       [AppSyncGraphQLApiLogicalId]: {
         Type: "AWS::AppSync::GraphQLApi",
         Properties: {
-          AuthenticationType: "AWS_IAM",
+          AuthenticationType: authenticationType,
           Name: {
             "Fn::Join": [
               ":",
@@ -752,10 +752,28 @@ var createApiTemplate = ({
       }
     },
     Outputs: {
-      [AppSyncGraphQLApiLogicalId]: {
+      AppSyncApiGraphQLUrl: {
+        Export: {
+          Name: {
+            "Fn::Join": [
+              ":",
+              [{ Ref: "AWS::StackName" }, "AppSyncApiGraphQLUrl"]
+            ]
+          }
+        },
         Value: {
           "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "GraphQLUrl"]
         }
+      },
+      AppSyncApiArn: {
+        Export: {
+          Name: {
+            "Fn::Join": [":", [{ Ref: "AWS::StackName" }, "AppSyncApiArn"]]
+          }
+        },
+        Value: {
+          "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "Arn"]
+        }
       }
     }
   };
@@ -776,12 +794,16 @@ var createApiTemplate = ({
       }
     };
   });
+  const apiKey = additionalAuthenticationProviders?.includes("API_KEY") || authenticationType === "API_KEY";
+  const cognitoUserPoolAuth = additionalAuthenticationProviders?.includes("AMAZON_COGNITO_USER_POOLS") || authenticationType === "AMAZON_COGNITO_USER_POOLS";
+  if (additionalAuthenticationProviders) {
+    template.Resources[AppSyncGraphQLApiLogicalId].Properties.AdditionalAuthenticationProviders = additionalAuthenticationProviders?.map((provider) => {
+      return {
+        AuthenticationType: provider
+      };
+    });
+  }
   if (apiKey) {
-    template.Resources[AppSyncGraphQLApiLogicalId].Properties.AdditionalAuthenticationProvider = [
-      {
-        AuthenticationType: "API_KEY"
-      }
-    ];
     template.Resources[AppSyncGraphQLApiKeyLogicalId] = {
       Type: "AWS::AppSync::ApiKey",
       Properties: {
@@ -797,23 +819,40 @@ var createApiTemplate = ({
       }
     };
   }
+  if (cognitoUserPoolAuth) {
+    if (!userPoolConfig) {
+      throw new Error(
+        "userPoolConfig is required when using AMAZON_COGNITO_USER_POOLS authentication."
+      );
+    }
+    template.Resources[AppSyncGraphQLApiLogicalId].Properties.UserPoolConfig = {
+      AppIdClientRegex: userPoolConfig.appIdClientRegex,
+      AwsRegion: userPoolConfig.awsRegion,
+      DefaultAction: userPoolConfig.defaultAction,
+      UserPoolId: userPoolConfig.userPoolId
+    };
+  }
+  if (lambdaFunction.environment?.variables) {
+    template.Resources[AppSyncLambdaFunctionLogicalId].Properties.Environment = {
+      Variables: lambdaFunction.environment.variables
+    };
+  }
   return template;
 };
 
 // src/createAppSyncResolverHandler.ts
 var createAppSyncResolverHandler = ({
-  schemaComposer: schemaComposer2
+  schemaComposer
 }) => {
   return async (event, context) => {
     const { info, arguments: args, source } = event;
     const { parentTypeName, fieldName } = info;
-    const resolver = schemaComposer2.getResolveMethods()[parentTypeName][fieldName];
-    return resolver(source, args, context, info);
+    const resolver = schemaComposer.getResolveMethods()[parentTypeName][fieldName];
+    return resolver(source, args, { ...context, ...event.identity }, info);
   };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createApiTemplate,
-  createAppSyncResolverHandler,
-  schemaComposer
+  createAppSyncResolverHandler
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/appsync-api",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "A library for building GraphQL APIs for AWS AppSync.",
   "license": "UNLICENSED",
   "author": "ttoss",
@@ -44,8 +44,8 @@
   },
   "devDependencies": {
     "@ttoss/config": "^1.27.0",
-    "@types/aws-lambda": "^8.10.109",
-    "carlin": "^1.22.0",
+    "@types/aws-lambda": "^8.10.110",
+    "carlin": "^1.22.1",
     "graphql": "^16.6.0",
     "graphql-compose": "^9.0.10"
   },
@@ -68,5 +68,5 @@
       ]
     }
   },
-  "gitHead": "6c5898425e2847fed46511ae1e573ff8dc3eb1d4"
+  "gitHead": "54403777733bc033dd317217f8cd679ee8244bba"
 }

package/src/createApiTemplate.ts

@@ -14,25 +14,39 @@ const AppSyncLambdaFunctionAppSyncDataSourceLogicalId =
 
 export const AppSyncGraphQLApiKeyLogicalId = 'AppSyncGraphQLApiKey';
 
-type Role =
+type StringOrImport =
   | string
   | {
       'Fn::ImportValue': string;
     };
 
+type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS' | 'API_KEY';
+
 export const createApiTemplate = ({
-  apiKey,
+  additionalAuthenticationProviders,
+  authenticationType = 'AMAZON_COGNITO_USER_POOLS',
   schemaComposer,
   dataSource,
   lambdaFunction,
+  userPoolConfig,
 }: {
-  apiKey?: boolean;
+  additionalAuthenticationProviders?: AuthenticationType[];
+  authenticationType?: AuthenticationType;
   schemaComposer: SchemaComposer<any>;
   dataSource: {
-    roleArn: Role;
+    roleArn: StringOrImport;
   };
   lambdaFunction: {
-    roleArn: Role;
+    environment?: {
+      variables: Record<string, string>;
+    };
+    roleArn: StringOrImport;
+  };
+  userPoolConfig?: {
+    appIdClientRegex: StringOrImport;
+    awsRegion: StringOrImport;
+    defaultAction: 'ALLOW' | 'DENY';
+    userPoolId: StringOrImport;
   };
 }): CloudFormationTemplate => {
   /**
@@ -100,7 +114,7 @@ export const createApiTemplate = ({
       [AppSyncGraphQLApiLogicalId]: {
         Type: 'AWS::AppSync::GraphQLApi',
         Properties: {
-          AuthenticationType: 'AWS_IAM',
+          AuthenticationType: authenticationType,
           Name: {
             'Fn::Join': [
               ':',
@@ -152,11 +166,29 @@ export const createApiTemplate = ({
       },
     },
     Outputs: {
-      [AppSyncGraphQLApiLogicalId]: {
+      AppSyncApiGraphQLUrl: {
+        Export: {
+          Name: {
+            'Fn::Join': [
+              ':',
+              [{ Ref: 'AWS::StackName' }, 'AppSyncApiGraphQLUrl'],
+            ],
+          },
+        },
         Value: {
           'Fn::GetAtt': [AppSyncGraphQLApiLogicalId, 'GraphQLUrl'],
         },
       },
+      AppSyncApiArn: {
+        Export: {
+          Name: {
+            'Fn::Join': [':', [{ Ref: 'AWS::StackName' }, 'AppSyncApiArn']],
+          },
+        },
+        Value: {
+          'Fn::GetAtt': [AppSyncGraphQLApiLogicalId, 'Arn'],
+        },
+      },
     },
   };
 
@@ -178,15 +210,26 @@ export const createApiTemplate = ({
     };
   });
 
-  if (apiKey) {
+  const apiKey =
+    additionalAuthenticationProviders?.includes('API_KEY') ||
+    authenticationType === 'API_KEY';
+
+  const cognitoUserPoolAuth =
+    additionalAuthenticationProviders?.includes('AMAZON_COGNITO_USER_POOLS') ||
+    authenticationType === 'AMAZON_COGNITO_USER_POOLS';
+
+  if (additionalAuthenticationProviders) {
     template.Resources[
       AppSyncGraphQLApiLogicalId
-    ].Properties.AdditionalAuthenticationProvider = [
-      {
-        AuthenticationType: 'API_KEY',
-      },
-    ];
+    ].Properties.AdditionalAuthenticationProviders =
+      additionalAuthenticationProviders?.map((provider) => {
+        return {
+          AuthenticationType: provider,
+        };
+      });
+  }
 
+  if (apiKey) {
     template.Resources[AppSyncGraphQLApiKeyLogicalId] = {
       Type: 'AWS::AppSync::ApiKey',
       Properties: {
@@ -205,5 +248,27 @@ export const createApiTemplate = ({
     };
   }
 
+  if (cognitoUserPoolAuth) {
+    if (!userPoolConfig) {
+      throw new Error(
+        'userPoolConfig is required when using AMAZON_COGNITO_USER_POOLS authentication.'
+      );
+    }
+
+    template.Resources[AppSyncGraphQLApiLogicalId].Properties.UserPoolConfig = {
+      AppIdClientRegex: userPoolConfig.appIdClientRegex,
+      AwsRegion: userPoolConfig.awsRegion,
+      DefaultAction: userPoolConfig.defaultAction,
+      UserPoolId: userPoolConfig.userPoolId,
+    };
+  }
+
+  if (lambdaFunction.environment?.variables) {
+    template.Resources[AppSyncLambdaFunctionLogicalId].Properties.Environment =
+      {
+        Variables: lambdaFunction.environment.variables,
+      };
+  }
+
   return template;
 };

package/src/createAppSyncResolverHandler.ts

@@ -18,6 +18,6 @@ export const createAppSyncResolverHandler = ({
     const resolver = (
       schemaComposer.getResolveMethods()[parentTypeName] as any
     )[fieldName];
-    return resolver(source, args, context, info);
+    return resolver(source, args, { ...context, ...event.identity }, info);
   };
 };

package/src/index.ts

@@ -1,6 +1,6 @@
-export { type ResolverResolveParams, schemaComposer } from 'graphql-compose';
 export { createApiTemplate } from './createApiTemplate';
 export {
   type AppSyncResolverHandler,
   createAppSyncResolverHandler,
 } from './createAppSyncResolverHandler';
+export type { AppSyncIdentityCognito } from 'aws-lambda';