@aws-amplify/api-graphql 4.0.1-api-v6-models.c1977f8.0 → 4.0.1-api-v6-models.9351bcf.0

package/lib-esm/types/index.d.ts

@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { GraphQLAuthMode, DocumentType } from '@aws-amplify/core/internals/utils';
 export { CONTROL_MSG, ConnectionState } from './PubSub';
 export { SelectionSet } from '@aws-amplify/amplify-api-next-types-alpha';
+export { CommonPublicClientOptions } from '../internals/types';
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
  */
@@ -281,8 +282,12 @@ type ExcludeNeverFields<O> = {
     [K in FilteredKeys<O>]: O[K];
 };
 export declare const __amplify: unique symbol;
+export declare const __authMode: unique symbol;
+export declare const __authToken: unique symbol;
 export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
     [__amplify]: AmplifyClassV6;
+    [__authMode]?: GraphQLAuthMode;
+    [__authToken]?: string;
     graphql: <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>, additionalHeaders?: {
         [key: string]: string;
     } | undefined) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;

package/lib-esm/types/index.js

@@ -8,3 +8,5 @@ export var GraphQLAuthError;
     GraphQLAuthError["NO_AUTH_TOKEN"] = "No auth token specified";
 })(GraphQLAuthError || (GraphQLAuthError = {}));
 export var __amplify = Symbol('amplify');
+export var __authMode = Symbol('authMode');
+export var __authToken = Symbol('authToken');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-api-v6-models.c1977f8.0+c1977f8",
+	"version": "4.0.1-api-v6-models.9351bcf.0+9351bcf",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -51,10 +51,10 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.0",
-		"@aws-amplify/api-rest": "4.0.1-api-v6-models.c1977f8.0+c1977f8",
-		"@aws-amplify/auth": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
-		"@aws-amplify/core": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
+		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.4",
+		"@aws-amplify/api-rest": "4.0.1-api-v6-models.9351bcf.0+9351bcf",
+		"@aws-amplify/auth": "6.0.1-api-v6-models.9351bcf.0+9351bcf",
+		"@aws-amplify/core": "6.0.1-api-v6-models.9351bcf.0+9351bcf",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -126,5 +126,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "c1977f8efaae41b693495a2d6c53c503d0038e95"
+	"gitHead": "9351bcfbeb9ec15f67fc6404ca192689a398d260"
 }

package/src/internals/APIClient.ts

@@ -48,7 +48,7 @@ export function initializeModel(
 	modelName: string,
 	result: any[],
 	modelIntrospection: any,
-	authMode: GraphQLAuthMode,
+	authMode: GraphQLAuthMode | undefined,
 	authToken: string | undefined
 ): any[] {
 	const introModel = modelIntrospection.models[modelName];

package/src/internals/generateClient.ts

@@ -3,7 +3,7 @@
 import { AmplifyClassV6 } from '@aws-amplify/core';
 import { graphql, cancel, isCancelError } from './v6';
 import { generateModelsProperty } from './generateModelsProperty';
-import { V6Client, __amplify } from '../types';
+import { V6Client, __amplify, __authMode, __authToken } from '../types';
 import { ClientGenerationParams } from './types';
 
 /**
@@ -20,6 +20,8 @@ export function generateClient<T extends Record<any, any> = never>(
 ): V6Client<T> {
 	const client = {
 		[__amplify]: params.amplify,
+		[__authMode]: params.authMode,
+		[__authToken]: params.authToken,
 		graphql,
 		cancel,
 		isCancelError,

package/src/internals/generateModelsProperty.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ModelTypes } from '@aws-amplify/amplify-api-next-types-alpha';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 import {
 	initializeModel,
 	generateGraphQLDocument,
@@ -10,10 +11,39 @@ import {
 	flattenItems,
 } from './APIClient';
 import { ClientGenerationParams } from './types';
-import { V6Client, GraphqlSubscriptionResult } from '../types';
+import {
+	V6Client,
+	GraphqlSubscriptionResult,
+	__authMode,
+	__authToken,
+} from '../types';
 import { findIndexByFields, resolvePKFields } from '../utils';
 import { Observable, map } from 'rxjs';
 
+type AuthModeParams = {
+	authMode?: GraphQLAuthMode;
+	authToken?: string;
+};
+
+/**
+ * Produces a parameter object that can contains auth mode/token overrides
+ * only if present in either `options` (first) or configured on the `client`
+ * as a fallback.
+ *
+ * @param client Configured client from `generateClient`
+ * @param options Args/Options obect from call site.
+ * @returns
+ */
+function authModeParams(
+	client: V6Client,
+	options: AuthModeParams = {}
+): AuthModeParams {
+	return {
+		authMode: options.authMode || client[__authMode],
+		authToken: options.authToken || client[__authToken],
+	};
+}
+
 export function generateModelsProperty<T extends Record<any, any> = never>(
 	client: V6Client,
 	params: ClientGenerationParams
@@ -53,12 +83,10 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 						);
 
 						try {
-							const options: Record<string, any> = {};
-							if (args?.authMode) options.authMode = args?.authMode;
-							if (args?.authToken) options.authToken = args?.authToken;
+							const auth = authModeParams(client, args);
 
 							const { data, extensions } = (await client.graphql({
-								...options,
+								...auth,
 								query,
 								variables,
 							})) as any;
@@ -83,8 +111,8 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 											name,
 											flattenedResult,
 											modelIntrospection,
-											options.authMode,
-											options.authToken
+											auth.authMode,
+											auth.authToken
 										);
 
 										return {
@@ -125,12 +153,10 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 							modelIntrospection
 						);
 
-						const options: Record<string, any> = {};
-						if (args?.authMode) options.authMode = args?.authMode;
-						if (args?.authToken) options.authToken = args?.authToken;
+						const auth = authModeParams(client, args);
 
 						const observable = client.graphql({
-							...options,
+							...auth,
 							query,
 							variables,
 						}) as GraphqlSubscriptionResult<object>;
@@ -143,8 +169,8 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 									name,
 									[value.data[key]],
 									modelIntrospection,
-									options?.authMode,
-									options?.authToken
+									auth.authMode,
+									auth.authToken
 								);
 								return initialized;
 							})
@@ -302,8 +328,9 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 						);
 
 						try {
+							const auth = authModeParams(client, options);
 							const { data, extensions } = (await client.graphql({
-								...options,
+								...auth,
 								query,
 								variables,
 							})) as any;
@@ -322,8 +349,8 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 										name,
 										[flattenedResult],
 										modelIntrospection,
-										options?.authMode,
-										options?.authToken
+										auth.authMode,
+										auth.authToken
 									);
 
 									return { data: initialized, extensions };

package/src/internals/types.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6 } from '@aws-amplify/core';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 
 /**
  * @private
@@ -9,4 +10,12 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
  */
 export type ClientGenerationParams = {
 	amplify: AmplifyClassV6;
+} & CommonPublicClientOptions;
+
+/**
+ * Common options that can be used on public `generateClient()` interfaces.
+ */
+export type CommonPublicClientOptions = {
+	authMode?: GraphQLAuthMode;
+	authToken?: string;
 };

package/src/types/index.ts

@@ -14,6 +14,8 @@ export { CONTROL_MSG, ConnectionState } from './PubSub';
 
 export { SelectionSet } from '@aws-amplify/amplify-api-next-types-alpha';
 
+export { CommonPublicClientOptions } from '../internals/types';
+
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
  */
@@ -357,9 +359,13 @@ type ExcludeNeverFields<O> = {
 };
 
 export const __amplify = Symbol('amplify');
+export const __authMode = Symbol('authMode');
+export const __authToken = Symbol('authToken');
 
 export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
 	[__amplify]: AmplifyClassV6;
+	[__authMode]?: GraphQLAuthMode;
+	[__authToken]?: string;
 	graphql: <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(
 		options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
 		additionalHeaders?: