@commercetools/sdk-client-v2 1.2.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @commercetools/sdk-client-v2
 
+## 1.4.1
+
+### Patch Changes
+
+- [#317](https://github.com/commercetools/commercetools-sdk-typescript/pull/317) [`d921acd`](https://github.com/commercetools/commercetools-sdk-typescript/commit/d921acda35dadf135dffb53419b8825c915477b1) Thanks [@ajimae](https://github.com/ajimae)! - Allow `sdk-client` to accept request headers with `application/graphql` content-type.
+
+* [#311](https://github.com/commercetools/commercetools-sdk-typescript/pull/311) [`588a0f9`](https://github.com/commercetools/commercetools-sdk-typescript/commit/588a0f9b981a538a16a23a449e810c56956f352c) Thanks [@ajimae](https://github.com/ajimae)! - Change token fetch window from 2 hours to 5 minutes
+
+- [#320](https://github.com/commercetools/commercetools-sdk-typescript/pull/320) [`7510e0b`](https://github.com/commercetools/commercetools-sdk-typescript/commit/7510e0bf69cc4b63c43d0431d338502d048524aa) Thanks [@JohnMarsden24](https://github.com/JohnMarsden24)! - fix: make options for `withExistingTokenFlow` method optional
+
+## 1.4.0
+
+### Minor Changes
+
+- [#257](https://github.com/commercetools/commercetools-sdk-typescript/pull/257) [`facc47b`](https://github.com/commercetools/commercetools-sdk-typescript/commit/facc47ba50b00056adc232d7c75a2849cdcc6689) Thanks [@ajimae](https://github.com/ajimae)! - release latest sdk
+
+### Patch Changes
+
+- [#248](https://github.com/commercetools/commercetools-sdk-typescript/pull/248) [`7512c3f`](https://github.com/commercetools/commercetools-sdk-typescript/commit/7512c3f1f488645da3952f296d4f4fe3149b7fba) Thanks [@ajimae](https://github.com/ajimae)! - - add an option (`includeRequestInErrorResponse`) to include or exclude original request from error responses.
+
+## 1.3.0
+
+### Minor Changes
+
+- [#241](https://github.com/commercetools/commercetools-sdk-typescript/pull/241) [`85f5be3`](https://github.com/commercetools/commercetools-sdk-typescript/commit/85f5be349a9b0fa46539259981bfd8d5fc2ffdc6) Thanks [@ajimae](https://github.com/ajimae)! - Releasing the TS SDK with the following changelogs
+
+  - added functionalities to extend client user agent
+  - custom field added to OrderFromCardDraft
+
 ## 1.2.0
 
 ### Minor Changes

package/README.md

@@ -1,4 +1,4 @@
-# Commercetools TypeScript SDK client.
+# Commercetools Composable Commerce TypeScript SDK client
 
 ## Usage examples
 
@@ -77,7 +77,7 @@ const client = new ClientBuilder()
 
 const apiRoot = createApiBuilderFromCtpClient(client)
 
-// calling the platform functions
+// calling the Composable Commerce functions
 // get project details
 apiRoot
   .withProjectKey({

package/dist/commercetools-sdk-client-v2.browser.cjs.js

@@ -39,13 +39,104 @@ function validate(funcName, request, options = {
   if (!options.allowedMethods.includes(request.method)) throw new Error(`The "${funcName}" Request object requires a valid method. See https://commercetools.github.io/nodejs/sdk/Glossary.html#clientrequest`);
 }
 
+let _options;
+
 function compose(...funcs) {
   funcs = funcs.filter(func => typeof func === 'function');
   if (funcs.length === 1) return funcs[0];
   return funcs.reduce((a, b) => (...args) => a(b(...args)));
 }
 
+function process$1(request, fn, processOpt) {
+  validate('process', request, {
+    allowedMethods: ['GET']
+  });
+  if (typeof fn !== 'function') throw new Error('The "process" function accepts a "Function" as a second argument that returns a Promise. See https://commercetools.github.io/nodejs/sdk/api/sdkClient.html#processrequest-processfn-options'); // Set default process options
+
+  const opt = {
+    total: Number.POSITIVE_INFINITY,
+    accumulate: true,
+    ...processOpt
+  };
+  return new Promise((resolve, reject) => {
+    let _path,
+        _queryString = '';
+
+    if (request && request.uri) {
+      const [path, queryString] = request.uri.split('?');
+      _path = path;
+      _queryString = queryString;
+    }
+
+    const requestQuery = { ...qs__default["default"].parse(_queryString)
+    };
+    const query = {
+      // defaults
+      limit: 20,
+      // merge given query params
+      ...requestQuery
+    };
+    let hasFirstPageBeenProcessed = false;
+    let itemsToGet = opt.total;
+
+    const processPage = async (lastId, acc = []) => {
+      // Use the lesser value between limit and itemsToGet in query
+      const limit = query.limit < itemsToGet ? query.limit : itemsToGet;
+      const originalQueryString = qs__default["default"].stringify({ ...query,
+        limit
+      });
+      const enhancedQuery = {
+        sort: 'id asc',
+        withTotal: false,
+        ...(lastId ? {
+          where: `id > "${lastId}"`
+        } : {})
+      };
+      const enhancedQueryString = qs__default["default"].stringify(enhancedQuery);
+      const enhancedRequest = { ...request,
+        uri: `${_path}?${enhancedQueryString}&${originalQueryString}`
+      };
+
+      try {
+        const payload = await createClient(_options).execute(enhancedRequest);
+        const {
+          results,
+          count: resultsLength
+        } = payload.body;
+
+        if (!resultsLength && hasFirstPageBeenProcessed) {
+          return resolve(acc || []);
+        }
+
+        const result = await Promise.resolve(fn(payload));
+        let accumulated;
+        hasFirstPageBeenProcessed = true;
+        if (opt.accumulate) accumulated = acc.concat(result || []);
+        itemsToGet -= resultsLength; // If there are no more items to get, it means the total number
+        // of items in the original request have been fetched so we
+        // resolve the promise.
+        // Also, if we get less results in a page then the limit set it
+        // means that there are no more pages and that we can finally
+        // resolve the promise.
+
+        if (resultsLength < query.limit || !itemsToGet) {
+          return resolve(accumulated || []);
+        }
+
+        const last = results[resultsLength - 1];
+        const newLastId = last && last.id;
+        processPage(newLastId, accumulated);
+      } catch (error) {
+        reject(error);
+      }
+    }; // Start iterating through pages
+
+
+    processPage();
+  });
+}
 function createClient(options) {
+  _options = options;
   if (!options) throw new Error('Missing required options');
   if (options.middlewares && !Array.isArray(options.middlewares)) throw new Error('Middlewares should be an array');
   if (!options.middlewares || !Array.isArray(options.middlewares) || !options.middlewares.length) throw new Error('You need to provide at least one middleware');
@@ -53,6 +144,8 @@ function createClient(options) {
     /**
      * Given a request object,
      */
+    process: process$1,
+
     execute(request) {
       validate('exec', request);
       return new Promise((resolve, reject) => {
@@ -81,95 +174,6 @@ function createClient(options) {
           error: undefined
         });
       });
-    },
-
-    process(request, fn, processOpt) {
-      validate('process', request, {
-        allowedMethods: ['GET']
-      });
-      if (typeof fn !== 'function') throw new Error('The "process" function accepts a "Function" as a second argument that returns a Promise. See https://commercetools.github.io/nodejs/sdk/api/sdkClient.html#processrequest-processfn-options'); // Set default process options
-
-      const opt = {
-        total: Number.POSITIVE_INFINITY,
-        accumulate: true,
-        ...processOpt
-      };
-      return new Promise((resolve, reject) => {
-        let _path,
-            _queryString = '';
-
-        if (request && request.uri) {
-          const [path, queryString] = request.uri.split('?');
-          _path = path;
-          _queryString = queryString;
-        }
-
-        const requestQuery = { ...qs__default["default"].parse(_queryString)
-        };
-        const query = {
-          // defaults
-          limit: 20,
-          // merge given query params
-          ...requestQuery
-        };
-        let hasFirstPageBeenProcessed = false;
-        let itemsToGet = opt.total;
-
-        const processPage = async (lastId, acc = []) => {
-          // Use the lesser value between limit and itemsToGet in query
-          const limit = query.limit < itemsToGet ? query.limit : itemsToGet;
-          const originalQueryString = qs__default["default"].stringify({ ...query,
-            limit
-          });
-          const enhancedQuery = {
-            sort: 'id asc',
-            withTotal: false,
-            ...(lastId ? {
-              where: `id > "${lastId}"`
-            } : {})
-          };
-          const enhancedQueryString = qs__default["default"].stringify(enhancedQuery);
-          const enhancedRequest = { ...request,
-            uri: `${_path}?${enhancedQueryString}&${originalQueryString}`
-          };
-
-          try {
-            const payload = await this.execute(enhancedRequest);
-            const {
-              results,
-              count: resultsLength
-            } = payload.body;
-
-            if (!resultsLength && hasFirstPageBeenProcessed) {
-              return resolve(acc || []);
-            }
-
-            const result = await Promise.resolve(fn(payload));
-            let accumulated;
-            hasFirstPageBeenProcessed = true;
-            if (opt.accumulate) accumulated = acc.concat(result || []);
-            itemsToGet -= resultsLength; // If there are no more items to get, it means the total number
-            // of items in the original request have been fetched so we
-            // resolve the promise.
-            // Also, if we get less results in a page then the limit set it
-            // means that there are no more pages and that we can finally
-            // resolve the promise.
-
-            if (resultsLength < query.limit || !itemsToGet) {
-              return resolve(accumulated || []);
-            }
-
-            const last = results[resultsLength - 1];
-            const newLastId = last && last.id;
-            processPage(newLastId, accumulated);
-          } catch (error) {
-            reject(error);
-          }
-        }; // Start iterating through pages
-
-
-        processPage();
-      });
     }
 
   };
@@ -228,7 +232,7 @@ function buildRequestForPasswordFlow(options) {
    */
 
   const oauthUri = options.oauthUri || `/oauth/${pKey}/customers/token`;
-  const url = options.host.replace(/\/$/, '') + oauthUri; // encode username and password as requested by platform
+  const url = options.host.replace(/\/$/, '') + oauthUri; // encode username and password as requested by the system
 
   const body = `grant_type=password&username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}${scopeStr}`;
   return {
@@ -282,8 +286,8 @@ function mergeAuthHeader(token, req) {
 }
 
 function calculateExpirationTime(expiresIn) {
-  return Date.now() + // Add a gap of 2 hours before expiration time.
-  expiresIn * 1000 - 2 * 60 * 60 * 1000;
+  return Date.now() + // Add a gap of 5 minutes before expiration time.
+  expiresIn * 1000 - 5 * 60 * 1000;
 }
 
 async function executeRequest({
@@ -741,6 +745,7 @@ function createHttpMiddleware({
   credentialsMode,
   includeResponseHeaders,
   includeOriginalRequest,
+  includeRequestInErrorResponse = true,
   maskSensitiveHeaderData = true,
   enableRetry,
   timeout,
@@ -749,7 +754,8 @@ function createHttpMiddleware({
     maxRetries = 10,
     backoff = true,
     retryDelay = 200,
-    maxDelay = Infinity
+    maxDelay = Infinity,
+    retryCodes = [503]
   } = {},
   fetch: fetcher,
   getAbortController
@@ -767,20 +773,29 @@ function createHttpMiddleware({
     fetchFunction = fetch;
   }
 
+  if (!Array.isArray(retryCodes)) {
+    throw new Error('`retryCodes` option must be an array of retry status (error) codes.');
+  }
+
   return next => (request, response) => {
     let abortController;
     if (timeout || getAbortController) abortController = (getAbortController ? getAbortController() : null) || new AbortController();
     const url = host.replace(/\/$/, '') + request.uri;
-    const body = typeof request.body === 'string' || Buffer.isBuffer(request.body) ? request.body : // NOTE: `stringify` of `null` gives the String('null')
-    JSON.stringify(request.body || undefined);
     const requestHeader = { ...request.headers
-    };
+    }; // Unset the content-type header if explicitly asked to (passing `null` as value).
 
-    if (!Object.prototype.hasOwnProperty.call(requestHeader, 'Content-Type')) {
-      requestHeader['Content-Type'] = 'application/json';
+    if (requestHeader['Content-Type'] === null) {
+      delete requestHeader['Content-Type'];
     }
 
-    if (body) {
+    if (!(Object.prototype.hasOwnProperty.call(requestHeader, 'Content-Type') || Object.prototype.hasOwnProperty.call(requestHeader, 'content-type'))) {
+      requestHeader['Content-Type'] = 'application/json';
+    } // Ensure body is a string if content type is application/json
+
+
+    const body = ['application/json', 'application/graphql'].indexOf(requestHeader['Content-Type']) > -1 && typeof request.body === 'string' || Buffer.isBuffer(request.body) ? request.body : JSON.stringify(request.body || undefined);
+
+    if (body && (typeof body === 'string' || Buffer.isBuffer(body))) {
       requestHeader['Content-Length'] = Buffer.byteLength(body).toString();
     }
 
@@ -849,15 +864,25 @@ function createHttpMiddleware({
             next(request, parsedResponse);
           });
           return;
-        }
-
-        if (res.status === 503 && enableRetry) if (retryCount < maxRetries) {
-          setTimeout(executeFetch, calcDelayDuration(retryCount, retryDelay, maxRetries, backoff, maxDelay));
-          retryCount += 1;
-          return;
-        } // Server responded with an error. Try to parse it as JSON, then
+        } // if (res.status === 503 && enableRetry)
+        //   if (retryCount < maxRetries) {
+        //     setTimeout(
+        //       executeFetch,
+        //       calcDelayDuration(
+        //         retryCount,
+        //         retryDelay,
+        //         maxRetries,
+        //         backoff,
+        //         maxDelay
+        //       )
+        //     )
+        //     retryCount += 1
+        //     return
+        //   }
+        // Server responded with an error. Try to parse it as JSON, then
         // return a proper error type with all necessary meta information.
 
+
         res.text().then(text => {
           // Try to parse the error response as JSON
           let parsed;
@@ -870,7 +895,9 @@ function createHttpMiddleware({
 
           const error = createError({
             statusCode: res.status,
-            originalRequest: request,
+            ...(includeRequestInErrorResponse ? {
+              originalRequest: request
+            } : {}),
             retryCount,
             headers: parseHeaders(res.headers),
             ...(typeof parsed === 'object' ? {
@@ -881,6 +908,15 @@ function createHttpMiddleware({
               body: parsed
             })
           });
+
+          if (enableRetry && (retryCodes.indexOf(error.statusCode) !== -1 || (retryCodes === null || retryCodes === void 0 ? void 0 : retryCodes.indexOf(error.message)) !== -1)) {
+            if (retryCount < maxRetries) {
+              setTimeout(executeFetch, calcDelayDuration(retryCount, retryDelay, maxRetries, backoff, maxDelay));
+              retryCount += 1;
+              return;
+            }
+          }
+
           maskAuthData(error.originalRequest, maskSensitiveHeaderData); // Let the final resolver to reject the promise
 
           const parsedResponse = { ...response,
@@ -896,8 +932,9 @@ function createHttpMiddleware({
           retryCount += 1;
           return;
         }
-        const error = new NetworkError(e.message, {
-          originalRequest: request,
+        const error = new NetworkError(e.message, { ...(includeRequestInErrorResponse ? {
+            originalRequest: request
+          } : {}),
           retryCount
         });
         maskAuthData(error.originalRequest, maskSensitiveHeaderData);
@@ -982,10 +1019,11 @@ function createQueueMiddleware({
 
 var packageJson = {
 	name: "@commercetools/sdk-client-v2",
-	version: "1.2.0",
-	description: "commercetools TypeScript SDK client.",
+	version: "1.4.1",
+	description: "commercetools Composable Commerce TypeScript SDK client.",
 	keywords: [
 		"commercetools",
+		"composable commerce",
 		"sdk",
 		"typescript",
 		"client",
@@ -1029,10 +1067,10 @@ var packageJson = {
 	devDependencies: {
 		"abort-controller": "3.0.0",
 		"common-tags": "1.8.2",
-		dotenv: "16.0.0",
-		jest: "27.4.7",
+		dotenv: "16.0.1",
+		jest: "28.1.1",
 		nock: "12.0.3",
-		"organize-imports-cli": "0.9.0"
+		"organize-imports-cli": "0.10.0"
 	},
 	scripts: {
 		organize_imports: "find src -type f -name '*.ts' | xargs organize-imports-cli",
@@ -1073,12 +1111,14 @@ function createUserAgent(options) {
   let contactInfo = null;
   if (options.contactUrl && !options.contactEmail) contactInfo = `(+${options.contactUrl})`;else if (!options.contactUrl && options.contactEmail) contactInfo = `(+${options.contactEmail})`;else if (options.contactUrl && options.contactEmail) contactInfo = `(+${options.contactUrl}; +${options.contactEmail})`; // System info
 
-  const systemInfo = getSystemInfo();
-  return [baseInfo, systemInfo, libraryInfo, contactInfo].filter(Boolean).join(' ');
+  const systemInfo = getSystemInfo(); // customName
+
+  const customAgent = options.customAgent || '';
+  return [baseInfo, systemInfo, libraryInfo, contactInfo, customAgent].filter(Boolean).join(' ');
 }
 
-function createUserAgentMiddleware() {
-  const userAgent = createUserAgent({
+function createUserAgentMiddleware(options) {
+  const userAgent = createUserAgent({ ...options,
     name: `commercetools-sdk-javascript-v2/${packageJson.version}`
   });
   return next => (request, response) => {
@@ -1219,8 +1259,8 @@ class ClientBuilder {
     return this;
   }
 
-  withUserAgentMiddleware() {
-    this.userAgentMiddleware = createUserAgentMiddleware();
+  withUserAgentMiddleware(options) {
+    this.userAgentMiddleware = createUserAgentMiddleware(options);
     return this;
   }
 
@@ -1250,9 +1290,9 @@ class ClientBuilder {
     if (this.correlationIdMiddleware) middlewares.push(this.correlationIdMiddleware);
     if (this.userAgentMiddleware) middlewares.push(this.userAgentMiddleware);
     if (this.authMiddleware) middlewares.push(this.authMiddleware);
-    if (this.loggerMiddleware) middlewares.push(this.loggerMiddleware);
     if (this.queueMiddleware) middlewares.push(this.queueMiddleware);
     if (this.httpMiddleware) middlewares.push(this.httpMiddleware);
+    if (this.loggerMiddleware) middlewares.push(this.loggerMiddleware);
     return createClient({
       middlewares
     });
@@ -1261,6 +1301,7 @@ class ClientBuilder {
 }
 
 exports.ClientBuilder = ClientBuilder;
+exports.Process = process$1;
 exports.createAuthForAnonymousSessionFlow = createAuthMiddlewareForAnonymousSessionFlow$1;
 exports.createAuthForClientCredentialsFlow = createAuthMiddlewareForClientCredentialsFlow$1;
 exports.createAuthForPasswordFlow = createAuthMiddlewareForPasswordFlow$1;