rest-client-sdk 7.0.0-rc.1 → 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 CHANGED
@@ -953,6 +953,155 @@ function generateRepository(sdk, metadata) {
953
953
  return new metadata.repositoryClass(sdk, metadata, isUnitOfWorkEnabled);
954
954
  }
955
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
+
956
1105
  var _repositoryList = new WeakMap();
957
1106
 
958
1107
  var RestClientSdk = /*#__PURE__*/function () {
@@ -976,6 +1125,8 @@ var RestClientSdk = /*#__PURE__*/function () {
976
1125
  value: void 0
977
1126
  });
978
1127
 
1128
+ _defineProperty(this, "logger", void 0);
1129
+
979
1130
  this.checkConfigValidity(config);
980
1131
 
981
1132
  if (!(mapping instanceof Mapping)) {
@@ -988,6 +1139,10 @@ var RestClientSdk = /*#__PURE__*/function () {
988
1139
  this.mapping = mapping;
989
1140
  this.unitOfWork = new UnitOfWork(this.mapping, this.config.unitOfWorkEnabled);
990
1141
 
1142
+ if (config.loggerEnabled) {
1143
+ this.logger = new Logger();
1144
+ }
1145
+
991
1146
  _classPrivateFieldSet(this, _repositoryList, {});
992
1147
  }
993
1148
  /**
@@ -1363,52 +1518,6 @@ function isOauthError(body) {
1363
1518
  return typeof ((_ref = body) === null || _ref === void 0 ? void 0 : _ref.error) === 'string';
1364
1519
  }
1365
1520
 
1366
- /* eslint-disable consistent-return */
1367
- function removeAuthorization(headers) {
1368
- if (!headers) {
1369
- return;
1370
- }
1371
-
1372
- if (headers instanceof Headers) {
1373
- headers["delete"]('Authorization');
1374
- return headers;
1375
- }
1376
-
1377
- var filterAuthorization = function filterAuthorization(entries) {
1378
- return entries.filter(function (header) {
1379
- return header[0] !== 'Authorization';
1380
- });
1381
- };
1382
-
1383
- if (Array.isArray(headers)) {
1384
- return filterAuthorization(headers);
1385
- }
1386
-
1387
- return Object.fromEntries(filterAuthorization(Object.entries(headers)));
1388
- }
1389
- /**
1390
- * remove undefined key, usefull to remove Content-Type for example.
1391
- * Does not apply on "Headers" instance as values are string in there.
1392
- */
1393
-
1394
- function removeUndefinedHeaders(headers) {
1395
- if (headers instanceof Headers) {
1396
- return headers;
1397
- }
1398
-
1399
- var filterEntries = function filterEntries(entries) {
1400
- return entries.filter(function (header) {
1401
- return header[1] !== undefined;
1402
- });
1403
- };
1404
-
1405
- if (Array.isArray(headers)) {
1406
- return filterEntries(headers);
1407
- }
1408
-
1409
- return Object.fromEntries(filterEntries(Object.entries(headers)));
1410
- }
1411
-
1412
1521
  var EXPIRE_LIMIT_SECONDS = 300; // = 5 minutes
1413
1522
 
1414
1523
  var _tokenStorage = new WeakMap();
@@ -1876,10 +1985,22 @@ var AbstractClient = /*#__PURE__*/function () {
1876
1985
 
1877
1986
  if (params.headers) {
1878
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));
1879
1996
  } // eslint-disable-next-line consistent-return
1880
1997
 
1881
1998
 
1882
1999
  return fetch(input, params).then(function (response) {
2000
+ if (_this6.sdk.logger) {
2001
+ _this6.sdk.logger.logResponse(response, logId);
2002
+ }
2003
+
1883
2004
  if (response.status < 400) {
1884
2005
  return response;
1885
2006
  }
@@ -1952,6 +2073,7 @@ function memoizePromise(callback) {
1952
2073
  return memoized;
1953
2074
  }
1954
2075
 
2076
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
1955
2077
  function isResponse(response) {
1956
2078
  return typeof (response === null || response === void 0 ? void 0 : response.json) === 'function';
1957
2079
  }
@@ -1980,9 +2102,12 @@ var _hasATokenBeenGenerated = new WeakMap();
1980
2102
 
1981
2103
  var _asyncStorage = new WeakMap();
1982
2104
 
2105
+ var _logger = new WeakMap();
2106
+
1983
2107
  var TokenStorage = /*#__PURE__*/function () {
1984
2108
  function TokenStorage(tokenGenerator, asyncStorage) {
1985
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;
1986
2111
 
1987
2112
  _classCallCheck(this, TokenStorage);
1988
2113
 
@@ -2003,12 +2128,22 @@ var TokenStorage = /*#__PURE__*/function () {
2003
2128
  value: void 0
2004
2129
  });
2005
2130
 
2131
+ _logger.set(this, {
2132
+ writable: true,
2133
+ value: void 0
2134
+ });
2135
+
2136
+ if (logger) {
2137
+ _classPrivateFieldSet(this, _logger, logger);
2138
+ }
2139
+
2006
2140
  _classPrivateFieldSet(this, _tokenGenerator, tokenGenerator);
2007
2141
 
2008
2142
  _classPrivateFieldSet(this, _hasATokenBeenGenerated, false);
2009
2143
 
2010
2144
  this.setAsyncStorage(asyncStorage);
2011
2145
  this.accessTokenKey = accessTokenKey;
2146
+ this.handleTokenResponse = this.handleTokenResponse.bind(this);
2012
2147
  this.generateToken = memoizePromise(this.generateToken);
2013
2148
  this.refreshToken = memoizePromise(this.refreshToken);
2014
2149
  }
@@ -2120,6 +2255,11 @@ var TokenStorage = /*#__PURE__*/function () {
2120
2255
  if (isResponse(responseOrBody)) {
2121
2256
  var response = responseOrBody;
2122
2257
  var originalResponse = response.clone();
2258
+
2259
+ if (_classPrivateFieldGet(this, _logger)) {
2260
+ _classPrivateFieldGet(this, _logger).logResponse(response);
2261
+ }
2262
+
2123
2263
  return response.json().then(function (body) {
2124
2264
  if (isOauthError(body)) {
2125
2265
  // throw error if response body is an oauth error
@@ -2180,11 +2320,17 @@ var TokenStorage = /*#__PURE__*/function () {
2180
2320
  }();
2181
2321
 
2182
2322
  var AbstractTokenGenerator = /*#__PURE__*/function () {
2183
- function AbstractTokenGenerator(tokenGeneratorConfig) {
2323
+ function AbstractTokenGenerator(tokenGeneratorConfig, logger) {
2184
2324
  _classCallCheck(this, AbstractTokenGenerator);
2185
2325
 
2186
2326
  _defineProperty(this, "tokenGeneratorConfig", void 0);
2187
2327
 
2328
+ _defineProperty(this, "logger", void 0);
2329
+
2330
+ if (logger) {
2331
+ this.logger = logger;
2332
+ }
2333
+
2188
2334
  this.tokenGeneratorConfig = tokenGeneratorConfig;
2189
2335
 
2190
2336
  if (typeof this.checkTokenGeneratorConfig === 'function') {
@@ -2257,7 +2403,7 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
2257
2403
  this._checkGenerateParameters(parameters);
2258
2404
 
2259
2405
  var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
2260
- return fetch(url, {
2406
+ var params = {
2261
2407
  method: 'POST',
2262
2408
  headers: {
2263
2409
  'Content-Type': 'application/x-www-form-urlencoded'
@@ -2270,7 +2416,15 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
2270
2416
  redirect_uri: this.tokenGeneratorConfig.redirectUri,
2271
2417
  code: parameters.code
2272
2418
  })
2273
- });
2419
+ };
2420
+
2421
+ if (this.logger) {
2422
+ this.logger.logRequest(_objectSpread2({
2423
+ url: url
2424
+ }, params));
2425
+ }
2426
+
2427
+ return fetch(url, params);
2274
2428
  }
2275
2429
  /**
2276
2430
  * This function needs to refresh the current possibly expired access token
@@ -2289,7 +2443,7 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
2289
2443
  }
2290
2444
 
2291
2445
  var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
2292
- return fetch(url, {
2446
+ var params = {
2293
2447
  method: 'POST',
2294
2448
  headers: {
2295
2449
  'Content-Type': 'application/x-www-form-urlencoded'
@@ -2300,7 +2454,15 @@ var AuthorizationCodeFlowTokenGenerator = /*#__PURE__*/function (_AbstractTokenG
2300
2454
  client_secret: this.tokenGeneratorConfig.clientSecret,
2301
2455
  refresh_token: oldAccessToken.refresh_token
2302
2456
  })
2303
- });
2457
+ };
2458
+
2459
+ if (this.logger) {
2460
+ this.logger.logRequest(_objectSpread2({
2461
+ url: url
2462
+ }, params));
2463
+ }
2464
+
2465
+ return fetch(url, params);
2304
2466
  }
2305
2467
  }, {
2306
2468
  key: "checkTokenGeneratorConfig",
@@ -2372,14 +2534,22 @@ var ClientCredentialsGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
2372
2534
  body.append('scope', this.tokenGeneratorConfig.scope);
2373
2535
  }
2374
2536
 
2375
- var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
2376
- return fetch(url, {
2537
+ var params = {
2377
2538
  method: 'POST',
2378
2539
  headers: {
2379
2540
  'Content-Type': 'application/x-www-form-urlencoded'
2380
2541
  },
2381
2542
  body: body
2382
- });
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);
2383
2553
  }
2384
2554
  }, {
2385
2555
  key: "refreshToken",
@@ -2444,13 +2614,21 @@ var PasswordGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
2444
2614
  }
2445
2615
 
2446
2616
  var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
2447
- return fetch(url, {
2617
+ var params = {
2448
2618
  method: 'POST',
2449
2619
  headers: {
2450
2620
  'Content-Type': 'application/x-www-form-urlencoded'
2451
2621
  },
2452
2622
  body: body
2453
- });
2623
+ };
2624
+
2625
+ if (this.logger) {
2626
+ this.logger.logRequest(_objectSpread2({
2627
+ url: url
2628
+ }, params));
2629
+ }
2630
+
2631
+ return fetch(url, params);
2454
2632
  }
2455
2633
  }, {
2456
2634
  key: "refreshToken",
@@ -2473,13 +2651,21 @@ var PasswordGenerator = /*#__PURE__*/function (_AbstractTokenGenerat) {
2473
2651
  }
2474
2652
 
2475
2653
  var url = this.generateUrlFromConfig(this.tokenGeneratorConfig);
2476
- return fetch(url, {
2654
+ var params = {
2477
2655
  method: 'POST',
2478
2656
  headers: {
2479
2657
  'Content-Type': 'application/x-www-form-urlencoded'
2480
2658
  },
2481
2659
  body: body
2482
- });
2660
+ };
2661
+
2662
+ if (this.logger) {
2663
+ this.logger.logRequest(_objectSpread2({
2664
+ url: url
2665
+ }, params));
2666
+ }
2667
+
2668
+ return fetch(url, params);
2483
2669
  }
2484
2670
  }, {
2485
2671
  key: "checkTokenGeneratorConfig",
@@ -2823,5 +3009,5 @@ _defineProperty(Relation, "MANY_TO_ONE", RelationTypes.MANY_TO_ONE);
2823
3009
  _defineProperty(Relation, "MANY_TO_MANY", RelationTypes.MANY_TO_MANY);
2824
3010
 
2825
3011
  export default RestClientSdk;
2826
- 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 };
2827
3013
  //# sourceMappingURL=index.es.js.map