@beinformed/ui 1.23.5 → 1.23.6

package/CHANGELOG.md

@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.23.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.2...v1.23.5) (2025-07-04)
+### [1.23.6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.2...v1.23.6) (2025-08-21)
 
 ### Bug Fixes
 
-- **server-request:** escape querystring ([ee24771](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ee24771680fb0037e856037843267777b8436886))
+- **server-request:** use URLSearchParam for proper encoding ([0ba1e1d](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/0ba1e1d62fab34bb44da16604c07c4b6c4e00c13))
 
 ### [1.23.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.1...v1.23.2) (2022-11-16)
 

package/esm/react-server/requestInformation.js

@@ -1,40 +1,34 @@
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _URLSearchParams from "@babel/runtime-corejs3/core-js-stable/url-search-params";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import Href from "../models/href/Href";
 
 /**
  */
 const encodeQueryString = queryString => {
-  if (!queryString) return "";
-  const params = [];
-  queryString.split("&").forEach(part => {
-    const [key, value] = part.split("=");
+  if (!queryString) return ""; // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
 
-    if (key && value) {
-      var _context;
+  const params = new _URLSearchParams(queryString); // Return the encoded query string
+  // toString() correctly re-encodes everything.
 
-      params.push(_concatInstanceProperty(_context = "".concat(encodeURIComponent(key), "=")).call(_context, encodeURIComponent(value)));
-    } else if (key) {
-      params.push(encodeURIComponent(key));
-    }
-  });
-  return params.join("&");
+  return params.toString();
 };
 /**
  */
 
 
 export const getFullRequestUrl = request => {
-  var _context2;
+  var _context;
 
   let pathInfo = request.getPathInfo() || "/";
   let queryString = request.getQueryString();
-  pathInfo = _mapInstanceProperty(_context2 = pathInfo.split("/")).call(_context2, segment => encodeURIComponent(segment)).join("/");
+  pathInfo = _mapInstanceProperty(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
 
   if (queryString) {
-    var _context3;
+    var _context2;
 
-    return _concatInstanceProperty(_context3 = "".concat(pathInfo, "?")).call(_context3, encodeQueryString(queryString));
+    return _concatInstanceProperty(_context2 = "".concat(pathInfo, "?")).call(_context2, encodeQueryString(queryString));
   }
 
   return pathInfo;

package/esm/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["Href","encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","segment","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  const params = [];\n  queryString.split(\"&\").forEach((part) => {\n    const [key, value] = part.split(\"=\");\n    if (key && value) {\n      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n    } else if (key) {\n      params.push(encodeURIComponent(key));\n    }\n  });\n  return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;AACA,OAAOA,IAAP,MAAiB,qBAAjB;;AAIA;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP;EAElB,MAAMC,MAAM,GAAG,EAAf;EACAD,WAAW,CAACE,KAAZ,CAAkB,GAAlB,EAAuBC,OAAvB,CAAgCC,IAAD,IAAU;IACvC,MAAM,CAACC,GAAD,EAAMC,KAAN,IAAeF,IAAI,CAACF,KAAL,CAAW,GAAX,CAArB;;IACA,IAAIG,GAAG,IAAIC,KAAX,EAAkB;MAAA;;MAChBL,MAAM,CAACM,IAAP,8CAAeC,kBAAkB,CAACH,GAAD,CAAjC,uBAA0CG,kBAAkB,CAACF,KAAD,CAA5D;IACD,CAFD,MAEO,IAAID,GAAJ,EAAS;MACdJ,MAAM,CAACM,IAAP,CAAYC,kBAAkB,CAACH,GAAD,CAA9B;IACD;EACF,CAPD;EAQA,OAAOJ,MAAM,CAACQ,IAAP,CAAY,GAAZ,CAAP;AACD,CAbD;AAeA;AACA;;;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIb,WAAW,GAAGW,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,iCAAAA,QAAQ,CAChBV,KADQ,CACF,GADE,mBAEHa,OAAD,IAAaP,kBAAkB,CAACO,OAAD,CAF3B,EAGRN,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIT,WAAJ,EAAiB;IAAA;;IACf,qDAAUY,QAAV,wBAAsBb,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOY,QAAP;AACD,CAdM;AAgBP;AACA;;AACA,OAAO,MAAMI,kBAAkB,GAAIL,OAAD,IAChC,IAAIb,IAAJ,CAASY,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;AACA,OAAO,MAAMM,oBAAoB,GAAG,CAClCN,OADkC,EAElCO,UAFkC,KAGhB;EAClB,OAAOP,OAAO,CAACQ,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;AACA,OAAO,MAAME,kBAAkB,GAAG,CAChCT,OADgC,EAEhCU,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACN,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMY,oBAAoB,GACxBD,kBAAkB,IAAIX,OAAO,CAACa,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}
+{"version":3,"file":"requestInformation.js","names":["Href","encodeQueryString","queryString","params","toString","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","split","segment","encodeURIComponent","join","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  // Create a URLSearchParams object from the existing query string\n  // It handles all the splitting, decoding, and special characters automatically.\n  const params = new URLSearchParams(queryString);\n\n  // Return the encoded query string\n  // toString() correctly re-encodes everything.\n  return params.toString();\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;AACA,OAAOA,IAAP,MAAiB,qBAAjB;;AAIA;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP,CAD+B,CAGjD;EACA;;EACA,MAAMC,MAAM,GAAG,qBAAoBD,WAApB,CAAf,CALiD,CAOjD;EACA;;EACA,OAAOC,MAAM,CAACC,QAAP,EAAP;AACD,CAVD;AAYA;AACA;;;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIN,WAAW,GAAGI,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,gCAAAA,QAAQ,CAChBG,KADQ,CACF,GADE,kBAEHC,OAAD,IAAaC,kBAAkB,CAACD,OAAD,CAF3B,EAGRE,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIX,WAAJ,EAAiB;IAAA;;IACf,qDAAUK,QAAV,wBAAsBN,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOK,QAAP;AACD,CAdM;AAgBP;AACA;;AACA,OAAO,MAAMO,kBAAkB,GAAIR,OAAD,IAChC,IAAIN,IAAJ,CAASK,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;AACA,OAAO,MAAMS,oBAAoB,GAAG,CAClCT,OADkC,EAElCU,UAFkC,KAGhB;EAClB,OAAOV,OAAO,CAACW,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;AACA,OAAO,MAAME,kBAAkB,GAAG,CAChCZ,OADgC,EAEhCa,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACT,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMe,oBAAoB,GACxBD,kBAAkB,IAAId,OAAO,CAACgB,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}

package/lib/react-server/__tests__/requestInformation.spec.js.flow

@@ -0,0 +1,266 @@
+import {
+  getFullRequestUrl,
+  getFullRequestHref,
+  getCookieFromRequest,
+  getPreferredLocale,
+} from "../requestInformation"; // Adjust path as needed
+
+// Mock the Href class
+const mockHref = jest.fn((url) => ({
+  url: url, // For easy inspection in tests
+  // You can add other Href methods here if they are used by your functions
+  toString: () => url,
+}));
+jest.mock("../../models/href/Href", () => {
+  return jest.fn().mockImplementation((url) => {
+    return new mockHref(url);
+  });
+});
+
+// Mock the Locales class
+const mockLocales = {
+  availableLocaleCodes: ["en-US", "es-ES", "fr-FR"],
+  getPreferredLocale: jest.fn((header) => {
+    if (header.includes("en")) return "en-US";
+    if (header.includes("es")) return "es-ES";
+    if (header.includes("fr")) return "fr-FR";
+    return mockLocales.availableLocaleCodes[0]; // Default if no match
+  }),
+};
+jest.mock("../../i18n/Locales", () => {
+  return jest.fn().mockImplementation(() => {
+    return mockLocales;
+  });
+});
+
+// Helper function to create a mock HttpServletRequestJava object
+const createMockRequest = ({
+  pathInfo = null,
+  queryString = null,
+  cookies = [],
+  headers = {},
+} = {}) => ({
+  getPathInfo: jest.fn(() => pathInfo),
+  getQueryString: jest.fn(() => queryString),
+  getCookieByName: jest.fn((name) => {
+    const cookie = cookies.find((c) => c.name === name);
+    return cookie ? cookie.value : null;
+  }),
+  getHeader: jest.fn((name) => headers[name.toLowerCase()] || null),
+});
+
+describe("requestInformation", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Reset mock Href to its initial mock implementation
+    // This is important if you test multiple instantiations or interactions
+    // with the Href mock.
+    require("../../models/href/Href").mockClear();
+    require("../../models/href/Href").mockImplementation((url) => {
+      return new mockHref(url);
+    });
+  });
+
+  describe("getFullRequestUrl", () => {
+    it("should return the path info when no query string is present", () => {
+      const request = createMockRequest({
+        pathInfo: "/some/path",
+      });
+      expect(getFullRequestUrl(request)).toBe("/some/path");
+      expect(request.getPathInfo).toHaveBeenCalledTimes(1);
+      expect(request.getQueryString).toHaveBeenCalledTimes(1);
+    });
+
+    it("should return the path info with a leading slash if pathInfo is null", () => {
+      const request = createMockRequest({
+        pathInfo: null,
+      });
+      expect(getFullRequestUrl(request)).toBe("/");
+    });
+
+    it("should return the path info with a leading slash if pathInfo is an empty string", () => {
+      const request = createMockRequest({
+        pathInfo: "",
+      });
+      expect(getFullRequestUrl(request)).toBe("/");
+    });
+
+    it("should return the path info with an encoded query string", () => {
+      const request = createMockRequest({
+        pathInfo: "/search",
+        queryString: "q=hello world&filter=test",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/search?q=hello+world&filter=test"
+      );
+    });
+
+    it("should handle special characters in pathInfo by encoding them", () => {
+      const request = createMockRequest({
+        pathInfo: "/path with spaces/and<script>alert(1)</script>",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/path%20with%20spaces/and%3Cscript%3Ealert(1)%3C/script%3E"
+      );
+    });
+
+    it("should handle path info with multiple segments and special characters", () => {
+      const request = createMockRequest({
+        pathInfo: "/product/category/item with special chars & numbers/id-123",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/product/category/item%20with%20special%20chars%20%26%20numbers/id-123"
+      );
+    });
+
+    it("should correctly encode both path and query string with special characters", () => {
+      const request = createMockRequest({
+        pathInfo: "/api/data",
+        queryString: "name=John Doe & email=john@example.com",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/api/data?name=John+Doe+&+email=john%40example.com"
+      );
+    });
+
+    it("should handle an empty query string (not null) gracefully", () => {
+      const request = createMockRequest({
+        pathInfo: "/home",
+        queryString: "",
+      });
+      expect(getFullRequestUrl(request)).toBe("/home");
+    });
+  });
+
+  describe("getFullRequestHref", () => {
+    it("should return an Href instance with the full request URL", () => {
+      const request = createMockRequest({
+        pathInfo: "/products",
+        queryString: "id=123",
+      });
+      const hrefInstance = getFullRequestHref(request);
+
+      // Verify that Href constructor was called with the correct URL
+      expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
+      expect(require("../../models/href/Href")).toHaveBeenCalledWith(
+        "/products?id=123"
+      );
+
+      // Verify the returned object is an instance of the mock Href
+      expect(hrefInstance.url).toBe("/products?id=123");
+    });
+
+    it("should handle complex URLs and pass them to Href", () => {
+      const request = createMockRequest({
+        pathInfo: "/search/results",
+        queryString:
+          "q=javascript%20xss&param=value&multi=option%201%2Coption2,option3",
+      });
+      const hrefInstance = getFullRequestHref(request);
+      expect(require("../../models/href/Href")).toHaveBeenCalledWith(
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3"
+      );
+      expect(hrefInstance.url).toBe(
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3"
+      );
+    });
+  });
+
+  describe("getCookieFromRequest", () => {
+    it("should return the cookie value if found", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "session_id",
+            value: "abc123xyz",
+          },
+        ],
+      });
+      expect(getCookieFromRequest(request, "session_id")).toBe("abc123xyz");
+      expect(request.getCookieByName).toHaveBeenCalledWith("session_id");
+    });
+
+    it("should return null if the cookie is not found", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "other_cookie",
+            value: "value",
+          },
+        ],
+      });
+      expect(getCookieFromRequest(request, "non_existent_cookie")).toBeNull();
+      expect(request.getCookieByName).toHaveBeenCalledWith(
+        "non_existent_cookie"
+      );
+    });
+
+    it("should handle empty cookies array", () => {
+      const request = createMockRequest({
+        cookies: [],
+      });
+      expect(getCookieFromRequest(request, "any_cookie")).toBeNull();
+    });
+  });
+
+  describe("getPreferredLocale", () => {
+    it("should return locale from cookie if present", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "locale",
+            value: "es-ES",
+          },
+        ],
+        headers: {
+          "accept-language": "en-US,en;q=0.9",
+        },
+      });
+      const locales = mockLocales; // Using the mocked locales directly for convenience
+      expect(getPreferredLocale(request, locales)).toBe("es-ES");
+      expect(locales.getPreferredLocale).toHaveBeenCalledWith("es-ES"); // Because cookie took precedence
+    });
+
+    it("should return the first available locale code if no cookie and no Accept-Language header", () => {
+      const request = createMockRequest({}); // No cookies, no headers
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should handle null Accept-Language header correctly", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": null,
+        },
+      }); // Explicitly null header
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should handle empty string Accept-Language header correctly", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": "",
+        },
+      }); // Explicitly empty header
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should call getCookieFromRequest and getHeader", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": "de-DE",
+        },
+      });
+      const locales = mockLocales;
+      getPreferredLocale(request, locales);
+      expect(request.getCookieByName).toHaveBeenCalledWith("locale");
+      expect(request.getHeader).toHaveBeenCalledWith("Accept-Language");
+    });
+  });
+});

package/lib/react-server/requestInformation.js

@@ -7,45 +7,40 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPreferredLocale = exports.getFullRequestUrl = exports.getFullRequestHref = exports.getCookieFromRequest = void 0;
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url-search-params"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
 var _Href = _interopRequireDefault(require("../models/href/Href"));
 
 /**
  */
 const encodeQueryString = queryString => {
-  if (!queryString) return "";
-  const params = [];
-  queryString.split("&").forEach(part => {
-    const [key, value] = part.split("=");
-
-    if (key && value) {
-      var _context;
-
-      params.push((0, _concat.default)(_context = "".concat(encodeURIComponent(key), "=")).call(_context, encodeURIComponent(value)));
-    } else if (key) {
-      params.push(encodeURIComponent(key));
-    }
-  });
-  return params.join("&");
+  if (!queryString) return ""; // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+
+  const params = new _urlSearchParams.default(queryString); // Return the encoded query string
+  // toString() correctly re-encodes everything.
+
+  return params.toString();
 };
 /**
  */
 
 
 const getFullRequestUrl = request => {
-  var _context2;
+  var _context;
 
   let pathInfo = request.getPathInfo() || "/";
   let queryString = request.getQueryString();
-  pathInfo = (0, _map.default)(_context2 = pathInfo.split("/")).call(_context2, segment => encodeURIComponent(segment)).join("/");
+  pathInfo = (0, _map.default)(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
 
   if (queryString) {
-    var _context3;
+    var _context2;
 
-    return (0, _concat.default)(_context3 = "".concat(pathInfo, "?")).call(_context3, encodeQueryString(queryString));
+    return (0, _concat.default)(_context2 = "".concat(pathInfo, "?")).call(_context2, encodeQueryString(queryString));
   }
 
   return pathInfo;

package/lib/react-server/requestInformation.js.flow

@@ -8,16 +8,13 @@ import type Locales from "../i18n/Locales";
 const encodeQueryString = (queryString: string) => {
   if (!queryString) return "";
 
-  const params = [];
-  queryString.split("&").forEach((part) => {
-    const [key, value] = part.split("=");
-    if (key && value) {
-      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
-    } else if (key) {
-      params.push(encodeURIComponent(key));
-    }
-  });
-  return params.join("&");
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new URLSearchParams(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
 };
 
 /**

package/lib/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","segment","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  const params = [];\n  queryString.split(\"&\").forEach((part) => {\n    const [key, value] = part.split(\"=\");\n    if (key && value) {\n      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n    } else if (key) {\n      params.push(encodeURIComponent(key));\n    }\n  });\n  return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;;;;;;AACA;;AAIA;AACA;AACA,MAAMA,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP;EAElB,MAAMC,MAAM,GAAG,EAAf;EACAD,WAAW,CAACE,KAAZ,CAAkB,GAAlB,EAAuBC,OAAvB,CAAgCC,IAAD,IAAU;IACvC,MAAM,CAACC,GAAD,EAAMC,KAAN,IAAeF,IAAI,CAACF,KAAL,CAAW,GAAX,CAArB;;IACA,IAAIG,GAAG,IAAIC,KAAX,EAAkB;MAAA;;MAChBL,MAAM,CAACM,IAAP,2CAAeC,kBAAkB,CAACH,GAAD,CAAjC,uBAA0CG,kBAAkB,CAACF,KAAD,CAA5D;IACD,CAFD,MAEO,IAAID,GAAJ,EAAS;MACdJ,MAAM,CAACM,IAAP,CAAYC,kBAAkB,CAACH,GAAD,CAA9B;IACD;EACF,CAPD;EAQA,OAAOJ,MAAM,CAACQ,IAAP,CAAY,GAAZ,CAAP;AACD,CAbD;AAeA;AACA;;;AACO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIb,WAAW,GAAGW,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,8BAAAA,QAAQ,CAChBV,KADQ,CACF,GADE,mBAEHa,OAAD,IAAaP,kBAAkB,CAACO,OAAD,CAF3B,EAGRN,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIT,WAAJ,EAAiB;IAAA;;IACf,kDAAUY,QAAV,wBAAsBb,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOY,QAAP;AACD,CAdM;AAgBP;AACA;;;;;AACO,MAAMI,kBAAkB,GAAIL,OAAD,IAChC,IAAIM,aAAJ,CAASP,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;;;;AACO,MAAMO,oBAAoB,GAAG,CAClCP,OADkC,EAElCQ,UAFkC,KAGhB;EAClB,OAAOR,OAAO,CAACS,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;;;;AACO,MAAME,kBAAkB,GAAG,CAChCV,OADgC,EAEhCW,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACP,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMa,oBAAoB,GACxBD,kBAAkB,IAAIZ,OAAO,CAACc,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}
+{"version":3,"file":"requestInformation.js","names":["encodeQueryString","queryString","params","toString","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","split","segment","encodeURIComponent","join","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  // Create a URLSearchParams object from the existing query string\n  // It handles all the splitting, decoding, and special characters automatically.\n  const params = new URLSearchParams(queryString);\n\n  // Return the encoded query string\n  // toString() correctly re-encodes everything.\n  return params.toString();\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;;;;;;;;AACA;;AAIA;AACA;AACA,MAAMA,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP,CAD+B,CAGjD;EACA;;EACA,MAAMC,MAAM,GAAG,6BAAoBD,WAApB,CAAf,CALiD,CAOjD;EACA;;EACA,OAAOC,MAAM,CAACC,QAAP,EAAP;AACD,CAVD;AAYA;AACA;;;AACO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIN,WAAW,GAAGI,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,6BAAAA,QAAQ,CAChBG,KADQ,CACF,GADE,kBAEHC,OAAD,IAAaC,kBAAkB,CAACD,OAAD,CAF3B,EAGRE,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIX,WAAJ,EAAiB;IAAA;;IACf,kDAAUK,QAAV,wBAAsBN,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOK,QAAP;AACD,CAdM;AAgBP;AACA;;;;;AACO,MAAMO,kBAAkB,GAAIR,OAAD,IAChC,IAAIS,aAAJ,CAASV,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;;;;AACO,MAAMU,oBAAoB,GAAG,CAClCV,OADkC,EAElCW,UAFkC,KAGhB;EAClB,OAAOX,OAAO,CAACY,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;;;;AACO,MAAME,kBAAkB,GAAG,CAChCb,OADgC,EAEhCc,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACV,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMgB,oBAAoB,GACxBD,kBAAkB,IAAIf,OAAO,CAACiB,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -33,7 +33,7 @@
     "test:ci": "jest --ci",
     "test:changed": "jest --onlyChanged",
     "upgrade-interactive": "npm-check -u",
-    "release": "standard-version",
+    "release": "standard-version --release-as 1.23.6",
     "beta-release": "standard-version --prerelease beta",
     "prepublishOnly": "npm run build",
     "docs": "node ./.build/docs.js",

package/src/react-server/__tests__/requestInformation.spec.js

@@ -0,0 +1,266 @@
+import {
+  getFullRequestUrl,
+  getFullRequestHref,
+  getCookieFromRequest,
+  getPreferredLocale,
+} from "../requestInformation"; // Adjust path as needed
+
+// Mock the Href class
+const mockHref = jest.fn((url) => ({
+  url: url, // For easy inspection in tests
+  // You can add other Href methods here if they are used by your functions
+  toString: () => url,
+}));
+jest.mock("../../models/href/Href", () => {
+  return jest.fn().mockImplementation((url) => {
+    return new mockHref(url);
+  });
+});
+
+// Mock the Locales class
+const mockLocales = {
+  availableLocaleCodes: ["en-US", "es-ES", "fr-FR"],
+  getPreferredLocale: jest.fn((header) => {
+    if (header.includes("en")) return "en-US";
+    if (header.includes("es")) return "es-ES";
+    if (header.includes("fr")) return "fr-FR";
+    return mockLocales.availableLocaleCodes[0]; // Default if no match
+  }),
+};
+jest.mock("../../i18n/Locales", () => {
+  return jest.fn().mockImplementation(() => {
+    return mockLocales;
+  });
+});
+
+// Helper function to create a mock HttpServletRequestJava object
+const createMockRequest = ({
+  pathInfo = null,
+  queryString = null,
+  cookies = [],
+  headers = {},
+} = {}) => ({
+  getPathInfo: jest.fn(() => pathInfo),
+  getQueryString: jest.fn(() => queryString),
+  getCookieByName: jest.fn((name) => {
+    const cookie = cookies.find((c) => c.name === name);
+    return cookie ? cookie.value : null;
+  }),
+  getHeader: jest.fn((name) => headers[name.toLowerCase()] || null),
+});
+
+describe("requestInformation", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Reset mock Href to its initial mock implementation
+    // This is important if you test multiple instantiations or interactions
+    // with the Href mock.
+    require("../../models/href/Href").mockClear();
+    require("../../models/href/Href").mockImplementation((url) => {
+      return new mockHref(url);
+    });
+  });
+
+  describe("getFullRequestUrl", () => {
+    it("should return the path info when no query string is present", () => {
+      const request = createMockRequest({
+        pathInfo: "/some/path",
+      });
+      expect(getFullRequestUrl(request)).toBe("/some/path");
+      expect(request.getPathInfo).toHaveBeenCalledTimes(1);
+      expect(request.getQueryString).toHaveBeenCalledTimes(1);
+    });
+
+    it("should return the path info with a leading slash if pathInfo is null", () => {
+      const request = createMockRequest({
+        pathInfo: null,
+      });
+      expect(getFullRequestUrl(request)).toBe("/");
+    });
+
+    it("should return the path info with a leading slash if pathInfo is an empty string", () => {
+      const request = createMockRequest({
+        pathInfo: "",
+      });
+      expect(getFullRequestUrl(request)).toBe("/");
+    });
+
+    it("should return the path info with an encoded query string", () => {
+      const request = createMockRequest({
+        pathInfo: "/search",
+        queryString: "q=hello world&filter=test",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/search?q=hello+world&filter=test"
+      );
+    });
+
+    it("should handle special characters in pathInfo by encoding them", () => {
+      const request = createMockRequest({
+        pathInfo: "/path with spaces/and<script>alert(1)</script>",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/path%20with%20spaces/and%3Cscript%3Ealert(1)%3C/script%3E"
+      );
+    });
+
+    it("should handle path info with multiple segments and special characters", () => {
+      const request = createMockRequest({
+        pathInfo: "/product/category/item with special chars & numbers/id-123",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/product/category/item%20with%20special%20chars%20%26%20numbers/id-123"
+      );
+    });
+
+    it("should correctly encode both path and query string with special characters", () => {
+      const request = createMockRequest({
+        pathInfo: "/api/data",
+        queryString: "name=John Doe & email=john@example.com",
+      });
+      expect(getFullRequestUrl(request)).toBe(
+        "/api/data?name=John+Doe+&+email=john%40example.com"
+      );
+    });
+
+    it("should handle an empty query string (not null) gracefully", () => {
+      const request = createMockRequest({
+        pathInfo: "/home",
+        queryString: "",
+      });
+      expect(getFullRequestUrl(request)).toBe("/home");
+    });
+  });
+
+  describe("getFullRequestHref", () => {
+    it("should return an Href instance with the full request URL", () => {
+      const request = createMockRequest({
+        pathInfo: "/products",
+        queryString: "id=123",
+      });
+      const hrefInstance = getFullRequestHref(request);
+
+      // Verify that Href constructor was called with the correct URL
+      expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
+      expect(require("../../models/href/Href")).toHaveBeenCalledWith(
+        "/products?id=123"
+      );
+
+      // Verify the returned object is an instance of the mock Href
+      expect(hrefInstance.url).toBe("/products?id=123");
+    });
+
+    it("should handle complex URLs and pass them to Href", () => {
+      const request = createMockRequest({
+        pathInfo: "/search/results",
+        queryString:
+          "q=javascript%20xss&param=value&multi=option%201%2Coption2,option3",
+      });
+      const hrefInstance = getFullRequestHref(request);
+      expect(require("../../models/href/Href")).toHaveBeenCalledWith(
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3"
+      );
+      expect(hrefInstance.url).toBe(
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3"
+      );
+    });
+  });
+
+  describe("getCookieFromRequest", () => {
+    it("should return the cookie value if found", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "session_id",
+            value: "abc123xyz",
+          },
+        ],
+      });
+      expect(getCookieFromRequest(request, "session_id")).toBe("abc123xyz");
+      expect(request.getCookieByName).toHaveBeenCalledWith("session_id");
+    });
+
+    it("should return null if the cookie is not found", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "other_cookie",
+            value: "value",
+          },
+        ],
+      });
+      expect(getCookieFromRequest(request, "non_existent_cookie")).toBeNull();
+      expect(request.getCookieByName).toHaveBeenCalledWith(
+        "non_existent_cookie"
+      );
+    });
+
+    it("should handle empty cookies array", () => {
+      const request = createMockRequest({
+        cookies: [],
+      });
+      expect(getCookieFromRequest(request, "any_cookie")).toBeNull();
+    });
+  });
+
+  describe("getPreferredLocale", () => {
+    it("should return locale from cookie if present", () => {
+      const request = createMockRequest({
+        cookies: [
+          {
+            name: "locale",
+            value: "es-ES",
+          },
+        ],
+        headers: {
+          "accept-language": "en-US,en;q=0.9",
+        },
+      });
+      const locales = mockLocales; // Using the mocked locales directly for convenience
+      expect(getPreferredLocale(request, locales)).toBe("es-ES");
+      expect(locales.getPreferredLocale).toHaveBeenCalledWith("es-ES"); // Because cookie took precedence
+    });
+
+    it("should return the first available locale code if no cookie and no Accept-Language header", () => {
+      const request = createMockRequest({}); // No cookies, no headers
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should handle null Accept-Language header correctly", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": null,
+        },
+      }); // Explicitly null header
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should handle empty string Accept-Language header correctly", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": "",
+        },
+      }); // Explicitly empty header
+      const locales = mockLocales;
+      expect(getPreferredLocale(request, locales)).toBe("en-US");
+      expect(locales.getPreferredLocale).not.toHaveBeenCalled();
+    });
+
+    it("should call getCookieFromRequest and getHeader", () => {
+      const request = createMockRequest({
+        headers: {
+          "accept-language": "de-DE",
+        },
+      });
+      const locales = mockLocales;
+      getPreferredLocale(request, locales);
+      expect(request.getCookieByName).toHaveBeenCalledWith("locale");
+      expect(request.getHeader).toHaveBeenCalledWith("Accept-Language");
+    });
+  });
+});

package/src/react-server/requestInformation.js

@@ -8,16 +8,13 @@ import type Locales from "../i18n/Locales";
 const encodeQueryString = (queryString: string) => {
   if (!queryString) return "";
 
-  const params = [];
-  queryString.split("&").forEach((part) => {
-    const [key, value] = part.split("=");
-    if (key && value) {
-      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
-    } else if (key) {
-      params.push(encodeURIComponent(key));
-    }
-  });
-  return params.join("&");
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new URLSearchParams(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
 };
 
 /**