@aws-amplify/api-graphql 3.4.4-api-v6.29 → 3.4.4-api-v6-models.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/internals/InternalGraphQLAPI.d.ts +1 -1
- package/lib/internals/InternalGraphQLAPI.js +7 -7
- package/lib/internals/InternalGraphQLAPI.js.map +1 -1
- package/lib-esm/internals/InternalGraphQLAPI.d.ts +1 -1
- package/lib-esm/internals/InternalGraphQLAPI.js +7 -7
- package/lib-esm/internals/InternalGraphQLAPI.js.map +1 -1
- package/package.json +11 -10
- package/src/internals/InternalGraphQLAPI.ts +21 -7
|
@@ -16,7 +16,7 @@ export declare class InternalGraphQLAPIClass {
|
|
|
16
16
|
*/
|
|
17
17
|
private _options;
|
|
18
18
|
private _api;
|
|
19
|
-
|
|
19
|
+
InternalAuth: import("@aws-amplify/auth/lib-esm/internals/InternalAuth").InternalAuthClass;
|
|
20
20
|
Cache: import("@aws-amplify/cache/lib-esm/types").ICache;
|
|
21
21
|
Credentials: import("@aws-amplify/core").CredentialsClass;
|
|
22
22
|
/**
|
|
@@ -6,7 +6,7 @@ var tslib_1 = require("tslib");
|
|
|
6
6
|
var graphql_1 = require("graphql");
|
|
7
7
|
var core_1 = require("@aws-amplify/core");
|
|
8
8
|
var internals_1 = require("@aws-amplify/pubsub/internals");
|
|
9
|
-
var
|
|
9
|
+
var internals_2 = require("@aws-amplify/auth/internals");
|
|
10
10
|
var cache_1 = require("@aws-amplify/cache");
|
|
11
11
|
var types_1 = require("../types");
|
|
12
12
|
var api_rest_1 = require("@aws-amplify/api-rest");
|
|
@@ -30,7 +30,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
30
30
|
*/
|
|
31
31
|
function InternalGraphQLAPIClass(options) {
|
|
32
32
|
this._api = null;
|
|
33
|
-
this.
|
|
33
|
+
this.InternalAuth = internals_2.InternalAuth;
|
|
34
34
|
this.Cache = cache_1.Cache;
|
|
35
35
|
this.Credentials = core_1.Credentials;
|
|
36
36
|
this._options = options;
|
|
@@ -79,7 +79,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
79
79
|
return Promise.reject('API not configured');
|
|
80
80
|
}
|
|
81
81
|
};
|
|
82
|
-
InternalGraphQLAPIClass.prototype._headerBasedAuth = function (defaultAuthenticationType, additionalHeaders) {
|
|
82
|
+
InternalGraphQLAPIClass.prototype._headerBasedAuth = function (defaultAuthenticationType, additionalHeaders, customUserAgentDetails) {
|
|
83
83
|
if (additionalHeaders === void 0) { additionalHeaders = {}; }
|
|
84
84
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
85
85
|
var _a, aws_appsync_authenticationType, apiKey, authenticationType, headers, _b, credentialsOK, token, federatedInfo, currentUser, e_1, session, e_2;
|
|
@@ -123,7 +123,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
123
123
|
if (!federatedInfo) return [3 /*break*/, 6];
|
|
124
124
|
token = federatedInfo.token;
|
|
125
125
|
return [3 /*break*/, 8];
|
|
126
|
-
case 6: return [4 /*yield*/,
|
|
126
|
+
case 6: return [4 /*yield*/, internals_2.InternalAuth.currentAuthenticatedUser(undefined, customUserAgentDetails)];
|
|
127
127
|
case 7:
|
|
128
128
|
currentUser = _c.sent();
|
|
129
129
|
if (currentUser) {
|
|
@@ -144,7 +144,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
144
144
|
case 10: return [3 /*break*/, 17];
|
|
145
145
|
case 11:
|
|
146
146
|
_c.trys.push([11, 13, , 14]);
|
|
147
|
-
return [4 /*yield*/, this.
|
|
147
|
+
return [4 /*yield*/, this.InternalAuth.currentSession(customUserAgentDetails)];
|
|
148
148
|
case 12:
|
|
149
149
|
session = _c.sent();
|
|
150
150
|
headers = {
|
|
@@ -235,7 +235,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
235
235
|
_d = [{}];
|
|
236
236
|
_e = !customGraphqlEndpoint;
|
|
237
237
|
if (!_e) return [3 /*break*/, 2];
|
|
238
|
-
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
238
|
+
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders, customUserAgentDetails)];
|
|
239
239
|
case 1:
|
|
240
240
|
_e = (_l.sent());
|
|
241
241
|
_l.label = 2;
|
|
@@ -244,7 +244,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
244
244
|
_g = customGraphqlEndpoint;
|
|
245
245
|
if (!_g) return [3 /*break*/, 6];
|
|
246
246
|
if (!customEndpointRegion) return [3 /*break*/, 4];
|
|
247
|
-
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
247
|
+
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders, customUserAgentDetails)];
|
|
248
248
|
case 3:
|
|
249
249
|
_h = _l.sent();
|
|
250
250
|
return [3 /*break*/, 5];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalGraphQLAPI.js","sourceRoot":"","sources":["../../src/internals/InternalGraphQLAPI.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,mCAOiB;AAEjB,0CAO2B;AAC3B,2DAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"InternalGraphQLAPI.js","sourceRoot":"","sources":["../../src/internals/InternalGraphQLAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class InternalGraphQLAPIClass {
|
|
|
16
16
|
*/
|
|
17
17
|
private _options;
|
|
18
18
|
private _api;
|
|
19
|
-
|
|
19
|
+
InternalAuth: import("@aws-amplify/auth/lib-esm/internals/InternalAuth").InternalAuthClass;
|
|
20
20
|
Cache: import("@aws-amplify/cache/lib-esm/types").ICache;
|
|
21
21
|
Credentials: import("@aws-amplify/core").CredentialsClass;
|
|
22
22
|
/**
|
|
@@ -4,7 +4,7 @@ import { __assign, __awaiter, __generator, __read, __rest } from "tslib";
|
|
|
4
4
|
import { print, parse, GraphQLError, } from 'graphql';
|
|
5
5
|
import { Amplify, ConsoleLogger as Logger, Credentials, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, } from '@aws-amplify/core';
|
|
6
6
|
import { InternalPubSub } from '@aws-amplify/pubsub/internals';
|
|
7
|
-
import {
|
|
7
|
+
import { InternalAuth } from '@aws-amplify/auth/internals';
|
|
8
8
|
import { Cache } from '@aws-amplify/cache';
|
|
9
9
|
import { GraphQLAuthError, } from '../types';
|
|
10
10
|
import { RestClient } from '@aws-amplify/api-rest';
|
|
@@ -28,7 +28,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
28
28
|
*/
|
|
29
29
|
function InternalGraphQLAPIClass(options) {
|
|
30
30
|
this._api = null;
|
|
31
|
-
this.
|
|
31
|
+
this.InternalAuth = InternalAuth;
|
|
32
32
|
this.Cache = Cache;
|
|
33
33
|
this.Credentials = Credentials;
|
|
34
34
|
this._options = options;
|
|
@@ -77,7 +77,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
77
77
|
return Promise.reject('API not configured');
|
|
78
78
|
}
|
|
79
79
|
};
|
|
80
|
-
InternalGraphQLAPIClass.prototype._headerBasedAuth = function (defaultAuthenticationType, additionalHeaders) {
|
|
80
|
+
InternalGraphQLAPIClass.prototype._headerBasedAuth = function (defaultAuthenticationType, additionalHeaders, customUserAgentDetails) {
|
|
81
81
|
if (additionalHeaders === void 0) { additionalHeaders = {}; }
|
|
82
82
|
return __awaiter(this, void 0, void 0, function () {
|
|
83
83
|
var _a, aws_appsync_authenticationType, apiKey, authenticationType, headers, _b, credentialsOK, token, federatedInfo, currentUser, e_1, session, e_2;
|
|
@@ -121,7 +121,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
121
121
|
if (!federatedInfo) return [3 /*break*/, 6];
|
|
122
122
|
token = federatedInfo.token;
|
|
123
123
|
return [3 /*break*/, 8];
|
|
124
|
-
case 6: return [4 /*yield*/,
|
|
124
|
+
case 6: return [4 /*yield*/, InternalAuth.currentAuthenticatedUser(undefined, customUserAgentDetails)];
|
|
125
125
|
case 7:
|
|
126
126
|
currentUser = _c.sent();
|
|
127
127
|
if (currentUser) {
|
|
@@ -142,7 +142,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
142
142
|
case 10: return [3 /*break*/, 17];
|
|
143
143
|
case 11:
|
|
144
144
|
_c.trys.push([11, 13, , 14]);
|
|
145
|
-
return [4 /*yield*/, this.
|
|
145
|
+
return [4 /*yield*/, this.InternalAuth.currentSession(customUserAgentDetails)];
|
|
146
146
|
case 12:
|
|
147
147
|
session = _c.sent();
|
|
148
148
|
headers = {
|
|
@@ -233,7 +233,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
233
233
|
_d = [{}];
|
|
234
234
|
_e = !customGraphqlEndpoint;
|
|
235
235
|
if (!_e) return [3 /*break*/, 2];
|
|
236
|
-
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
236
|
+
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders, customUserAgentDetails)];
|
|
237
237
|
case 1:
|
|
238
238
|
_e = (_l.sent());
|
|
239
239
|
_l.label = 2;
|
|
@@ -242,7 +242,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
|
|
|
242
242
|
_g = customGraphqlEndpoint;
|
|
243
243
|
if (!_g) return [3 /*break*/, 6];
|
|
244
244
|
if (!customEndpointRegion) return [3 /*break*/, 4];
|
|
245
|
-
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
245
|
+
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders, customUserAgentDetails)];
|
|
246
246
|
case 3:
|
|
247
247
|
_h = _l.sent();
|
|
248
248
|
return [3 /*break*/, 5];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalGraphQLAPI.js","sourceRoot":"","sources":["../../src/internals/InternalGraphQLAPI.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;AACtC,OAAO,EAGN,KAAK,EACL,KAAK,EACL,YAAY,GAEZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EACN,OAAO,EACP,aAAa,IAAI,MAAM,EACvB,WAAW,EAEX,mBAAmB,EACnB,6CAA6C,GAC7C,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"InternalGraphQLAPI.js","sourceRoot":"","sources":["../../src/internals/InternalGraphQLAPI.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/api-graphql",
|
|
3
|
-
"version": "3.4.4-api-v6.
|
|
3
|
+
"version": "3.4.4-api-v6-models.35+95cd0806f",
|
|
4
4
|
"description": "Api-graphql category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -50,12 +50,13 @@
|
|
|
50
50
|
"internals"
|
|
51
51
|
],
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@aws-amplify/api-rest": "3.3.3-api-v6.
|
|
54
|
-
"@aws-amplify/auth": "5.5.4-api-v6.
|
|
55
|
-
"@aws-amplify/cache": "5.1.4-api-v6.
|
|
56
|
-
"@aws-amplify/core": "5.5.3-api-v6.
|
|
57
|
-
"@aws-amplify/pubsub": "5.3.4-api-v6.
|
|
53
|
+
"@aws-amplify/api-rest": "3.3.3-api-v6-models.35+95cd0806f",
|
|
54
|
+
"@aws-amplify/auth": "5.5.4-api-v6-models.35+95cd0806f",
|
|
55
|
+
"@aws-amplify/cache": "5.1.4-api-v6-models.35+95cd0806f",
|
|
56
|
+
"@aws-amplify/core": "5.5.3-api-v6-models.35+95cd0806f",
|
|
57
|
+
"@aws-amplify/pubsub": "5.3.4-api-v6-models.35+95cd0806f",
|
|
58
58
|
"graphql": "15.8.0",
|
|
59
|
+
"tslib": "^1.8.0",
|
|
59
60
|
"uuid": "^3.2.1",
|
|
60
61
|
"zen-observable-ts": "0.8.19"
|
|
61
62
|
},
|
|
@@ -64,7 +65,7 @@
|
|
|
64
65
|
"name": "API (GraphQL client)",
|
|
65
66
|
"path": "./lib-esm/index.js",
|
|
66
67
|
"import": "{ Amplify, GraphQLAPI }",
|
|
67
|
-
"limit": "
|
|
68
|
+
"limit": "91.7 kB"
|
|
68
69
|
}
|
|
69
70
|
],
|
|
70
71
|
"jest": {
|
|
@@ -88,8 +89,8 @@
|
|
|
88
89
|
},
|
|
89
90
|
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
|
|
90
91
|
"testPathIgnorePatterns": [
|
|
91
|
-
"__tests__/fixtures
|
|
92
|
-
"__tests__/utils
|
|
92
|
+
"__tests__/fixtures",
|
|
93
|
+
"__tests__/utils"
|
|
93
94
|
],
|
|
94
95
|
"moduleFileExtensions": [
|
|
95
96
|
"ts",
|
|
@@ -115,5 +116,5 @@
|
|
|
115
116
|
"lib-esm"
|
|
116
117
|
]
|
|
117
118
|
},
|
|
118
|
-
"gitHead": "
|
|
119
|
+
"gitHead": "95cd0806f3b6a0414a6027c036fa9d46c2f15f73"
|
|
119
120
|
}
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
|
|
19
19
|
} from '@aws-amplify/core';
|
|
20
20
|
import { InternalPubSub } from '@aws-amplify/pubsub/internals';
|
|
21
|
-
import {
|
|
21
|
+
import { InternalAuth } from '@aws-amplify/auth/internals';
|
|
22
22
|
import { Cache } from '@aws-amplify/cache';
|
|
23
23
|
import {
|
|
24
24
|
GraphQLAuthError,
|
|
@@ -51,7 +51,7 @@ export class InternalGraphQLAPIClass {
|
|
|
51
51
|
private _options;
|
|
52
52
|
private _api = null;
|
|
53
53
|
|
|
54
|
-
|
|
54
|
+
InternalAuth = InternalAuth;
|
|
55
55
|
Cache = Cache;
|
|
56
56
|
Credentials = Credentials;
|
|
57
57
|
|
|
@@ -119,7 +119,8 @@ export class InternalGraphQLAPIClass {
|
|
|
119
119
|
|
|
120
120
|
private async _headerBasedAuth(
|
|
121
121
|
defaultAuthenticationType?,
|
|
122
|
-
additionalHeaders: { [key: string]: string } = {}
|
|
122
|
+
additionalHeaders: { [key: string]: string } = {},
|
|
123
|
+
customUserAgentDetails?: CustomUserAgentDetails
|
|
123
124
|
) {
|
|
124
125
|
const { aws_appsync_authenticationType, aws_appsync_apiKey: apiKey } =
|
|
125
126
|
this._options;
|
|
@@ -151,7 +152,10 @@ export class InternalGraphQLAPIClass {
|
|
|
151
152
|
if (federatedInfo) {
|
|
152
153
|
token = federatedInfo.token;
|
|
153
154
|
} else {
|
|
154
|
-
const currentUser = await
|
|
155
|
+
const currentUser = await InternalAuth.currentAuthenticatedUser(
|
|
156
|
+
undefined,
|
|
157
|
+
customUserAgentDetails
|
|
158
|
+
);
|
|
155
159
|
if (currentUser) {
|
|
156
160
|
token = currentUser.token;
|
|
157
161
|
}
|
|
@@ -168,7 +172,9 @@ export class InternalGraphQLAPIClass {
|
|
|
168
172
|
break;
|
|
169
173
|
case 'AMAZON_COGNITO_USER_POOLS':
|
|
170
174
|
try {
|
|
171
|
-
const session = await this.
|
|
175
|
+
const session = await this.InternalAuth.currentSession(
|
|
176
|
+
customUserAgentDetails
|
|
177
|
+
);
|
|
172
178
|
headers = {
|
|
173
179
|
Authorization: session.getAccessToken().getJwtToken(),
|
|
174
180
|
};
|
|
@@ -285,10 +291,18 @@ export class InternalGraphQLAPIClass {
|
|
|
285
291
|
|
|
286
292
|
const headers = {
|
|
287
293
|
...(!customGraphqlEndpoint &&
|
|
288
|
-
(await this._headerBasedAuth(
|
|
294
|
+
(await this._headerBasedAuth(
|
|
295
|
+
authMode,
|
|
296
|
+
additionalHeaders,
|
|
297
|
+
customUserAgentDetails
|
|
298
|
+
))),
|
|
289
299
|
...(customGraphqlEndpoint &&
|
|
290
300
|
(customEndpointRegion
|
|
291
|
-
? await this._headerBasedAuth(
|
|
301
|
+
? await this._headerBasedAuth(
|
|
302
|
+
authMode,
|
|
303
|
+
additionalHeaders,
|
|
304
|
+
customUserAgentDetails
|
|
305
|
+
)
|
|
292
306
|
: { Authorization: null })),
|
|
293
307
|
...(await graphql_headers({ query, variables })),
|
|
294
308
|
...additionalHeaders,
|