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.es.js
CHANGED
|
@@ -17,42 +17,6 @@ function _typeof(obj) {
|
|
|
17
17
|
return _typeof(obj);
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
21
|
-
try {
|
|
22
|
-
var info = gen[key](arg);
|
|
23
|
-
var value = info.value;
|
|
24
|
-
} catch (error) {
|
|
25
|
-
reject(error);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
if (info.done) {
|
|
30
|
-
resolve(value);
|
|
31
|
-
} else {
|
|
32
|
-
Promise.resolve(value).then(_next, _throw);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function _asyncToGenerator(fn) {
|
|
37
|
-
return function () {
|
|
38
|
-
var self = this,
|
|
39
|
-
args = arguments;
|
|
40
|
-
return new Promise(function (resolve, reject) {
|
|
41
|
-
var gen = fn.apply(self, args);
|
|
42
|
-
|
|
43
|
-
function _next(value) {
|
|
44
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
function _throw(err) {
|
|
48
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
_next(undefined);
|
|
52
|
-
});
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
|
|
56
20
|
function _classCallCheck(instance, Constructor) {
|
|
57
21
|
if (!(instance instanceof Constructor)) {
|
|
58
22
|
throw new TypeError("Cannot call a class as a function");
|
|
@@ -989,6 +953,155 @@ function generateRepository(sdk, metadata) {
|
|
|
989
953
|
return new metadata.repositoryClass(sdk, metadata, isUnitOfWorkEnabled);
|
|
990
954
|
}
|
|
991
955
|
|
|
956
|
+
/* eslint-disable consistent-return */
|
|
957
|
+
function removeAuthorization(headers) {
|
|
958
|
+
if (!headers) {
|
|
959
|
+
return;
|
|
960
|
+
}
|
|
961
|
+
|
|
962
|
+
if (headers instanceof Headers) {
|
|
963
|
+
headers["delete"]('Authorization');
|
|
964
|
+
return headers;
|
|
965
|
+
}
|
|
966
|
+
|
|
967
|
+
var filterAuthorization = function filterAuthorization(entries) {
|
|
968
|
+
return entries.filter(function (header) {
|
|
969
|
+
return header[0] !== 'Authorization';
|
|
970
|
+
});
|
|
971
|
+
};
|
|
972
|
+
|
|
973
|
+
if (Array.isArray(headers)) {
|
|
974
|
+
return filterAuthorization(headers);
|
|
975
|
+
}
|
|
976
|
+
|
|
977
|
+
return Object.fromEntries(filterAuthorization(Object.entries(headers)));
|
|
978
|
+
}
|
|
979
|
+
/**
|
|
980
|
+
* remove undefined key, usefull to remove Content-Type for example.
|
|
981
|
+
* Does not apply on "Headers" instance as values are string in there.
|
|
982
|
+
*/
|
|
983
|
+
|
|
984
|
+
function removeUndefinedHeaders(headers) {
|
|
985
|
+
if (headers instanceof Headers) {
|
|
986
|
+
return headers;
|
|
987
|
+
}
|
|
988
|
+
|
|
989
|
+
var filterEntries = function filterEntries(entries) {
|
|
990
|
+
return entries.filter(function (header) {
|
|
991
|
+
return header[1] !== undefined;
|
|
992
|
+
});
|
|
993
|
+
};
|
|
994
|
+
|
|
995
|
+
if (Array.isArray(headers)) {
|
|
996
|
+
return filterEntries(headers);
|
|
997
|
+
}
|
|
998
|
+
|
|
999
|
+
return Object.fromEntries(filterEntries(Object.entries(headers)));
|
|
1000
|
+
}
|
|
1001
|
+
function convertToRecord(headers) {
|
|
1002
|
+
if (headers instanceof Headers) {
|
|
1003
|
+
return Object.fromEntries(headers.entries());
|
|
1004
|
+
}
|
|
1005
|
+
|
|
1006
|
+
if (Array.isArray(headers)) {
|
|
1007
|
+
return Object.fromEntries(headers);
|
|
1008
|
+
}
|
|
1009
|
+
|
|
1010
|
+
return headers;
|
|
1011
|
+
}
|
|
1012
|
+
|
|
1013
|
+
var generateId = function generateId() {
|
|
1014
|
+
return "rest-client-sdk|".concat(Date.now(), "-").concat(Math.floor(Math.random() * (9e12 - 1)) + 1e12);
|
|
1015
|
+
};
|
|
1016
|
+
|
|
1017
|
+
function serializeRequest(req) {
|
|
1018
|
+
var request = _objectSpread2({}, req); // Make a clone, useful for doing destructive things
|
|
1019
|
+
|
|
1020
|
+
|
|
1021
|
+
return {
|
|
1022
|
+
method: request.method,
|
|
1023
|
+
// The Request Method, e.g. GET, POST, DELETE
|
|
1024
|
+
url: request.url,
|
|
1025
|
+
// The URL
|
|
1026
|
+
headers: request.headers ? convertToRecord(request.headers) : undefined,
|
|
1027
|
+
body: typeof request.body === 'string' ? request.body : undefined
|
|
1028
|
+
};
|
|
1029
|
+
} // eslint-disable-next-line import/prefer-default-export
|
|
1030
|
+
|
|
1031
|
+
|
|
1032
|
+
var _history = new WeakMap();
|
|
1033
|
+
|
|
1034
|
+
var Logger = /*#__PURE__*/function () {
|
|
1035
|
+
_createClass(Logger, [{
|
|
1036
|
+
key: "history",
|
|
1037
|
+
get: function get() {
|
|
1038
|
+
return _classPrivateFieldGet(this, _history);
|
|
1039
|
+
}
|
|
1040
|
+
}]);
|
|
1041
|
+
|
|
1042
|
+
function Logger() {
|
|
1043
|
+
_classCallCheck(this, Logger);
|
|
1044
|
+
|
|
1045
|
+
_history.set(this, {
|
|
1046
|
+
writable: true,
|
|
1047
|
+
value: void 0
|
|
1048
|
+
});
|
|
1049
|
+
|
|
1050
|
+
_classPrivateFieldSet(this, _history, []);
|
|
1051
|
+
}
|
|
1052
|
+
|
|
1053
|
+
_createClass(Logger, [{
|
|
1054
|
+
key: "logRequest",
|
|
1055
|
+
value: function logRequest(params) {
|
|
1056
|
+
var log = {
|
|
1057
|
+
id: generateId(),
|
|
1058
|
+
request: serializeRequest(params),
|
|
1059
|
+
logTimes: {
|
|
1060
|
+
request: Date.now()
|
|
1061
|
+
}
|
|
1062
|
+
};
|
|
1063
|
+
|
|
1064
|
+
_classPrivateFieldGet(this, _history).push(log);
|
|
1065
|
+
|
|
1066
|
+
return log.id;
|
|
1067
|
+
}
|
|
1068
|
+
}, {
|
|
1069
|
+
key: "logResponse",
|
|
1070
|
+
value: function logResponse(response, requestId) {
|
|
1071
|
+
var id = requestId || generateId(); // console.log('clone');
|
|
1072
|
+
// const clonedResponse = response.clone(); // THIS IS THE LINE THAT CAUSES THE PROBLEM
|
|
1073
|
+
// console.log('after clone', clonedResponse.status);
|
|
1074
|
+
|
|
1075
|
+
var logContent = {
|
|
1076
|
+
status: response.status,
|
|
1077
|
+
// clonedResponse.status,
|
|
1078
|
+
headers: Object.fromEntries(response.headers)
|
|
1079
|
+
};
|
|
1080
|
+
|
|
1081
|
+
var foundLogIndex = _classPrivateFieldGet(this, _history).findIndex(function (log) {
|
|
1082
|
+
return log.id === id;
|
|
1083
|
+
});
|
|
1084
|
+
|
|
1085
|
+
if (foundLogIndex > -1) {
|
|
1086
|
+
_classPrivateFieldGet(this, _history)[foundLogIndex].response = logContent;
|
|
1087
|
+
_classPrivateFieldGet(this, _history)[foundLogIndex].logTimes.response = Date.now();
|
|
1088
|
+
} else {
|
|
1089
|
+
_classPrivateFieldGet(this, _history).push({
|
|
1090
|
+
id: id,
|
|
1091
|
+
response: logContent,
|
|
1092
|
+
logTimes: {
|
|
1093
|
+
response: Date.now()
|
|
1094
|
+
}
|
|
1095
|
+
});
|
|
1096
|
+
}
|
|
1097
|
+
|
|
1098
|
+
return id;
|
|
1099
|
+
}
|
|
1100
|
+
}]);
|
|
1101
|
+
|
|
1102
|
+
return Logger;
|
|
1103
|
+
}();
|
|
1104
|
+
|
|
992
1105
|
var _repositoryList = new WeakMap();
|
|
993
1106
|
|
|
994
1107
|
var RestClientSdk = /*#__PURE__*/function () {
|
|
@@ -1012,6 +1125,8 @@ var RestClientSdk = /*#__PURE__*/function () {
|
|
|
1012
1125
|
value: void 0
|
|
1013
1126
|
});
|
|
1014
1127
|
|
|
1128
|
+
_defineProperty(this, "logger", void 0);
|
|
1129
|
+
|
|
1015
1130
|
this.checkConfigValidity(config);
|
|
1016
1131
|
|
|
1017
1132
|
if (!(mapping instanceof Mapping)) {
|
|
@@ -1024,6 +1139,10 @@ var RestClientSdk = /*#__PURE__*/function () {
|
|
|
1024
1139
|
this.mapping = mapping;
|
|
1025
1140
|
this.unitOfWork = new UnitOfWork(this.mapping, this.config.unitOfWorkEnabled);
|
|
1026
1141
|
|
|
1142
|
+
if (config.loggerEnabled) {
|
|
1143
|
+
this.logger = new Logger();
|
|
1144
|
+
}
|
|
1145
|
+
|
|
1027
1146
|
_classPrivateFieldSet(this, _repositoryList, {});
|
|
1028
1147
|
}
|
|
1029
1148
|
/**
|
|
@@ -1044,7 +1163,7 @@ var RestClientSdk = /*#__PURE__*/function () {
|
|
|
1044
1163
|
} // eslint-disable-next-line new-cap
|
|
1045
1164
|
|
|
1046
1165
|
|
|
1047
|
-
_classPrivateFieldGet(this, _repositoryList)[key] = generateRepository(this, metadata);
|
|
1166
|
+
_classPrivateFieldGet(this, _repositoryList)[key] = generateRepository(this, metadata, this.config.unitOfWorkEnabled);
|
|
1048
1167
|
} // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
1049
1168
|
|
|
1050
1169
|
|
|
@@ -1399,52 +1518,6 @@ function isOauthError(body) {
|
|
|
1399
1518
|
return typeof ((_ref = body) === null || _ref === void 0 ? void 0 : _ref.error) === 'string';
|
|
1400
1519
|
}
|
|
1401
1520
|
|
|
1402
|
-
/* eslint-disable consistent-return */
|
|
1403
|
-
function removeAuthorization(headers) {
|
|
1404
|
-
if (!headers) {
|
|
1405
|
-
return;
|
|
1406
|
-
}
|
|
1407
|
-
|
|
1408
|
-
if (headers instanceof Headers) {
|
|
1409
|
-
headers["delete"]('Authorization');
|
|
1410
|
-
return headers;
|
|
1411
|
-
}
|
|
1412
|
-
|
|
1413
|
-
var filterAuthorization = function filterAuthorization(entries) {
|
|
1414
|
-
return entries.filter(function (header) {
|
|
1415
|
-
return header[0] !== 'Authorization';
|
|
1416
|
-
});
|
|
1417
|
-
};
|
|
1418
|
-
|
|
1419
|
-
if (Array.isArray(headers)) {
|
|
1420
|
-
return filterAuthorization(headers);
|
|
1421
|
-
}
|
|
1422
|
-
|
|
1423
|
-
return Object.fromEntries(filterAuthorization(Object.entries(headers)));
|
|
1424
|
-
}
|
|
1425
|
-
/**
|
|
1426
|
-
* remove undefined key, usefull to remove Content-Type for example.
|
|
1427
|
-
* Does not apply on "Headers" instance as values are string in there.
|
|
1428
|
-
*/
|
|
1429
|
-
|
|
1430
|
-
function removeUndefinedHeaders(headers) {
|
|
1431
|
-
if (headers instanceof Headers) {
|
|
1432
|
-
return headers;
|
|
1433
|
-
}
|
|
1434
|
-
|
|
1435
|
-
var filterEntries = function filterEntries(entries) {
|
|
1436
|
-
return entries.filter(function (header) {
|
|
1437
|
-
return header[1] !== undefined;
|
|
1438
|
-
});
|
|
1439
|
-
};
|
|
1440
|
-
|
|
1441
|
-
if (Array.isArray(headers)) {
|
|
1442
|
-
return filterEntries(headers);
|
|
1443
|
-
}
|
|
1444
|
-
|
|
1445
|
-
return Object.fromEntries(filterEntries(Object.entries(headers)));
|
|
1446
|
-
}
|
|
1447
|
-
|
|
1448
1521
|
var EXPIRE_LIMIT_SECONDS = 300; // = 5 minutes
|
|
1449
1522
|
|
|
1450
1523
|
var _tokenStorage = new WeakMap();
|
|
@@ -1692,29 +1765,31 @@ var AbstractClient = /*#__PURE__*/function () {
|
|
|
1692
1765
|
|
|
1693
1766
|
if (listOrItem === 'list') {
|
|
1694
1767
|
// for list, we need to deserialize the result to get an object
|
|
1695
|
-
var itemList = _this2.serializer.deserializeList(text, _this2.metadata, response);
|
|
1768
|
+
var itemList = _this2.serializer.deserializeList(text, _this2.metadata, response);
|
|
1696
1769
|
|
|
1770
|
+
if (_classPrivateFieldGet(_this2, _isUnitOfWorkEnabled)) {
|
|
1771
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
1772
|
+
var _iterator = _createForOfIteratorHelper(itemList),
|
|
1773
|
+
_step;
|
|
1697
1774
|
|
|
1698
|
-
|
|
1699
|
-
_step;
|
|
1700
|
-
|
|
1701
|
-
try {
|
|
1702
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
1703
|
-
var _decodedItem = _step.value;
|
|
1775
|
+
try {
|
|
1776
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
1777
|
+
var _decodedItem = _step.value;
|
|
1704
1778
|
|
|
1705
|
-
|
|
1779
|
+
var _identifier = _this2._getEntityIdentifier(_decodedItem);
|
|
1706
1780
|
|
|
1707
|
-
|
|
1781
|
+
var normalizedItem = _this2.serializer.normalizeItem(_decodedItem, _this2.metadata); // then we register the re-normalized item
|
|
1708
1782
|
|
|
1709
1783
|
|
|
1710
|
-
|
|
1711
|
-
|
|
1784
|
+
if (_identifier !== null) {
|
|
1785
|
+
_this2.sdk.unitOfWork.registerClean(_identifier, normalizedItem);
|
|
1786
|
+
}
|
|
1712
1787
|
}
|
|
1788
|
+
} catch (err) {
|
|
1789
|
+
_iterator.e(err);
|
|
1790
|
+
} finally {
|
|
1791
|
+
_iterator.f();
|
|
1713
1792
|
}
|
|
1714
|
-
} catch (err) {
|
|
1715
|
-
_iterator.e(err);
|
|
1716
|
-
} finally {
|
|
1717
|
-
_iterator.f();
|
|
1718
1793
|
}
|
|
1719
1794
|
|
|
1720
1795
|
return itemList;
|
|
@@ -1910,10 +1985,22 @@ var AbstractClient = /*#__PURE__*/function () {
|
|
|
1910
1985
|
|
|
1911
1986
|
if (params.headers) {
|
|
1912
1987
|
params.headers = removeUndefinedHeaders(params.headers);
|
|
1988
|
+
}
|
|
1989
|
+
|
|
1990
|
+
var logId;
|
|
1991
|
+
|
|
1992
|
+
if (this.sdk.logger) {
|
|
1993
|
+
logId = this.sdk.logger.logRequest(_objectSpread2({
|
|
1994
|
+
url: input
|
|
1995
|
+
}, params));
|
|
1913
1996
|
} // eslint-disable-next-line consistent-return
|
|
1914
1997
|
|
|
1915
1998
|
|
|
1916
1999
|
return fetch(input, params).then(function (response) {
|
|
2000
|
+
if (_this6.sdk.logger) {
|
|
2001
|
+
_this6.sdk.logger.logResponse(response, logId);
|
|
2002
|
+
}
|
|
2003
|
+
|
|
1917
2004
|
if (response.status < 400) {
|
|
1918
2005
|
return response;
|
|
1919
2006
|
}
|
|
@@ -1986,19 +2073,41 @@ function memoizePromise(callback) {
|
|
|
1986
2073
|
return memoized;
|
|
1987
2074
|
}
|
|
1988
2075
|
|
|
2076
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1989
2077
|
function isResponse(response) {
|
|
1990
2078
|
return typeof (response === null || response === void 0 ? void 0 : response.json) === 'function';
|
|
1991
2079
|
}
|
|
1992
2080
|
|
|
2081
|
+
function manageOauthError(body, response) {
|
|
2082
|
+
var error;
|
|
2083
|
+
|
|
2084
|
+
if (response) {
|
|
2085
|
+
error = getHttpErrorFromResponse(response);
|
|
2086
|
+
}
|
|
2087
|
+
|
|
2088
|
+
if (body.error === 'invalid_grant') {
|
|
2089
|
+
throw new InvalidGrantError(body.error, error);
|
|
2090
|
+
}
|
|
2091
|
+
|
|
2092
|
+
if (body.error === 'invalid_scope') {
|
|
2093
|
+
throw new InvalidScopeError(body.error, error);
|
|
2094
|
+
}
|
|
2095
|
+
|
|
2096
|
+
throw new OauthError(body.error, error);
|
|
2097
|
+
}
|
|
2098
|
+
|
|
1993
2099
|
var _tokenGenerator = new WeakMap();
|
|
1994
2100
|
|
|
1995
2101
|
var _hasATokenBeenGenerated = new WeakMap();
|
|
1996
2102
|
|
|
1997
2103
|
var _asyncStorage = new WeakMap();
|
|
1998
2104
|
|
|
2105
|
+
var _logger = new WeakMap();
|
|
2106
|
+
|
|
1999
2107
|
var TokenStorage = /*#__PURE__*/function () {
|
|
2000
2108
|
function TokenStorage(tokenGenerator, asyncStorage) {
|
|
2001
2109
|
var accessTokenKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rest_client_sdk.api.access_token';
|
|
2110
|
+
var logger = arguments.length > 3 ? arguments[3] : undefined;
|
|
2002
2111
|
|
|
2003
2112
|
_classCallCheck(this, TokenStorage);
|
|
2004
2113
|
|
|
@@ -2019,12 +2128,22 @@ var TokenStorage = /*#__PURE__*/function () {
|
|
|
2019
2128
|
value: void 0
|
|
2020
2129
|
});
|
|
2021
2130
|
|
|
2131
|
+
_logger.set(this, {
|
|
2132
|
+
writable: true,
|
|
2133
|
+
value: void 0
|
|
2134
|
+
});
|
|
2135
|
+
|
|
2136
|
+
if (logger) {
|
|
2137
|
+
_classPrivateFieldSet(this, _logger, logger);
|
|
2138
|
+
}
|
|
2139
|
+
|
|
2022
2140
|
_classPrivateFieldSet(this, _tokenGenerator, tokenGenerator);
|
|
2023
2141
|
|
|
2024
2142
|
_classPrivateFieldSet(this, _hasATokenBeenGenerated, false);
|
|
2025
2143
|
|
|
2026
2144
|
this.setAsyncStorage(asyncStorage);
|
|
2027
2145
|
this.accessTokenKey = accessTokenKey;
|
|
2146
|
+
this.handleTokenResponse = this.handleTokenResponse.bind(this);
|
|
2028
2147
|
this.generateToken = memoizePromise(this.generateToken);
|
|
2029
2148
|
this.refreshToken = memoizePromise(this.refreshToken);
|
|
2030
2149
|
}
|
|
@@ -2104,37 +2223,15 @@ var TokenStorage = /*#__PURE__*/function () {
|
|
|
2104
2223
|
var _this2 = this;
|
|
2105
2224
|
|
|
2106
2225
|
var callTimestamp = Date.now();
|
|
2107
|
-
return _classPrivateFieldGet(this, _tokenGenerator).generateToken(parameters).then(
|
|
2108
|
-
var
|
|
2109
|
-
var body, updatedResponseData;
|
|
2110
|
-
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
2111
|
-
while (1) {
|
|
2112
|
-
switch (_context.prev = _context.next) {
|
|
2113
|
-
case 0:
|
|
2114
|
-
_context.next = 2;
|
|
2115
|
-
return _this2.handleTokenResponse(response);
|
|
2116
|
-
|
|
2117
|
-
case 2:
|
|
2118
|
-
body = _context.sent;
|
|
2119
|
-
updatedResponseData = _this2._addExpiresAtToResponseData(body, callTimestamp);
|
|
2120
|
-
return _context.abrupt("return", _this2._storeAccessToken(updatedResponseData).then(function () {
|
|
2121
|
-
_classPrivateFieldSet(_this2, _hasATokenBeenGenerated, true);
|
|
2122
|
-
|
|
2123
|
-
return updatedResponseData;
|
|
2124
|
-
}));
|
|
2125
|
-
|
|
2126
|
-
case 5:
|
|
2127
|
-
case "end":
|
|
2128
|
-
return _context.stop();
|
|
2129
|
-
}
|
|
2130
|
-
}
|
|
2131
|
-
}, _callee);
|
|
2132
|
-
}));
|
|
2226
|
+
return _classPrivateFieldGet(this, _tokenGenerator).generateToken(parameters).then(this.handleTokenResponse).then(function (body) {
|
|
2227
|
+
var updatedResponseData = _this2._addExpiresAtToResponseData(body, callTimestamp);
|
|
2133
2228
|
|
|
2134
|
-
return function (
|
|
2135
|
-
|
|
2136
|
-
|
|
2137
|
-
|
|
2229
|
+
return _this2._storeAccessToken(updatedResponseData).then(function () {
|
|
2230
|
+
_classPrivateFieldSet(_this2, _hasATokenBeenGenerated, true);
|
|
2231
|
+
|
|
2232
|
+
return updatedResponseData;
|
|
2233
|
+
});
|
|
2234
|
+
});
|
|
2138
2235
|
}
|
|
2139
2236
|
}, {
|
|
2140
2237
|
key: "refreshToken",
|
|
@@ -2143,125 +2240,54 @@ var TokenStorage = /*#__PURE__*/function () {
|
|
|
2143
2240
|
|
|
2144
2241
|
return _classPrivateFieldGet(this, _asyncStorage).getItem(this.accessTokenKey).then(function (token) {
|
|
2145
2242
|
var callTimestamp = Date.now();
|
|
2146
|
-
return _classPrivateFieldGet(_this3, _tokenGenerator).refreshToken(token ? JSON.parse(token) : null).then(
|
|
2147
|
-
var
|
|
2148
|
-
var body, updatedResponseData;
|
|
2149
|
-
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
2150
|
-
while (1) {
|
|
2151
|
-
switch (_context2.prev = _context2.next) {
|
|
2152
|
-
case 0:
|
|
2153
|
-
_context2.next = 2;
|
|
2154
|
-
return _this3.handleTokenResponse(response);
|
|
2155
|
-
|
|
2156
|
-
case 2:
|
|
2157
|
-
body = _context2.sent;
|
|
2158
|
-
updatedResponseData = _this3._addExpiresAtToResponseData(body, callTimestamp);
|
|
2159
|
-
return _context2.abrupt("return", _this3._storeAccessToken(updatedResponseData).then(function () {
|
|
2160
|
-
return updatedResponseData;
|
|
2161
|
-
}));
|
|
2162
|
-
|
|
2163
|
-
case 5:
|
|
2164
|
-
case "end":
|
|
2165
|
-
return _context2.stop();
|
|
2166
|
-
}
|
|
2167
|
-
}
|
|
2168
|
-
}, _callee2);
|
|
2169
|
-
}));
|
|
2243
|
+
return _classPrivateFieldGet(_this3, _tokenGenerator).refreshToken(token ? JSON.parse(token) : null).then(_this3.handleTokenResponse).then(function (body) {
|
|
2244
|
+
var updatedResponseData = _this3._addExpiresAtToResponseData(body, callTimestamp);
|
|
2170
2245
|
|
|
2171
|
-
return function (
|
|
2172
|
-
return
|
|
2173
|
-
};
|
|
2174
|
-
}
|
|
2246
|
+
return _this3._storeAccessToken(updatedResponseData).then(function () {
|
|
2247
|
+
return updatedResponseData;
|
|
2248
|
+
});
|
|
2249
|
+
});
|
|
2175
2250
|
});
|
|
2176
2251
|
}
|
|
2177
2252
|
}, {
|
|
2178
2253
|
key: "handleTokenResponse",
|
|
2179
|
-
value: function () {
|
|
2180
|
-
|
|
2181
|
-
var
|
|
2182
|
-
|
|
2183
|
-
while (1) {
|
|
2184
|
-
switch (_context3.prev = _context3.next) {
|
|
2185
|
-
case 0:
|
|
2186
|
-
if (!isResponse(responseOrBody)) {
|
|
2187
|
-
_context3.next = 21;
|
|
2188
|
-
break;
|
|
2189
|
-
}
|
|
2190
|
-
|
|
2191
|
-
response = responseOrBody;
|
|
2192
|
-
_context3.prev = 2;
|
|
2193
|
-
_context3.next = 5;
|
|
2194
|
-
return response.json();
|
|
2254
|
+
value: function handleTokenResponse(responseOrBody) {
|
|
2255
|
+
if (isResponse(responseOrBody)) {
|
|
2256
|
+
var response = responseOrBody;
|
|
2257
|
+
var originalResponse = response.clone();
|
|
2195
2258
|
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
if (!isOauthError(body)) {
|
|
2200
|
-
_context3.next = 10;
|
|
2201
|
-
break;
|
|
2202
|
-
}
|
|
2203
|
-
|
|
2204
|
-
// throw error if response body is an oauth error
|
|
2205
|
-
this._manageOauthError(body, response);
|
|
2206
|
-
|
|
2207
|
-
_context3.next = 12;
|
|
2208
|
-
break;
|
|
2209
|
-
|
|
2210
|
-
case 10:
|
|
2211
|
-
if (!(response.status >= 400)) {
|
|
2212
|
-
_context3.next = 12;
|
|
2213
|
-
break;
|
|
2214
|
-
}
|
|
2215
|
-
|
|
2216
|
-
throw getHttpErrorFromResponse(response);
|
|
2217
|
-
|
|
2218
|
-
case 12:
|
|
2219
|
-
_context3.next = 19;
|
|
2220
|
-
break;
|
|
2221
|
-
|
|
2222
|
-
case 14:
|
|
2223
|
-
_context3.prev = 14;
|
|
2224
|
-
_context3.t0 = _context3["catch"](2);
|
|
2225
|
-
|
|
2226
|
-
if (_context3.t0 instanceof OauthError) {
|
|
2227
|
-
_context3.next = 18;
|
|
2228
|
-
break;
|
|
2229
|
-
}
|
|
2230
|
-
|
|
2231
|
-
throw new OauthError(_context3.t0.type, getHttpErrorFromResponse(response));
|
|
2232
|
-
|
|
2233
|
-
case 18:
|
|
2234
|
-
throw _context3.t0;
|
|
2235
|
-
|
|
2236
|
-
case 19:
|
|
2237
|
-
_context3.next = 23;
|
|
2238
|
-
break;
|
|
2259
|
+
if (_classPrivateFieldGet(this, _logger)) {
|
|
2260
|
+
_classPrivateFieldGet(this, _logger).logResponse(response);
|
|
2261
|
+
}
|
|
2239
2262
|
|
|
2240
|
-
|
|
2241
|
-
|
|
2263
|
+
return response.json().then(function (body) {
|
|
2264
|
+
if (isOauthError(body)) {
|
|
2265
|
+
// throw error if response body is an oauth error
|
|
2266
|
+
manageOauthError(body, response);
|
|
2267
|
+
} else if (response.status >= 400) {
|
|
2268
|
+
// throw an error if response status code is an "error" status code
|
|
2269
|
+
throw getHttpErrorFromResponse(originalResponse);
|
|
2270
|
+
}
|
|
2242
2271
|
|
|
2243
|
-
|
|
2244
|
-
|
|
2245
|
-
|
|
2246
|
-
|
|
2272
|
+
return body;
|
|
2273
|
+
})["catch"](function (err) {
|
|
2274
|
+
if (!(err instanceof OauthError)) {
|
|
2275
|
+
throw new OauthError(err.type, getHttpErrorFromResponse(originalResponse));
|
|
2276
|
+
}
|
|
2247
2277
|
|
|
2248
|
-
|
|
2249
|
-
|
|
2278
|
+
throw err;
|
|
2279
|
+
});
|
|
2280
|
+
}
|
|
2250
2281
|
|
|
2251
|
-
|
|
2252
|
-
case "end":
|
|
2253
|
-
return _context3.stop();
|
|
2254
|
-
}
|
|
2255
|
-
}
|
|
2256
|
-
}, _callee3, this, [[2, 14]]);
|
|
2257
|
-
}));
|
|
2282
|
+
var body = responseOrBody;
|
|
2258
2283
|
|
|
2259
|
-
|
|
2260
|
-
|
|
2284
|
+
if (isOauthError(body)) {
|
|
2285
|
+
// throw error if response body is an oauth error
|
|
2286
|
+
manageOauthError(body);
|
|
2261
2287
|
}
|
|
2262
2288
|
|
|
2263
|
-
return
|
|
2264
|
-
}
|
|
2289
|
+
return Promise.resolve(body);
|
|
2290
|
+
}
|
|
2265
2291
|
/**
|
|
2266
2292
|
* Return the number of second when the token will expire
|
|
2267
2293
|
* return value can be negative if the token is already expired
|
|
@@ -2288,36 +2314,23 @@ var TokenStorage = /*#__PURE__*/function () {
|
|
|
2288
2314
|
value: function _storeAccessToken(responseData) {
|
|
2289
2315
|
return _classPrivateFieldGet(this, _asyncStorage).setItem(this.accessTokenKey, JSON.stringify(responseData));
|
|
2290
2316
|
}
|
|
2291
|
-
}, {
|
|
2292
|
-
key: "_manageOauthError",
|
|
2293
|
-
value: function _manageOauthError(body, response) {
|
|
2294
|
-
var error;
|
|
2295
|
-
|
|
2296
|
-
if (response) {
|
|
2297
|
-
error = getHttpErrorFromResponse(response);
|
|
2298
|
-
}
|
|
2299
|
-
|
|
2300
|
-
if (body.error === 'invalid_grant') {
|
|
2301
|
-
throw new InvalidGrantError(body.error, error);
|
|
2302
|
-
}
|
|
2303
|
-
|
|
2304
|
-
if (body.error === 'invalid_scope') {
|
|
2305
|
-
throw new InvalidScopeError(body.error, error);
|
|
2306
|
-
}
|
|
2307
|
-
|
|
2308
|
-
throw new OauthError(body.error, error);
|
|
2309
|
-
}
|
|
2310
2317
|
}]);
|
|
2311
2318
|
|
|
2312
2319
|
return TokenStorage;
|
|
2313
2320
|
}();
|
|
2314
2321
|
|
|
2315
2322
|
var AbstractTokenGenerator = /*#__PURE__*/function () {
|
|
2316
|
-
function AbstractTokenGenerator(tokenGeneratorConfig) {
|
|
2323
|
+
function AbstractTokenGenerator(tokenGeneratorConfig, logger) {
|
|
2317
2324
|
_classCallCheck(this, AbstractTokenGenerator);
|
|
2318
2325
|
|
|
2319
2326
|
_defineProperty(this, "tokenGeneratorConfig", void 0);
|
|
2320
2327
|
|
|
2328
|
+
_defineProperty(this, "logger", void 0);
|
|
2329
|
+
|
|
2330
|
+
if (logger) {
|
|
2331
|
+
this.logger = logger;
|
|
2332
|
+
}
|
|
2333
|
+
|
|
2321
2334
|
this.tokenGeneratorConfig = tokenGeneratorConfig;
|
|
2322
2335
|
|
|
2323
2336
|
if (typeof this.checkTokenGeneratorConfig === 'function') {
|
|
@@ -2390,7 +2403,7 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
|
|
|
2390
2403
|
this._checkGenerateParameters(parameters);
|
|
2391
2404
|
|
|
2392
2405
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2393
|
-
|
|
2406
|
+
var params = {
|
|
2394
2407
|
method: 'POST',
|
|
2395
2408
|
headers: {
|
|
2396
2409
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
@@ -2403,7 +2416,15 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
|
|
|
2403
2416
|
redirect_uri: this.tokenGeneratorConfig.redirectUri,
|
|
2404
2417
|
code: parameters.code
|
|
2405
2418
|
})
|
|
2406
|
-
}
|
|
2419
|
+
};
|
|
2420
|
+
|
|
2421
|
+
if (this.logger) {
|
|
2422
|
+
this.logger.logRequest(_objectSpread2({
|
|
2423
|
+
url: url
|
|
2424
|
+
}, params));
|
|
2425
|
+
}
|
|
2426
|
+
|
|
2427
|
+
return fetch(url, params);
|
|
2407
2428
|
}
|
|
2408
2429
|
/**
|
|
2409
2430
|
* This function needs to refresh the current possibly expired access token
|
|
@@ -2422,7 +2443,7 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
|
|
|
2422
2443
|
}
|
|
2423
2444
|
|
|
2424
2445
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2425
|
-
|
|
2446
|
+
var params = {
|
|
2426
2447
|
method: 'POST',
|
|
2427
2448
|
headers: {
|
|
2428
2449
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
@@ -2433,7 +2454,15 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
|
|
|
2433
2454
|
client_secret: this.tokenGeneratorConfig.clientSecret,
|
|
2434
2455
|
refresh_token: oldAccessToken.refresh_token
|
|
2435
2456
|
})
|
|
2436
|
-
}
|
|
2457
|
+
};
|
|
2458
|
+
|
|
2459
|
+
if (this.logger) {
|
|
2460
|
+
this.logger.logRequest(_objectSpread2({
|
|
2461
|
+
url: url
|
|
2462
|
+
}, params));
|
|
2463
|
+
}
|
|
2464
|
+
|
|
2465
|
+
return fetch(url, params);
|
|
2437
2466
|
}
|
|
2438
2467
|
}, {
|
|
2439
2468
|
key: "checkTokenGeneratorConfig",
|
|
@@ -2505,14 +2534,22 @@ var ClientCredentialsGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
|
|
|
2505
2534
|
body.append('scope', this.tokenGeneratorConfig.scope);
|
|
2506
2535
|
}
|
|
2507
2536
|
|
|
2508
|
-
var
|
|
2509
|
-
return fetch(url, {
|
|
2537
|
+
var params = {
|
|
2510
2538
|
method: 'POST',
|
|
2511
2539
|
headers: {
|
|
2512
2540
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2513
2541
|
},
|
|
2514
2542
|
body: body
|
|
2515
|
-
}
|
|
2543
|
+
};
|
|
2544
|
+
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2545
|
+
|
|
2546
|
+
if (this.logger) {
|
|
2547
|
+
this.logger.logRequest(_objectSpread2({
|
|
2548
|
+
url: url
|
|
2549
|
+
}, params));
|
|
2550
|
+
}
|
|
2551
|
+
|
|
2552
|
+
return fetch(url, params);
|
|
2516
2553
|
}
|
|
2517
2554
|
}, {
|
|
2518
2555
|
key: "refreshToken",
|
|
@@ -2577,13 +2614,21 @@ var PasswordGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
|
|
|
2577
2614
|
}
|
|
2578
2615
|
|
|
2579
2616
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2580
|
-
|
|
2617
|
+
var params = {
|
|
2581
2618
|
method: 'POST',
|
|
2582
2619
|
headers: {
|
|
2583
2620
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2584
2621
|
},
|
|
2585
2622
|
body: body
|
|
2586
|
-
}
|
|
2623
|
+
};
|
|
2624
|
+
|
|
2625
|
+
if (this.logger) {
|
|
2626
|
+
this.logger.logRequest(_objectSpread2({
|
|
2627
|
+
url: url
|
|
2628
|
+
}, params));
|
|
2629
|
+
}
|
|
2630
|
+
|
|
2631
|
+
return fetch(url, params);
|
|
2587
2632
|
}
|
|
2588
2633
|
}, {
|
|
2589
2634
|
key: "refreshToken",
|
|
@@ -2606,13 +2651,21 @@ var PasswordGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
|
|
|
2606
2651
|
}
|
|
2607
2652
|
|
|
2608
2653
|
var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
|
|
2609
|
-
|
|
2654
|
+
var params = {
|
|
2610
2655
|
method: 'POST',
|
|
2611
2656
|
headers: {
|
|
2612
2657
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
2613
2658
|
},
|
|
2614
2659
|
body: body
|
|
2615
|
-
}
|
|
2660
|
+
};
|
|
2661
|
+
|
|
2662
|
+
if (this.logger) {
|
|
2663
|
+
this.logger.logRequest(_objectSpread2({
|
|
2664
|
+
url: url
|
|
2665
|
+
}, params));
|
|
2666
|
+
}
|
|
2667
|
+
|
|
2668
|
+
return fetch(url, params);
|
|
2616
2669
|
}
|
|
2617
2670
|
}, {
|
|
2618
2671
|
key: "checkTokenGeneratorConfig",
|
|
@@ -2956,5 +3009,5 @@ _defineProperty(Relation, "MANY_TO_ONE", RelationTypes.MANY_TO_ONE);
|
|
|
2956
3009
|
_defineProperty(Relation, "MANY_TO_MANY", RelationTypes.MANY_TO_MANY);
|
|
2957
3010
|
|
|
2958
3011
|
export default RestClientSdk;
|
|
2959
|
-
export { AbstractClient, AbstractTokenGenerator, Attribute, AuthorizationCodeFlowTokenGenerator, BadRequestError, ClassMetadata, ClientCredentialsGenerator, ConflictError, ForbiddenError, HttpError, InternalServerError, InvalidGrantError, InvalidScopeError, Mapping, OauthError, PasswordGenerator, ProvidedTokenGenerator, Relation, ResourceNotFoundError, Serializer, TokenStorage, UnauthorizedError };
|
|
3012
|
+
export { AbstractClient, AbstractTokenGenerator, Attribute, AuthorizationCodeFlowTokenGenerator, BadRequestError, ClassMetadata, ClientCredentialsGenerator, ConflictError, ForbiddenError, HttpError, InternalServerError, InvalidGrantError, InvalidScopeError, Logger, Mapping, OauthError, PasswordGenerator, ProvidedTokenGenerator, Relation, ResourceNotFoundError, Serializer, TokenStorage, UnauthorizedError };
|
|
2960
3013
|
//# sourceMappingURL=index.es.js.map
|