update real time provider; update exports util; update internal graph…

…ql api
aws-amplify · Sep 13, 2023 · e25e2f9 · e25e2f9
1 parent 69607e2
commit e25e2f9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/packages/api-graphql/src/Providers/AWSAppSyncRealTimeProvider/index.ts b/packages/api-graphql/src/Providers/AWSAppSyncRealTimeProvider/index.ts
@@ -882,7 +882,7 @@ export class AWSAppSyncRealTimeProvider {
 		Record<string, unknown> | undefined
 	> {
 		const headerHandler: {
-			[key: string]: (AWSAppSyncRealTimeAuthInput) => {};
+			[key: string]: (arg0: AWSAppSyncRealTimeAuthInput) => {};
 		} = {
 			apiKey: this._awsRealTimeApiKeyHeader.bind(this),
 			iam: this._awsRealTimeIAMHeader.bind(this),

diff --git a/packages/api-graphql/src/internals/InternalGraphQLAPI.ts b/packages/api-graphql/src/internals/InternalGraphQLAPI.ts
@@ -506,19 +506,17 @@ export class InternalGraphQLAPIClass {
 		additionalHeaders = {},
 		customUserAgentDetails?: CustomUserAgentDetails
 	): Observable<any> {
+		const { AppSync } = Amplify.getConfig().API ?? {};
 		if (!this.appSyncRealTime) {
-			const { AppSync } = Amplify.getConfig().API ?? {};
-
 			this.appSyncRealTime = new AWSAppSyncRealTimeProvider();
-
-			return this.appSyncRealTime.subscribe({
-				query: print(query as DocumentNode),
-				variables,
-				appSyncGraphqlEndpoint: AppSync.endpoint,
-				region: AppSync.region,
-				authenticationType: AppSync.defaultAuthMode,
-			});
 		}
+		return this.appSyncRealTime.subscribe({
+			query: print(query as DocumentNode),
+			variables,
+			appSyncGraphqlEndpoint: AppSync.endpoint,
+			region: AppSync.region,
+			authenticationType: AppSync.defaultAuthMode,
+		});
 	}
 	// if (InternalPubSub && typeof InternalPubSub.subscribe === 'function') {
 	// 	return InternalPubSub.subscribe(

diff --git a/packages/core/src/parseAWSExports.ts b/packages/core/src/parseAWSExports.ts
@@ -51,7 +51,11 @@ export const parseAWSExports = (
 		amplifyConfig.API = {
 			AppSync: {
 				apiKey: aws_appsync_apiKey,
-				defaultAuthMode: aws_appsync_authenticationType,
+				// defaultAuthMode: aws_appsync_authenticationType,
+				defaultAuthMode: {
+					type: aws_appsync_authenticationType,
+					apiKey: aws_appsync_apiKey,
+				},
 				endpoint: aws_appsync_graphqlEndpoint,
 				region: aws_appsync_region,
 			},