@keycloak/keycloak-admin-client 26.4.5 → 26.4.6

package/lib/resources/agent.js

@@ -1,6 +1,6 @@
-import urlJoin from "url-join";
 import { parseTemplate } from "url-template";
 import { fetchWithError, NetworkError, parseResponse, } from "../utils/fetchWithError.js";
+import { joinPath } from "../utils/joinPath.js";
 import { stringifyQueryParams } from "../utils/stringifyQueryParams.js";
 // constants
 const SLASH = "/";
@@ -85,11 +85,6 @@ export class Agent {
         };
     }
     async #requestWithParams({ method, path, payload, urlParams, queryParams, catchNotFound, payloadKey, returnResourceIdInLocationHeader, headers, }) {
-        const newPath = urlJoin(this.#basePath, path);
-        // Parse template and replace with values from urlParams
-        const pathTemplate = parseTemplate(newPath);
-        const parsedPath = pathTemplate.expand(urlParams);
-        const url = new URL(`${this.#getBaseUrl?.() ?? ""}${parsedPath}`);
         const requestOptions = { ...this.#client.getRequestOptions() };
         const requestHeaders = new Headers([
             ...new Headers(requestOptions.headers).entries(),
@@ -124,6 +119,9 @@ export class Agent {
         if (queryParams) {
             Object.assign(searchParams, queryParams);
         }
+        const url = new URL(this.#getBaseUrl());
+        const pathTemplate = parseTemplate(joinPath(this.#basePath, path));
+        url.pathname = joinPath(url.pathname, pathTemplate.expand(urlParams));
         url.search = stringifyQueryParams(searchParams);
         try {
             const res = await fetchWithError(url, {

package/lib/utils/auth.js

@@ -1,6 +1,8 @@
 import camelize from "camelize-ts";
+import { parseTemplate } from "url-template";
 import { defaultBaseUrl, defaultRealm } from "./constants.js";
 import { fetchWithError } from "./fetchWithError.js";
+import { joinPath } from "./joinPath.js";
 import { stringifyQueryParams } from "./stringifyQueryParams.js";
 // See: https://developer.mozilla.org/en-US/docs/Glossary/Base64
 const bytesToBase64 = (bytes) => btoa(Array.from(bytes, (byte) => String.fromCodePoint(byte)).join(""));
@@ -11,10 +13,11 @@ const encodeRFC3986URIComponent = (input) => encodeURIComponent(input).replace(/
 // Specifically, the section on encoding `application/x-www-form-urlencoded`.
 const encodeFormURIComponent = (data) => encodeRFC3986URIComponent(data).replaceAll("%20", "+");
 export const getToken = async (settings) => {
-    // Construct URL
-    const baseUrl = settings.baseUrl || defaultBaseUrl;
-    const realmName = settings.realmName || defaultRealm;
-    const url = `${baseUrl}/realms/${realmName}/protocol/openid-connect/token`;
+    const url = new URL(settings.baseUrl ?? defaultBaseUrl);
+    const pathTemplate = parseTemplate("/realms/{realmName}/protocol/openid-connect/token");
+    url.pathname = joinPath(url.pathname, pathTemplate.expand({
+        realmName: settings.realmName ?? defaultRealm,
+    }));
     // Prepare credentials for openid-connect token request
     // ref: http://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
     const credentials = settings.credentials || {};

package/lib/utils/joinPath.d.ts

@@ -0,0 +1 @@
+export declare function joinPath(...paths: string[]): string;

package/lib/utils/joinPath.js

@@ -0,0 +1,17 @@
+const PATH_SEPARATOR = "/";
+export function joinPath(...paths) {
+    const normalizedPaths = paths.map((path, index) => {
+        const isFirst = index === 0;
+        const isLast = index === paths.length - 1;
+        // Strip out any leading slashes from the path.
+        if (!isFirst && path.startsWith(PATH_SEPARATOR)) {
+            path = path.slice(1);
+        }
+        // Strip out any trailing slashes from the path.
+        if (!isLast && path.endsWith(PATH_SEPARATOR)) {
+            path = path.slice(0, -1);
+        }
+        return path;
+    }, []);
+    return normalizedPaths.join(PATH_SEPARATOR);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keycloak/keycloak-admin-client",
-  "version": "26.4.5",
+  "version": "26.4.6",
   "description": "A client to interact with Keycloak's Administration API",
   "type": "module",
   "main": "lib/index.js",
@@ -34,7 +34,6 @@
   },
   "dependencies": {
     "camelize-ts": "^3.0.0",
-    "url-join": "^5.0.0",
     "url-template": "^3.1.1"
   },
   "devDependencies": {