rest-client-sdk 6.6.0 → 7.0.0-rc.3
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/dist/index.es.js +319 -266
- package/dist/index.es.js.map +1 -1
- package/dist/index.js +319 -265
- package/dist/index.js.map +1 -1
- package/dist/types/RestClientSdk.d.ts +2 -0
- package/dist/types/RestClientSdkInterface.d.ts +1 -0
- package/dist/types/TokenGenerator/AbstractTokenGenerator.d.ts +3 -1
- package/dist/types/TokenStorage.d.ts +2 -2
- package/dist/types/client/headerUtils.d.ts +1 -0
- package/dist/types/index.d.ts +3 -2
- package/dist/types/utils/logging.d.ts +31 -0
- package/package.json +1 -1
- package/src/RestClientSdk.ts +12 -1
- package/src/RestClientSdkInterface.ts +1 -0
- package/src/TokenGenerator/AbstractTokenGenerator.ts +7 -1
- package/src/TokenGenerator/AuthorizationCodeFlowTokenGenerator.ts +16 -4
- package/src/TokenGenerator/ClientCredentialsGenerator.ts +10 -4
- package/src/TokenGenerator/PasswordGenerator.ts +16 -4
- package/src/TokenStorage.ts +66 -47
- package/src/client/AbstractClient.ts +22 -11
- package/src/client/headerUtils.ts +12 -0
- package/src/index.ts +5 -0
- package/src/utils/logging.ts +96 -0
- package/CHANGELOG.md +0 -499
package/dist/index.js
CHANGED
|
@@ -22,42 +22,6 @@
|
|
|
22
22
|
return _typeof(obj);
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
26
|
-
try {
|
|
27
|
-
var info = gen[key](arg);
|
|
28
|
-
var value = info.value;
|
|
29
|
-
} catch (error) {
|
|
30
|
-
reject(error);
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
if (info.done) {
|
|
35
|
-
resolve(value);
|
|
36
|
-
} else {
|
|
37
|
-
Promise.resolve(value).then(_next, _throw);
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
function _asyncToGenerator(fn) {
|
|
42
|
-
return function () {
|
|
43
|
-
var self = this,
|
|
44
|
-
args = arguments;
|
|
45
|
-
return new Promise(function (resolve, reject) {
|
|
46
|
-
var gen = fn.apply(self, args);
|
|
47
|
-
|
|
48
|
-
function _next(value) {
|
|
49
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
function _throw(err) {
|
|
53
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
_next(undefined);
|
|
57
|
-
});
|
|
58
|
-
};
|
|
59
|
-
}
|
|
60
|
-
|
|
61
25
|
function _classCallCheck(instance, Constructor) {
|
|
62
26
|
if (!(instance instanceof Constructor)) {
|
|
63
27
|
throw new TypeError("Cannot call a class as a function");
|
|
@@ -994,6 +958,155 @@
|
|
|
994
958
|
return new metadata.repositoryClass(sdk, metadata, isUnitOfWorkEnabled);
|
|
995
959
|
}
|
|
996
960
|
|
|
961
|
+
/* eslint-disable consistent-return */
|
|
962
|
+
function removeAuthorization(headers) {
|
|
963
|
+
if (!headers) {
|
|
964
|
+
return;
|
|
965
|
+
}
|
|
966
|
+
|
|
967
|
+
if (headers instanceof Headers) {
|
|
968
|
+
headers["delete"]('Authorization');
|
|
969
|
+
return headers;
|
|
970
|
+
}
|
|
971
|
+
|
|
972
|
+
var filterAuthorization = function filterAuthorization(entries) {
|
|
973
|
+
return entries.filter(function (header) {
|
|
974
|
+
return header[0] !== 'Authorization';
|
|
975
|
+
});
|
|
976
|
+
};
|
|
977
|
+
|
|
978
|
+
if (Array.isArray(headers)) {
|
|
979
|
+
return filterAuthorization(headers);
|
|
980
|
+
}
|
|
981
|
+
|
|
982
|
+
return Object.fromEntries(filterAuthorization(Object.entries(headers)));
|
|
983
|
+
}
|
|
984
|
+
/**
|
|
985
|
+
* remove undefined key, usefull to remove Content-Type for example.
|
|
986
|
+
* Does not apply on "Headers" instance as values are string in there.
|
|
987
|
+
*/
|
|
988
|
+
|
|
989
|
+
function removeUndefinedHeaders(headers) {
|
|
990
|
+
if (headers instanceof Headers) {
|
|
991
|
+
return headers;
|
|
992
|
+
}
|
|
993
|
+
|
|
994
|
+
var filterEntries = function filterEntries(entries) {
|
|
995
|
+
return entries.filter(function (header) {
|
|
996
|
+
return header[1] !== undefined;
|
|
997
|
+
});
|
|
998
|
+
};
|
|
999
|
+
|
|
1000
|
+
if (Array.isArray(headers)) {
|
|
1001
|
+
return filterEntries(headers);
|
|
1002
|
+
}
|
|
1003
|
+
|
|
1004
|
+
return Object.fromEntries(filterEntries(Object.entries(headers)));
|
|
1005
|
+
}
|
|
1006
|
+
function convertToRecord(headers) {
|
|
1007
|
+
if (headers instanceof Headers) {
|
|
1008
|
+
return Object.fromEntries(headers.entries());
|
|
1009
|
+
}
|
|
1010
|
+
|
|
1011
|
+
if (Array.isArray(headers)) {
|
|
1012
|
+
return Object.fromEntries(headers);
|
|
1013
|
+
}
|
|
1014
|
+
|
|
1015
|
+
return headers;
|
|
1016
|
+
}
|
|
1017
|
+
|
|
1018
|
+
var generateId = function generateId() {
|
|
1019
|
+
return "rest-client-sdk|".concat(Date.now(), "-").concat(Math.floor(Math.random() * (9e12 - 1)) + 1e12);
|
|
1020
|
+
};
|
|
1021
|
+
|
|
1022
|
+
function serializeRequest(req) {
|
|
1023
|
+
var request = _objectSpread2({}, req); // Make a clone, useful for doing destructive things
|
|
1024
|
+
|
|
1025
|
+
|
|
1026
|
+
return {
|
|
1027
|
+
method: request.method,
|
|
1028
|
+
// The Request Method, e.g. GET, POST, DELETE
|
|
1029
|
+
url: request.url,
|
|
1030
|
+
// The URL
|
|
1031
|
+
headers: request.headers ? convertToRecord(request.headers) : undefined,
|
|
1032
|
+
body: typeof request.body === 'string' ? request.body : undefined
|
|
1033
|
+
};
|
|
1034
|
+
} // eslint-disable-next-line import/prefer-default-export
|
|
1035
|
+
|
|
1036
|
+
|
|
1037
|
+
var _history = new WeakMap();
|
|
1038
|
+
|
|
1039
|
+
var Logger = /*#__PURE__*/function () {
|
|
1040
|
+
_createClass(Logger, [{
|
|
1041
|
+
key: "history",
|
|
1042
|
+
get: function get() {
|
|
1043
|
+
return _classPrivateFieldGet(this, _history);
|
|
1044
|
+
}
|
|
1045
|
+
}]);
|
|
1046
|
+
|
|
1047
|
+
function Logger() {
|
|
1048
|
+
_classCallCheck(this, Logger);
|
|
1049
|
+
|
|
1050
|
+
_history.set(this, {
|
|
1051
|
+
writable: true,
|
|
1052
|
+
value: void 0
|
|
1053
|
+
});
|
|
1054
|
+
|
|
1055
|
+
_classPrivateFieldSet(this, _history, []);
|
|
1056
|
+
}
|
|
1057
|
+
|
|
1058
|
+
_createClass(Logger, [{
|
|
1059
|
+
key: "logRequest",
|
|
1060
|
+
value: function logRequest(params) {
|
|
1061
|
+
var log = {
|
|
1062
|
+
id: generateId(),
|
|
1063
|
+
request: serializeRequest(params),
|
|
1064
|
+
logTimes: {
|
|
1065
|
+
request: Date.now()
|
|
1066
|
+
}
|
|
1067
|
+
};
|
|
1068
|
+
|
|
1069
|
+
_classPrivateFieldGet(this, _history).push(log);
|
|
1070
|
+
|
|
1071
|
+
return log.id;
|
|
1072
|
+
}
|
|
1073
|
+
}, {
|
|
1074
|
+
key: "logResponse",
|
|
1075
|
+
value: function logResponse(response, requestId) {
|
|
1076
|
+
var id = requestId || generateId(); // console.log('clone');
|
|
1077
|
+
// const clonedResponse = response.clone(); // THIS IS THE LINE THAT CAUSES THE PROBLEM
|
|
1078
|
+
// console.log('after clone', clonedResponse.status);
|
|
1079
|
+
|
|
1080
|
+
var logContent = {
|
|
1081
|
+
status: response.status,
|
|
1082
|
+
// clonedResponse.status,
|
|
1083
|
+
headers: Object.fromEntries(response.headers)
|
|
1084
|
+
};
|
|
1085
|
+
|
|
1086
|
+
var foundLogIndex = _classPrivateFieldGet(this, _history).findIndex(function (log) {
|
|
1087
|
+
return log.id === id;
|
|
1088
|
+
});
|
|
1089
|
+
|
|
1090
|
+
if (foundLogIndex > -1) {
|
|
1091
|
+
_classPrivateFieldGet(this, _history)[foundLogIndex].response = logContent;
|
|
1092
|
+
_classPrivateFieldGet(this, _history)[foundLogIndex].logTimes.response = Date.now();
|
|
1093
|
+
} else {
|
|
1094
|
+
_classPrivateFieldGet(this, _history).push({
|
|
1095
|
+
id: id,
|
|
1096
|
+
response: logContent,
|
|
1097
|
+
logTimes: {
|
|
1098
|
+
response: Date.now()
|
|
1099
|
+
}
|
|
1100
|
+
});
|
|
1101
|
+
}
|
|
1102
|
+
|
|
1103
|
+
return id;
|
|
1104
|
+
}
|
|
1105
|
+
}]);
|
|
1106
|
+
|
|
1107
|
+
return Logger;
|
|
1108
|
+
}();
|
|
1109
|
+
|
|
997
1110
|
var _repositoryList = new WeakMap();
|
|
998
1111
|
|
|
999
1112
|
var RestClientSdk = /*#__PURE__*/function () {
|
|
@@ -1017,6 +1130,8 @@
|
|
|
1017
1130
|
value: void 0
|
|
1018
1131
|
});
|
|
1019
1132
|
|
|
1133
|
+
_defineProperty(this, "logger", void 0);
|
|
1134
|
+
|
|
1020
1135
|
this.checkConfigValidity(config);
|
|
1021
1136
|
|
|
1022
1137
|
if (!(mapping instanceof Mapping)) {
|
|
@@ -1029,6 +1144,10 @@
|
|
|
1029
1144
|
this.mapping = mapping;
|
|
1030
1145
|
this.unitOfWork = new UnitOfWork(this.mapping, this.config.unitOfWorkEnabled);
|
|
1031
1146
|
|
|
1147
|
+
if (config.loggerEnabled) {
|
|
1148
|
+
this.logger = new Logger();
|
|
1149
|
+
}
|
|
1150
|
+
|
|
1032
1151
|
_classPrivateFieldSet(this, _repositoryList, {});
|
|
1033
1152
|
}
|
|
1034
1153
|
/**
|
|
@@ -1049,7 +1168,7 @@
|
|
|
1049
1168
|
} // eslint-disable-next-line new-cap
|
|
1050
1169
|
|
|
1051
1170
|
|
|
1052
|
-
_classPrivateFieldGet(this, _repositoryList)[key] = generateRepository(this, metadata);
|
|
1171
|
+
_classPrivateFieldGet(this, _repositoryList)[key] = generateRepository(this, metadata, this.config.unitOfWorkEnabled);
|
|
1053
1172
|
} // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
1054
1173
|
|
|
1055
1174
|
|
|
@@ -1404,52 +1523,6 @@
|
|
|
1404
1523
|
return typeof ((_ref = body) === null || _ref === void 0 ? void 0 : _ref.error) === 'string';
|
|
1405
1524
|
}
|
|
1406
1525
|
|
|
1407
|
-
/* eslint-disable consistent-return */
|
|
1408
|
-
function removeAuthorization(headers) {
|
|
1409
|
-
if (!headers) {
|
|
1410
|
-
return;
|
|
1411
|
-
}
|
|
1412
|
-
|
|
1413
|
-
if (headers instanceof Headers) {
|
|
1414
|
-
headers["delete"]('Authorization');
|
|
1415
|
-
return headers;
|
|
1416
|
-
}
|
|
1417
|
-
|
|
1418
|
-
var filterAuthorization = function filterAuthorization(entries) {
|
|
1419
|
-
return entries.filter(function (header) {
|
|
1420
|
-
return header[0] !== 'Authorization';
|
|
1421
|
-
});
|
|
1422
|
-
};
|
|
1423
|
-
|
|
1424
|
-
if (Array.isArray(headers)) {
|
|
1425
|
-
return filterAuthorization(headers);
|
|
1426
|
-
}
|
|
1427
|
-
|
|
1428
|
-
return Object.fromEntries(filterAuthorization(Object.entries(headers)));
|
|
1429
|
-
}
|
|
1430
|
-
/**
|
|
1431
|
-
* remove undefined key, usefull to remove Content-Type for example.
|
|
1432
|
-
* Does not apply on "Headers" instance as values are string in there.
|
|
1433
|
-
*/
|
|
1434
|
-
|
|
1435
|
-
function removeUndefinedHeaders(headers) {
|
|
1436
|
-
if (headers instanceof Headers) {
|
|
1437
|
-
return headers;
|
|
1438
|
-
}
|
|
1439
|
-
|
|
1440
|
-
var filterEntries = function filterEntries(entries) {
|
|
1441
|
-
return entries.filter(function (header) {
|
|
1442
|
-
return header[1] !== undefined;
|
|
1443
|
-
});
|
|
1444
|
-
};
|
|
1445
|
-
|
|
1446
|
-
if (Array.isArray(headers)) {
|
|
1447
|
-
return filterEntries(headers);
|
|
1448
|
-
}
|
|
1449
|
-
|
|
1450
|
-
return Object.fromEntries(filterEntries(Object.entries(headers)));
|
|
1451
|
-
}
|
|
1452
|
-
|
|
1453
1526
|
var EXPIRE_LIMIT_SECONDS = 300; // = 5 minutes
|
|
1454
1527
|
|
|
1455
1528
|
var _tokenStorage = new WeakMap();
|
|
@@ -1697,29 +1770,31 @@
|
|
|
1697
1770
|
|
|
1698
1771
|
if (listOrItem === 'list') {
|
|
1699
1772
|
// for list, we need to deserialize the result to get an object
|
|
1700
|
-
var itemList = _this2.serializer.deserializeList(text, _this2.metadata, response);
|
|
1773
|
+
var itemList = _this2.serializer.deserializeList(text, _this2.metadata, response);
|
|
1701
1774
|
|
|
1775
|
+
if (_classPrivateFieldGet(_this2, _isUnitOfWorkEnabled)) {
|
|
1776
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
1777
|
+
var _iterator = _createForOfIteratorHelper(itemList),
|
|
1778
|
+
_step;
|
|
1702
1779
|
|
|
1703
|
-
|
|
1704
|
-
_step;
|
|
1705
|
-
|
|
1706
|
-
try {
|
|
1707
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
1708
|
-
var _decodedItem = _step.value;
|
|
1780
|
+
try {
|
|
1781
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
1782
|
+
var _decodedItem = _step.value;
|
|
1709
1783
|
|
|
1710
|
-
|
|
1784
|
+
var _identifier = _this2._getEntityIdentifier(_decodedItem);
|
|
1711
1785
|
|
|
1712
|
-
|
|
1786
|
+
var normalizedItem = _this2.serializer.normalizeItem(_decodedItem, _this2.metadata); // then we register the re-normalized item
|
|
1713
1787
|
|
|
1714
1788
|
|
|
1715
|
-
|
|
1716
|
-
|
|
1789
|
+
if (_identifier !== null) {
|
|
1790
|
+
_this2.sdk.unitOfWork.registerClean(_identifier, normalizedItem);
|
|
1791
|
+
}
|
|
1717
1792
|
}
|
|
1793
|
+
} catch (err) {
|
|
1794
|
+
_iterator.e(err);
|
|
1795
|
+
} finally {
|
|
1796
|
+
_iterator.f();
|
|
1718
1797
|
}
|
|
1719
|
-
} catch (err) {
|
|
1720
|
-
_iterator.e(err);
|
|
1721
|
-
} finally {
|
|
1722
|
-
_iterator.f();
|
|
1723
1798
|
}
|
|
1724
1799
|
|
|
1725
1800
|
return itemList;
|
|
@@ -1915,10 +1990,22 @@
|
|
|
1915
1990
|
|
|
1916
1991
|
if (params.headers) {
|
|
1917
1992
|
params.headers = removeUndefinedHeaders(params.headers);
|
|
1993
|
+
}
|
|
1994
|
+
|
|
1995
|
+
var logId;
|
|
1996
|
+
|
|
1997
|
+
if (this.sdk.logger) {
|
|
1998
|
+
logId = this.sdk.logger.logRequest(_objectSpread2({
|
|
1999
|
+
url: input
|
|
2000
|
+
}, params));
|
|
1918
2001
|
} // eslint-disable-next-line consistent-return
|
|
1919
2002
|
|
|
1920
2003
|
|
|
1921
2004
|
return fetch(input, params).then(function (response) {
|
|
2005
|
+
if (_this6.sdk.logger) {
|
|
2006
|
+
_this6.sdk.logger.logResponse(response, logId);
|
|
2007
|
+
}
|
|
2008
|
+
|
|
1922
2009
|
if (response.status < 400) {
|
|
1923
2010
|
return response;
|
|
1924
2011
|
}
|
|
@@ -1991,19 +2078,41 @@
|
|
|
1991
2078
|
return memoized;
|
|
1992
2079
|
}
|
|
1993
2080
|
|
|
2081
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1994
2082
|
function isResponse(response) {
|
|
1995
2083
|
return typeof (response === null || response === void 0 ? void 0 : response.json) === 'function';
|
|
1996
2084
|
}
|
|
1997
2085
|
|
|
2086
|
+
function manageOauthError(body, response) {
|
|
2087
|
+
var error;
|
|
2088
|
+
|
|
2089
|
+
if (response) {
|
|
2090
|
+
error = getHttpErrorFromResponse(response);
|
|
2091
|
+
}
|
|
2092
|
+
|
|
2093
|
+
if (body.error === 'invalid_grant') {
|
|
2094
|
+
throw new InvalidGrantError(body.error, error);
|
|
2095
|
+
}
|
|
2096
|
+
|
|
2097
|
+
if (body.error === 'invalid_scope') {
|
|
2098
|
+
throw new InvalidScopeError(body.error, error);
|
|
2099
|
+
}
|
|
2100
|
+
|
|
2101
|
+
throw new OauthError(body.error, error);
|
|
2102
|
+
}
|
|
2103
|
+
|
|
1998
2104
|
var _tokenGenerator = new WeakMap();
|
|
1999
2105
|
|
|
2000
2106
|
var _hasATokenBeenGenerated = new WeakMap();
|
|
2001
2107
|
|
|
2002
2108
|
var _asyncStorage = new WeakMap();
|
|
2003
2109
|
|
|
2110
|
+
var _logger = new WeakMap();
|
|
2111
|
+
|
|
2004
2112
|
var TokenStorage = /*#__PURE__*/function () {
|
|
2005
2113
|
function TokenStorage(tokenGenerator, asyncStorage) {
|
|
2006
2114
|
var accessTokenKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rest_client_sdk.api.access_token';
|
|
2115
|
+
var logger = arguments.length > 3 ? arguments[3] : undefined;
|
|
2007
2116
|
|
|
2008
2117
|
_classCallCheck(this, TokenStorage);
|
|
2009
2118
|
|
|
@@ -2024,12 +2133,22 @@
|
|
|
2024
2133
|
value: void 0
|
|
2025
2134
|
});
|
|
2026
2135
|
|
|
2136
|
+
_logger.set(this, {
|
|
2137
|
+
writable: true,
|
|
2138
|
+
value: void 0
|
|
2139
|
+
});
|
|
2140
|
+
|
|
2141
|
+
if (logger) {
|
|
2142
|
+
_classPrivateFieldSet(this, _logger, logger);
|
|
2143
|
+
}
|
|
2144
|
+
|
|
2027
2145
|
_classPrivateFieldSet(this, _tokenGenerator, tokenGenerator);
|
|
2028
2146
|
|
|
2029
2147
|
_classPrivateFieldSet(this, _hasATokenBeenGenerated, false);
|
|
2030
2148
|
|
|
2031
2149
|
this.setAsyncStorage(asyncStorage);
|
|
2032
2150
|
this.accessTokenKey = accessTokenKey;
|
|
2151
|
+
this.handleTokenResponse = this.handleTokenResponse.bind(this);
|
|
2033
2152
|
this.generateToken = memoizePromise(this.generateToken);
|
|
2034
2153
|
this.refreshToken = memoizePromise(this.refreshToken);
|
|
2035
2154
|
}
|
|
@@ -2109,37 +2228,15 @@
|
|
|
2109
2228
|
var _this2 = this;
|
|
2110
2229
|
|
|
2111
2230
|
var callTimestamp = Date.now();
|
|
2112
|
-
return _classPrivateFieldGet(this, _tokenGenerator).generateToken(parameters).then(
|
|
2113
|
-
var
|
|
2114
|
-
var body, updatedResponseData;
|
|
2115
|
-
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
2116
|
-
while (1) {
|
|
2117
|
-
switch (_context.prev = _context.next) {
|
|
2118
|
-
case 0:
|
|
2119
|
-
_context.next = 2;
|
|
2120
|
-
return _this2.handleTokenResponse(response);
|
|
2121
|
-
|
|
2122
|
-
case 2:
|
|
2123
|
-
body = _context.sent;
|
|
2124
|
-
updatedResponseData = _this2._addExpiresAtToResponseData(body, callTimestamp);
|
|
2125
|
-
return _context.abrupt("return", _this2._storeAccessToken(updatedResponseData).then(function () {
|
|
2126
|
-
_classPrivateFieldSet(_this2, _hasATokenBeenGenerated, true);
|
|
2127
|
-
|
|
2128
|
-
return updatedResponseData;
|
|
2129
|
-
}));
|
|
2130
|
-
|
|
2131
|
-
case 5:
|
|
2132
|
-
case "end":
|
|
2133
|
-
return _context.stop();
|
|
2134
|
-
}
|
|
2135
|
-
}
|
|
2136
|
-
}, _callee);
|
|
2137
|
-
}));
|
|
2231
|
+
return _classPrivateFieldGet(this, _tokenGenerator).generateToken(parameters).then(this.handleTokenResponse).then(function (body) {
|
|
2232
|
+
var updatedResponseData = _this2._addExpiresAtToResponseData(body, callTimestamp);
|
|
2138
2233
|
|
|
2139
|
-
return function (
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2234
|
+
return _this2._storeAccessToken(updatedResponseData).then(function () {
|
|
2235
|
+
_classPrivateFieldSet(_this2, _hasATokenBeenGenerated, true);
|
|
2236
|
+
|
|
2237
|
+
return updatedResponseData;
|
|
2238
|
+
});
|
|
2239
|
+
});
|
|
2143
2240
|
}
|
|
2144
2241
|
}, {
|
|
2145
2242
|
key: "refreshToken",
|
|
@@ -2148,125 +2245,54 @@
|
|
|
2148
2245
|
|
|
2149
2246
|
return _classPrivateFieldGet(this, _asyncStorage).getItem(this.accessTokenKey).then(function (token) {
|
|
2150
2247
|
var callTimestamp = Date.now();
|
|
2151
|
-
return _classPrivateFieldGet(_this3, _tokenGenerator).refreshToken(token ? JSON.parse(token) : null).then(
|
|
2152
|
-
var
|
|
2153
|
-
var body, updatedResponseData;
|
|
2154
|
-
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
2155
|
-
while (1) {
|
|
2156
|
-
switch (_context2.prev = _context2.next) {
|
|
2157
|
-
case 0:
|
|
2158
|
-
_context2.next = 2;
|
|
2159
|
-
return _this3.handleTokenResponse(response);
|
|
2160
|
-
|
|
2161
|
-
case 2:
|
|
2162
|
-
body = _context2.sent;
|
|
2163
|
-
updatedResponseData = _this3._addExpiresAtToResponseData(body, callTimestamp);
|
|
2164
|
-
return _context2.abrupt("return", _this3._storeAccessToken(updatedResponseData).then(function () {
|
|
2165
|
-
return updatedResponseData;
|
|
2166
|
-
}));
|
|
2167
|
-
|
|
2168
|
-
case 5:
|
|
2169
|
-
case "end":
|
|
2170
|
-
return _context2.stop();
|
|
2171
|
-
}
|
|
2172
|
-
}
|
|
2173
|
-
}, _callee2);
|
|
2174
|
-
}));
|
|
2248
|
+
return _classPrivateFieldGet(_this3, _tokenGenerator).refreshToken(token ? JSON.parse(token) : null).then(_this3.handleTokenResponse).then(function (body) {
|
|
2249
|
+
var updatedResponseData = _this3._addExpiresAtToResponseData(body, callTimestamp);
|
|
2175
2250
|
|
|
2176
|
-
return function (
|
|
2177
|
-
return
|
|
2178
|
-
};
|
|
2179
|
-
}
|
|
2251
|
+
return _this3._storeAccessToken(updatedResponseData).then(function () {
|
|
2252
|
+
return updatedResponseData;
|
|
2253
|
+
});
|
|
2254
|
+
});
|
|
2180
2255
|
});
|
|
2181
2256
|
}
|
|
2182
2257
|
}, {
|
|
2183
2258
|
key: "handleTokenResponse",
|
|
2184
|
-
value: function () {
|
|
2185
|
-
|
|
2186
|
-
var
|
|
2187
|
-
|
|
2188
|
-
while (1) {
|
|
2189
|
-
switch (_context3.prev = _context3.next) {
|
|
2190
|
-
case 0:
|
|
2191
|
-
if (!isResponse(responseOrBody)) {
|
|
2192
|
-
_context3.next = 21;
|
|
2193
|
-
break;
|
|
2194
|
-
}
|
|
2195
|
-
|
|
2196
|
-
response = responseOrBody;
|
|
2197
|
-
_context3.prev = 2;
|
|
2198
|
-
_context3.next = 5;
|
|
2199
|
-
return response.json();
|
|
2259
|
+
value: function handleTokenResponse(responseOrBody) {
|
|
2260
|
+
if (isResponse(responseOrBody)) {
|
|
2261
|
+
var response = responseOrBody;
|
|
2262
|
+
var originalResponse = response.clone();
|
|
2200
2263
|
|
|
2201
|
-
|
|
2202
|
-
|
|
2203
|
-
|
|
2204
|
-
if (!isOauthError(body)) {
|
|
2205
|
-
_context3.next = 10;
|
|
2206
|
-
break;
|
|
2207
|
-
}
|
|
2208
|
-
|
|
2209
|
-
// throw error if response body is an oauth error
|
|
2210
|
-
this._manageOauthError(body, response);
|
|
2211
|
-
|
|
2212
|
-
_context3.next = 12;
|
|
2213
|
-
break;
|
|
2214
|
-
|
|
2215
|
-
case 10:
|
|
2216
|
-
if (!(response.status >= 400)) {
|
|
2217
|
-
_context3.next = 12;
|
|
2218
|
-
break;
|
|
2219
|
-
}
|
|
2220
|
-
|
|
2221
|
-
throw getHttpErrorFromResponse(response);
|
|
2222
|
-
|
|
2223
|
-
case 12:
|
|
2224
|
-
_context3.next = 19;
|
|
2225
|
-
break;
|
|
2226
|
-
|
|
2227
|
-
case 14:
|
|
2228
|
-
_context3.prev = 14;
|
|
2229
|
-
_context3.t0 = _context3["catch"](2);
|
|
2230
|
-
|
|
2231
|
-
if (_context3.t0 instanceof OauthError) {
|
|
2232
|
-
_context3.next = 18;
|
|
2233
|
-
break;
|
|
2234
|
-
}
|
|
2235
|
-
|
|
2236
|
-
throw new OauthError(_context3.t0.type, getHttpErrorFromResponse(response));
|
|
2237
|
-
|
|
2238
|
-
case 18:
|
|
2239
|
-
throw _context3.t0;
|
|
2240
|
-
|
|
2241
|
-
case 19:
|
|
2242
|
-
_context3.next = 23;
|
|
2243
|
-
break;
|
|
2264
|
+
if (_classPrivateFieldGet(this, _logger)) {
|
|
2265
|
+
_classPrivateFieldGet(this, _logger).logResponse(response);
|
|
2266
|
+
}
|
|
2244
2267
|
|
|
2245
|
-
|
|
2246
|
-
|
|
2268
|
+
return response.json().then(function (body) {
|
|
2269
|
+
if (isOauthError(body)) {
|
|
2270
|
+
// throw error if response body is an oauth error
|
|
2271
|
+
manageOauthError(body, response);
|
|
2272
|
+
} else if (response.status >= 400) {
|
|
2273
|
+
// throw an error if response status code is an "error" status code
|
|
2274
|
+
throw getHttpErrorFromResponse(originalResponse);
|
|
2275
|
+
}
|
|
2247
2276
|
|
|
2248
|
-
|
|
2249
|
-
|
|
2250
|
-
|
|
2251
|
-
|
|
2277
|
+
return body;
|
|
2278
|
+
})["catch"](function (err) {
|
|
2279
|
+
if (!(err instanceof OauthError)) {
|
|
2280
|
+
throw new OauthError(err.type, getHttpErrorFromResponse(originalResponse));
|
|
2281
|
+
}
|
|
2252
2282
|
|
|
2253
|
-
|
|
2254
|
-
|
|
2283
|
+
throw err;
|
|
2284
|
+
});
|
|
2285
|
+
}
|
|
2255
2286
|
|
|
2256
|
-
|
|
2257
|
-
case "end":
|
|
2258
|
-
return _context3.stop();
|
|
2259
|
-
}
|
|
2260
|
-
}
|
|
2261
|
-
}, _callee3, this, [[2, 14]]);
|
|
2262
|
-
}));
|
|
2287
|
+
var body = responseOrBody;
|
|
2263
2288
|
|
|
2264
|
-
|
|
2265
|
-
|
|
2289
|
+
if (isOauthError(body)) {
|
|
2290
|
+
// throw error if response body is an oauth error
|
|
2291
|
+
manageOauthError(body);
|
|
2266
2292
|
}
|
|
2267
2293
|
|
|
2268
|
-
return
|
|
2269
|
-
}
|
|
2294
|
+
return Promise.resolve(body);
|
|
2295
|
+
}
|
|
2270
2296
|
/**
|
|
2271
2297
|
* Return the number of second when the token will expire
|
|
2272
2298
|
* return value can be negative if the token is already expired
|
|
@@ -2293,36 +2319,23 @@
|
|
|
2293
2319
|
value: function _storeAccessToken(responseData) {
|
|
2294
2320
|
return _classPrivateFieldGet(this, _asyncStorage).setItem(this.accessTokenKey, JSON.stringify(responseData));
|
|
2295
2321
|
}
|
|
2296
|
-
}, {
|
|
2297
|
-
key: "_manageOauthError",
|
|
2298
|
-
value: function _manageOauthError(body, response) {
|
|
2299
|
-
var error;
|
|
2300
|
-
|
|
2301
|
-
if (response) {
|
|
2302
|
-
error = getHttpErrorFromResponse(response);
|
|
2303
|
-
}
|
|
2304
|
-
|
|
2305
|
-
if (body.error === 'invalid_grant') {
|
|
2306
|
-
throw new InvalidGrantError(body.error, error);
|
|
2307
|
-
}
|
|
2308
|
-
|
|
2309
|
-
if (body.error === 'invalid_scope') {
|
|
2310
|
-
throw new InvalidScopeError(body.error, error);
|
|
2311
|
-
}
|
|
2312
|
-
|
|
2313
|
-
throw new OauthError(body.error, error);
|
|
2314
|
-
}
|
|
2315
2322
|
}]);
|
|
2316
2323
|
|
|
2317
2324
|
return TokenStorage;
|
|
2318
2325
|
}();
|
|
2319
2326
|
|
|
2320
2327
|
var AbstractTokenGenerator = /*#__PURE__*/function () {
|
|
2321
|
-
function AbstractTokenGenerator(tokenGeneratorConfig) {
|
|
2328
|
+
function AbstractTokenGenerator(tokenGeneratorConfig, logger) {
|
|
2322
2329
|
_classCallCheck(this, AbstractTokenGenerator);
|
|
2323
2330
|
|
|
2324
2331
|
_defineProperty(this, "tokenGeneratorConfig", void 0);
|
|
2325
2332
|
|
|
2333
|
+
_defineProperty(this, "logger", void 0);
|
|
2334
|
+
|
|
2335
|
+
if (logger) {
|
|
2336
|
+
this.logger = logger;
|
|
2337
|
+
}
|
|
2338
|
+
|
|
2326
2339
|
this.tokenGeneratorConfig = tokenGeneratorConfig;
|
|
2327
2340
|
|
|
2328
2341
|
if (typeof this.checkTokenGeneratorConfig === 'function') {
|
|
@@ -2395,7 +2408,7 @@
|
|
|
2395
2408
|
this._checkGenerateParameters(parameters);
|
|
2396
2409
|
|
|
2397
2410
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2398
|
-
|
|
2411
|
+
var params = {
|
|
2399
2412
|
method: 'POST',
|
|
2400
2413
|
headers: {
|
|
2401
2414
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
@@ -2408,7 +2421,15 @@
|
|
|
2408
2421
|
redirect_uri: this.tokenGeneratorConfig.redirectUri,
|
|
2409
2422
|
code: parameters.code
|
|
2410
2423
|
})
|
|
2411
|
-
}
|
|
2424
|
+
};
|
|
2425
|
+
|
|
2426
|
+
if (this.logger) {
|
|
2427
|
+
this.logger.logRequest(_objectSpread2({
|
|
2428
|
+
url: url
|
|
2429
|
+
}, params));
|
|
2430
|
+
}
|
|
2431
|
+
|
|
2432
|
+
return fetch(url, params);
|
|
2412
2433
|
}
|
|
2413
2434
|
/**
|
|
2414
2435
|
* This function needs to refresh the current possibly expired access token
|
|
@@ -2427,7 +2448,7 @@
|
|
|
2427
2448
|
}
|
|
2428
2449
|
|
|
2429
2450
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2430
|
-
|
|
2451
|
+
var params = {
|
|
2431
2452
|
method: 'POST',
|
|
2432
2453
|
headers: {
|
|
2433
2454
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
@@ -2438,7 +2459,15 @@
|
|
|
2438
2459
|
client_secret: this.tokenGeneratorConfig.clientSecret,
|
|
2439
2460
|
refresh_token: oldAccessToken.refresh_token
|
|
2440
2461
|
})
|
|
2441
|
-
}
|
|
2462
|
+
};
|
|
2463
|
+
|
|
2464
|
+
if (this.logger) {
|
|
2465
|
+
this.logger.logRequest(_objectSpread2({
|
|
2466
|
+
url: url
|
|
2467
|
+
}, params));
|
|
2468
|
+
}
|
|
2469
|
+
|
|
2470
|
+
return fetch(url, params);
|
|
2442
2471
|
}
|
|
2443
2472
|
}, {
|
|
2444
2473
|
key: "checkTokenGeneratorConfig",
|
|
@@ -2510,14 +2539,22 @@
|
|
|
2510
2539
|
body.append('scope', this.tokenGeneratorConfig.scope);
|
|
2511
2540
|
}
|
|
2512
2541
|
|
|
2513
|
-
var
|
|
2514
|
-
return fetch(url, {
|
|
2542
|
+
var params = {
|
|
2515
2543
|
method: 'POST',
|
|
2516
2544
|
headers: {
|
|
2517
2545
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2518
2546
|
},
|
|
2519
2547
|
body: body
|
|
2520
|
-
}
|
|
2548
|
+
};
|
|
2549
|
+
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2550
|
+
|
|
2551
|
+
if (this.logger) {
|
|
2552
|
+
this.logger.logRequest(_objectSpread2({
|
|
2553
|
+
url: url
|
|
2554
|
+
}, params));
|
|
2555
|
+
}
|
|
2556
|
+
|
|
2557
|
+
return fetch(url, params);
|
|
2521
2558
|
}
|
|
2522
2559
|
}, {
|
|
2523
2560
|
key: "refreshToken",
|
|
@@ -2582,13 +2619,21 @@
|
|
|
2582
2619
|
}
|
|
2583
2620
|
|
|
2584
2621
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2585
|
-
|
|
2622
|
+
var params = {
|
|
2586
2623
|
method: 'POST',
|
|
2587
2624
|
headers: {
|
|
2588
2625
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2589
2626
|
},
|
|
2590
2627
|
body: body
|
|
2591
|
-
}
|
|
2628
|
+
};
|
|
2629
|
+
|
|
2630
|
+
if (this.logger) {
|
|
2631
|
+
this.logger.logRequest(_objectSpread2({
|
|
2632
|
+
url: url
|
|
2633
|
+
}, params));
|
|
2634
|
+
}
|
|
2635
|
+
|
|
2636
|
+
return fetch(url, params);
|
|
2592
2637
|
}
|
|
2593
2638
|
}, {
|
|
2594
2639
|
key: "refreshToken",
|
|
@@ -2611,13 +2656,21 @@
|
|
|
2611
2656
|
}
|
|
2612
2657
|
|
|
2613
2658
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2614
|
-
|
|
2659
|
+
var params = {
|
|
2615
2660
|
method: 'POST',
|
|
2616
2661
|
headers: {
|
|
2617
2662
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2618
2663
|
},
|
|
2619
2664
|
body: body
|
|
2620
|
-
}
|
|
2665
|
+
};
|
|
2666
|
+
|
|
2667
|
+
if (this.logger) {
|
|
2668
|
+
this.logger.logRequest(_objectSpread2({
|
|
2669
|
+
url: url
|
|
2670
|
+
}, params));
|
|
2671
|
+
}
|
|
2672
|
+
|
|
2673
|
+
return fetch(url, params);
|
|
2621
2674
|
}
|
|
2622
2675
|
}, {
|
|
2623
2676
|
key: "checkTokenGeneratorConfig",
|
|
@@ -2973,6 +3026,7 @@
|
|
|
2973
3026
|
exports.InternalServerError = InternalServerError;
|
|
2974
3027
|
exports.InvalidGrantError = InvalidGrantError;
|
|
2975
3028
|
exports.InvalidScopeError = InvalidScopeError;
|
|
3029
|
+
exports.Logger = Logger;
|
|
2976
3030
|
exports.Mapping = Mapping;
|
|
2977
3031
|
exports.OauthError = OauthError;
|
|
2978
3032
|
exports.PasswordGenerator = PasswordGenerator;
|