@verii/http-client 1.1.0-pre.1762210020 → 1.1.0-pre.1762240520

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/http-client",
-  "version": "1.1.0-pre.1762210020",
+  "version": "1.1.0-pre.1762240520",
   "description": "HTTP client for Verii network",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "index.js",
@@ -33,7 +33,7 @@
     "eslint-plugin-prefer-arrow-functions": "3.9.1",
     "eslint-plugin-prettier": "4.2.5",
     "eslint-watch": "7.0.0",
-    "expect": "29.7.0",
+    "expect": "30.2.0",
     "nodemon": "3.1.10",
     "prettier": "2.8.8"
   },
@@ -42,5 +42,5 @@
       "lib"
     ]
   },
-  "gitHead": "ab4413b1c7592b95c0181c8887dc57cc9dac80b7"
+  "gitHead": "a3f738ccb11ebe7e6c9984fe06682e6a529285fb"
 }

package/src/client.js

@@ -106,7 +106,7 @@ const initHttpClient = (options) => {
       ...reqOptions?.headers,
       ...buildBearerAuthorizationHeader(bearerToken),
     };
-    const [origin, path] = buildUrl(host, url, reqOptions, clientOptions);
+    const [origin, path] = buildUrl(host, url, reqOptions);
 
     log.info({ origin, path, url, reqId, reqHeaders }, 'HttpClient request');
 
@@ -213,19 +213,22 @@ const parsePrefixUrl = (prefixUrl) => {
   };
 };
 
-const buildUrl = (host, url, reqOptions, clientOptions) => {
+const buildUrl = (host, url, reqOptions) => {
   const fullUrl = reqOptions?.prefixUrl
     ? new URL(url, reqOptions.prefixUrl).toString()
     : url;
 
   return host && !reqOptions?.prefixUrl
     ? [host.origin, buildRelativePath(host.rootPath, url, reqOptions)]
-    : parseFullURL(fullUrl, clientOptions, reqOptions);
+    : parseFullURL(fullUrl, reqOptions);
 };
 
-const parseFullURL = (url, clientOptions, reqOptions) => {
-  const { origin, pathname } = new URL(url);
-  return [origin, addSearchParams(pathname, reqOptions?.searchParams)];
+const parseFullURL = (url, reqOptions) => {
+  const { origin, pathname, searchParams } = new URL(url);
+  return [
+    origin,
+    addSearchParams(pathname, reqOptions?.searchParams || `${searchParams}`),
+  ];
 };
 
 const buildRelativePath = (rootPath, url, reqOptions) =>
@@ -235,7 +238,7 @@ const buildRelativePath = (rootPath, url, reqOptions) =>
   );
 
 const addSearchParams = (path, searchParams) =>
-  searchParams != null ? `${path}?${searchParams}` : path;
+  searchParams?.size || searchParams?.length ? `${path}?${searchParams}` : path;
 
 const addCache = (store) =>
   store ? [interceptors.cache({ store, methods: ['GET'] })] : [];