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

package/lib/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/types/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__amplify = exports.GraphQLAuthError = exports.ConnectionState = exports.CONTROL_MSG = void 0;
+exports.__authToken = exports.__authMode = exports.__amplify = exports.GraphQLAuthError = exports.ConnectionState = exports.CONTROL_MSG = void 0;
 var PubSub_1 = require("./PubSub");
 Object.defineProperty(exports, "CONTROL_MSG", { enumerable: true, get: function () { return PubSub_1.CONTROL_MSG; } });
 Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return PubSub_1.ConnectionState; } });
@@ -13,3 +13,5 @@ var GraphQLAuthError;
     GraphQLAuthError["NO_AUTH_TOKEN"] = "No auth token specified";
 })(GraphQLAuthError || (exports.GraphQLAuthError = GraphQLAuthError = {}));
 exports.__amplify = Symbol('amplify');
+exports.__authMode = Symbol('authMode');
+exports.__authToken = Symbol('authToken');

package/lib-esm/internals/APIClient.d.ts

@@ -1,3 +1,4 @@
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 type ListArgs = {
     selectionSet?: string[];
     filter?: {};
@@ -8,7 +9,7 @@ type ListArgs = {
  * @returns response object with `items` properties flattened
  */
 export declare const flattenItems: (obj: Record<string, any>) => Record<string, any>;
-export declare function initializeModel(client: any, modelName: string, result: any[], modelIntrospection: any): any[];
+export declare function initializeModel(client: any, modelName: string, result: any[], modelIntrospection: any, authMode: GraphQLAuthMode | undefined, authToken: string | undefined): any[];
 export declare const graphQLOperationsInfo: {
     CREATE: {
         operationPrefix: "create";

package/lib-esm/internals/APIClient.js

@@ -31,7 +31,7 @@ export var flattenItems = function (obj) {
     return res;
 };
 // TODO: this should accept single result to support CRUD methods; create helper for array/list
-export function initializeModel(client, modelName, result, modelIntrospection) {
+export function initializeModel(client, modelName, result, modelIntrospection, authMode, authToken) {
     var introModel = modelIntrospection.models[modelName];
     var introModelFields = introModel.fields;
     var modelFields = Object.entries(introModelFields)
@@ -64,10 +64,13 @@ export function initializeModel(client, modelName, result, modelIntrospection) {
                             return (acc[curVal] = record[curVal]);
                         }
                     }, {});
-                    initializedRelationalFields[field] = function () {
+                    initializedRelationalFields[field] = function (options) {
                         var _a;
                         if (record[targetNames[0]]) {
-                            return client.models[relatedModelName].get(__assign((_a = {}, _a[relatedModelPKFieldName] = record[targetNames[0]], _a), sortKeyValues_1));
+                            return client.models[relatedModelName].get(__assign((_a = {}, _a[relatedModelPKFieldName] = record[targetNames[0]], _a), sortKeyValues_1), {
+                                authMode: (options === null || options === void 0 ? void 0 : options.authMode) || authMode,
+                                authToken: (options === null || options === void 0 ? void 0 : options.authToken) || authToken,
+                            });
                         }
                         return undefined;
                     };
@@ -85,10 +88,12 @@ export function initializeModel(client, modelName, result, modelIntrospection) {
                             }
                             return _b = {}, _b[field] = { eq: record[parentSK_1[idx - 1]] }, _b;
                         });
-                        initializedRelationalFields[field] = function () {
+                        initializedRelationalFields[field] = function (options) {
                             if (record[parentPk_1]) {
                                 return client.models[relatedModelName].list({
                                     filter: { and: hasManyFilter_1 },
+                                    authMode: (options === null || options === void 0 ? void 0 : options.authMode) || authMode,
+                                    authToken: (options === null || options === void 0 ? void 0 : options.authToken) || authToken,
                                 });
                             }
                             return [];
@@ -102,10 +107,12 @@ export function initializeModel(client, modelName, result, modelIntrospection) {
                         }
                         return _b = {}, _b[field] = { eq: record[parentSK_1[idx - 1]] }, _b;
                     });
-                    initializedRelationalFields[field] = function () {
+                    initializedRelationalFields[field] = function (options) {
                         if (record[parentPk_1]) {
                             return client.models[relatedModelName].list({
                                 filter: { and: hasManyFilter_2 },
+                                authMode: (options === null || options === void 0 ? void 0 : options.authMode) || authMode,
+                                authToken: (options === null || options === void 0 ? void 0 : options.authToken) || authToken,
                             });
                         }
                         return [];

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -303,7 +303,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
             variables: variables,
             appSyncGraphqlEndpoint: config === null || config === void 0 ? void 0 : config.endpoint,
             region: config === null || config === void 0 ? void 0 : config.region,
-            authenticationType: config === null || config === void 0 ? void 0 : config.defaultAuthMode,
+            authenticationType: authMode || (config === null || config === void 0 ? void 0 : config.defaultAuthMode),
             apiKey: config === null || config === void 0 ? void 0 : config.apiKey,
             additionalHeaders: additionalHeaders,
         }, customUserAgentDetails);

package/lib-esm/internals/generateClient.js

@@ -1,6 +1,6 @@
 import { graphql, cancel, isCancelError } from './v6';
 import { generateModelsProperty } from './generateModelsProperty';
-import { __amplify } from '../types';
+import { __amplify, __authMode, __authToken } from '../types';
 /**
  * @private
  *
@@ -14,6 +14,8 @@ export function generateClient(params) {
     var _a;
     var client = (_a = {},
         _a[__amplify] = params.amplify,
+        _a[__authMode] = params.authMode,
+        _a[__authToken] = params.authToken,
         _a.graphql = graphql,
         _a.cancel = cancel,
         _a.isCancelError = isCancelError,

package/lib-esm/internals/generateModelsProperty.js

@@ -1,7 +1,24 @@
 import { __assign, __awaiter, __generator, __read, __spreadArray, __values } from "tslib";
 import { initializeModel, generateGraphQLDocument, buildGraphQLVariables, graphQLOperationsInfo, flattenItems, } from './APIClient';
+import { __authMode, __authToken, } from '../types';
 import { findIndexByFields, resolvePKFields } from '../utils';
 import { Observable, map } from 'rxjs';
+/**
+ * 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, options) {
+    if (options === void 0) { options = {}; }
+    return {
+        authMode: options.authMode || client[__authMode],
+        authToken: options.authToken || client[__authToken],
+    };
+}
 export function generateModelsProperty(client, params) {
     var e_1, _a;
     var _this = this;
@@ -20,7 +37,7 @@ export function generateModelsProperty(client, params) {
             var operation = key;
             if (operation === 'LIST') {
                 models[name_1][operationPrefix] = function (args) { return __awaiter(_this, void 0, void 0, function () {
-                    var query, variables, _a, data, extensions, _b, key_1, flattenedResult, initialized, error_1;
+                    var query, variables, auth, _a, data, extensions, _b, key_1, flattenedResult, initialized, error_1;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
@@ -29,10 +46,8 @@ export function generateModelsProperty(client, params) {
                                 _c.label = 1;
                             case 1:
                                 _c.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, client.graphql({
-                                        query: query,
-                                        variables: variables,
-                                    })];
+                                auth = authModeParams(client, args);
+                                return [4 /*yield*/, client.graphql(__assign(__assign({}, auth), { query: query, variables: variables }))];
                             case 2:
                                 _a = (_c.sent()), data = _a.data, extensions = _a.extensions;
                                 // flatten response
@@ -49,7 +64,7 @@ export function generateModelsProperty(client, params) {
                                                 }];
                                         }
                                         else {
-                                            initialized = initializeModel(client, name_1, flattenedResult, modelIntrospection);
+                                            initialized = initializeModel(client, name_1, flattenedResult, modelIntrospection, auth.authMode, auth.authToken);
                                             return [2 /*return*/, {
                                                     data: initialized,
                                                     nextToken: data[key_1].nextToken,
@@ -81,21 +96,20 @@ export function generateModelsProperty(client, params) {
                 }); };
             }
             else if (['ONCREATE', 'ONUPDATE', 'ONDELETE'].includes(operation)) {
-                models[name_1][operationPrefix] = function (arg, options) {
+                models[name_1][operationPrefix] = function (args) {
                     var query = generateGraphQLDocument(modelIntrospection.models, name_1, operation);
-                    var variables = buildGraphQLVariables(model, operation, arg, modelIntrospection);
-                    var observable = client.graphql({
-                        query: query,
-                        variables: variables,
-                    });
+                    var variables = buildGraphQLVariables(model, operation, args, modelIntrospection);
+                    var auth = authModeParams(client, args);
+                    var observable = client.graphql(__assign(__assign({}, auth), { query: query, variables: variables }));
                     return observable.pipe(map(function (value) {
                         var _a = __read(Object.keys(value.data), 1), key = _a[0];
-                        return value.data[key];
+                        var _b = __read(initializeModel(client, name_1, [value.data[key]], modelIntrospection, auth.authMode, auth.authToken), 1), initialized = _b[0];
+                        return initialized;
                     }));
                 };
             }
             else if (operation === 'OBSERVE_QUERY') {
-                models[name_1][operationPrefix] = function (arg, options) {
+                models[name_1][operationPrefix] = function (arg) {
                     return new Observable(function (subscriber) {
                         // what we'll be sending to our subscribers
                         var items = [];
@@ -113,9 +127,7 @@ export function generateModelsProperty(client, params) {
                             return messageQueue.push.apply(messageQueue, __spreadArray([], __read(messages), false));
                         };
                         // start subscriptions
-                        var onCreateSub = models[name_1]
-                            .onCreate(arg, options)
-                            .subscribe({
+                        var onCreateSub = models[name_1].onCreate(arg).subscribe({
                             next: function (item) {
                                 receiveMessages({ item: item, type: 'create' });
                             },
@@ -123,9 +135,7 @@ export function generateModelsProperty(client, params) {
                                 subscriber.error({ type: 'onCreate', error: error });
                             },
                         });
-                        var onUpdateSub = models[name_1]
-                            .onUpdate(arg, options)
-                            .subscribe({
+                        var onUpdateSub = models[name_1].onUpdate(arg).subscribe({
                             next: function (item) {
                                 receiveMessages({ item: item, type: 'update' });
                             },
@@ -133,9 +143,7 @@ export function generateModelsProperty(client, params) {
                                 subscriber.error({ type: 'onUpdate', error: error });
                             },
                         });
-                        var onDeleteSub = models[name_1]
-                            .onDelete(arg, options)
-                            .subscribe({
+                        var onDeleteSub = models[name_1].onDelete(arg).subscribe({
                             next: function (item) {
                                 receiveMessages({ item: item, type: 'delete' });
                             },
@@ -194,7 +202,7 @@ export function generateModelsProperty(client, params) {
                                     case 1:
                                         if (!(!subscriber.closed && (firstPage || nextToken))) return [3 /*break*/, 3];
                                         firstPage = false;
-                                        return [4 /*yield*/, models[name_1].list(__assign(__assign({}, arg), { nextToken: nextToken }), options)];
+                                        return [4 /*yield*/, models[name_1].list(__assign(__assign({}, arg), { nextToken: nextToken }))];
                                     case 2:
                                         _a = _c.sent(), page = _a.data, errors = _a.errors, _nextToken = _a.nextToken;
                                         nextToken = _nextToken;
@@ -253,7 +261,7 @@ export function generateModelsProperty(client, params) {
             }
             else {
                 models[name_1][operationPrefix] = function (arg, options) { return __awaiter(_this, void 0, void 0, function () {
-                    var query, variables, _a, data, extensions, _b, key_2, flattenedResult, _c, initialized, error_2;
+                    var query, variables, auth, _a, data, extensions, _b, key_2, flattenedResult, _c, initialized, error_2;
                     return __generator(this, function (_d) {
                         switch (_d.label) {
                             case 0:
@@ -262,10 +270,8 @@ export function generateModelsProperty(client, params) {
                                 _d.label = 1;
                             case 1:
                                 _d.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, client.graphql({
-                                        query: query,
-                                        variables: variables,
-                                    })];
+                                auth = authModeParams(client, options);
+                                return [4 /*yield*/, client.graphql(__assign(__assign({}, auth), { query: query, variables: variables }))];
                             case 2:
                                 _a = (_d.sent()), data = _a.data, extensions = _a.extensions;
                                 // flatten response
@@ -276,7 +282,7 @@ export function generateModelsProperty(client, params) {
                                         return [2 /*return*/, { data: flattenedResult, extensions: extensions }];
                                     }
                                     else {
-                                        _c = __read(initializeModel(client, name_1, [flattenedResult], modelIntrospection), 1), initialized = _c[0];
+                                        _c = __read(initializeModel(client, name_1, [flattenedResult], modelIntrospection, auth.authMode, auth.authToken), 1), initialized = _c[0];
                                         return [2 /*return*/, { data: initialized, extensions: extensions }];
                                     }
                                 }

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

@@ -1,4 +1,5 @@
 import { AmplifyClassV6 } from '@aws-amplify/core';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 /**
  * @private
  *
@@ -6,4 +7,11 @@ 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;
 };