@aws-amplify/graphql-api-construct 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -74,21 +74,21 @@
     "universalify"
   ],
   "dependencies": {
-    "@aws-amplify/backend-output-schemas": "^0.2.0-alpha.3",
-    "@aws-amplify/backend-output-storage": "^0.1.1-alpha.0",
-    "@aws-amplify/graphql-auth-transformer": "3.1.6",
-    "@aws-amplify/graphql-default-value-transformer": "2.1.5",
-    "@aws-amplify/graphql-function-transformer": "2.1.4",
-    "@aws-amplify/graphql-http-transformer": "2.1.4",
-    "@aws-amplify/graphql-index-transformer": "2.1.5",
-    "@aws-amplify/graphql-maps-to-transformer": "3.2.2",
-    "@aws-amplify/graphql-model-transformer": "2.2.1",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.4",
-    "@aws-amplify/graphql-relational-transformer": "2.1.5",
-    "@aws-amplify/graphql-searchable-transformer": "2.2.1",
-    "@aws-amplify/graphql-transformer": "1.2.2",
-    "@aws-amplify/graphql-transformer-core": "2.2.1",
-    "@aws-amplify/graphql-transformer-interfaces": "3.2.0",
+    "@aws-amplify/backend-output-schemas": "^0.2.0-alpha.6",
+    "@aws-amplify/backend-output-storage": "^0.1.1-alpha.2",
+    "@aws-amplify/graphql-auth-transformer": "3.1.7",
+    "@aws-amplify/graphql-default-value-transformer": "2.1.6",
+    "@aws-amplify/graphql-function-transformer": "2.1.5",
+    "@aws-amplify/graphql-http-transformer": "2.1.5",
+    "@aws-amplify/graphql-index-transformer": "2.1.6",
+    "@aws-amplify/graphql-maps-to-transformer": "3.2.3",
+    "@aws-amplify/graphql-model-transformer": "2.2.2",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.5",
+    "@aws-amplify/graphql-relational-transformer": "2.1.6",
+    "@aws-amplify/graphql-searchable-transformer": "2.2.2",
+    "@aws-amplify/graphql-transformer": "1.2.3",
+    "@aws-amplify/graphql-transformer-core": "2.2.2",
+    "@aws-amplify/graphql-transformer-interfaces": "3.2.1",
     "charenc": "^0.0.2",
     "crypt": "^0.0.2",
     "fs-extra": "^8.1.0",
@@ -162,5 +162,5 @@
       }
     }
   },
-  "gitHead": "185090987e9c49db5e59aa4476dad7e17e9d2067"
+  "gitHead": "58c67c5534f7838371ef64b5ee23f2f406817f70"
 }

package/src/amplify-graphql-api.ts

@@ -35,6 +35,7 @@ import type {
   FunctionSlot,
   IBackendOutputStorageStrategy,
   AddFunctionProps,
+  ConflictResolution,
 } from './types';
 import {
   convertAuthorizationModesToTransformerAuthConfig,
@@ -45,6 +46,7 @@ import {
   getGeneratedFunctionSlots,
   CodegenAssets,
   addAmplifyMetadataToStackDescription,
+  getAdditionalAuthenticationTypes,
 } from './internal';
 
 /**
@@ -103,6 +105,11 @@ export class AmplifyGraphqlApi extends Construct {
    */
   public readonly apiKey: string | undefined;
 
+  /**
+   * Conflict resolution setting
+   */
+  private readonly conflictResolution: ConflictResolution | undefined;
+
   /**
    * New AmplifyGraphqlApi construct, this will create an appsync api with authorization, a schema, and all necessary resolvers, functions,
    * and datasources.
@@ -180,6 +187,7 @@ export class AmplifyGraphqlApi extends Construct {
     this.codegenAssets = new CodegenAssets(this, 'AmplifyCodegenAssets', { modelSchema: definition.schema });
 
     this.resources = getGeneratedResources(this);
+    this.conflictResolution = conflictResolution;
     this.generatedFunctionSlots = getGeneratedFunctionSlots(assetManager.resolverAssets);
     this.storeOutput(outputStorageStrategy);
 
@@ -211,6 +219,15 @@ export class AmplifyGraphqlApi extends Construct {
       output.payload.awsAppsyncApiKey = this.resources.cfnResources.cfnApiKey.attrApiKey;
     }
 
+    const additionalAuthTypes = getAdditionalAuthenticationTypes(this.resources.cfnResources.cfnGraphqlApi);
+    if (additionalAuthTypes) {
+      output.payload.awsAppsyncAdditionalAuthenticationTypes = additionalAuthTypes;
+    }
+
+    if (this.conflictResolution?.project?.handlerType) {
+      output.payload.awsAppsyncConflictResolutionMode = this.conflictResolution?.project?.handlerType;
+    }
+
     outputStorageStrategy.addBackendOutputEntry(graphqlOutputKey, output);
   }
 

package/src/internal/authorization-modes.ts

@@ -7,6 +7,8 @@ import {
   OIDCAuthorizationConfig,
   UserPoolAuthorizationConfig,
 } from '../types';
+import { CfnGraphQLApi } from 'aws-cdk-lib/aws-appsync';
+import { isArray } from 'lodash';
 
 type AuthorizationConfigMode =
   | (IAMAuthorizationConfig & { type: 'AWS_IAM' })
@@ -128,6 +130,22 @@ interface AuthConfig {
   authSynthParameters: AuthSynthParameters;
 }
 
+/**
+ * Transforms additionalAuthenticationTypes for storage in CFN output
+ */
+export const getAdditionalAuthenticationTypes = (cfnGraphqlApi: CfnGraphQLApi): string | undefined => {
+  if (!isArray(cfnGraphqlApi.additionalAuthenticationProviders)) {
+    return;
+  }
+
+  return (cfnGraphqlApi.additionalAuthenticationProviders as CfnGraphQLApi.AdditionalAuthenticationProviderProperty[])
+    .map(
+      (additionalAuthenticationProvider: CfnGraphQLApi.AdditionalAuthenticationProviderProperty) =>
+        additionalAuthenticationProvider.authenticationType,
+    )
+    .join(',');
+};
+
 /**
  * Convert the list of auth modes into the necessary flags and params (effectively a reducer on the rule list)
  * @param authModes the list of auth modes configured on the API.