@scalar/api-client 2.12.0 → 2.14.0

package/dist/views/Request/libs/oauth2.js

@@ -1,100 +1,113 @@
-import { shouldUseProxy as S } from "@scalar/oas-utils/helpers";
-import { fromUint8Array as P, encode as k } from "js-base64";
-const w = () => {
+import { makeUrlAbsolute as x } from "@scalar/helpers/url/make-url-absolute";
+import { shouldUseProxy as U } from "@scalar/oas-utils/helpers";
+import { fromUint8Array as S, encode as w } from "js-base64";
+const A = () => {
   const e = new Uint8Array(32);
-  return crypto.getRandomValues(e), P(e, !0);
-}, U = async (e, l) => {
-  if (l === "plain")
+  return crypto.getRandomValues(e), S(e, !0);
+}, b = async (e, c) => {
+  if (c === "plain")
     return e;
   if (typeof crypto?.subtle?.digest != "function")
     return console.warn("SHA-256 is only supported when using https, using a plain text code challenge instead."), e;
-  const n = new TextEncoder().encode(e), c = await crypto.subtle.digest("SHA-256", n);
-  return P(new Uint8Array(c), !0);
-}, b = async (e, l, u) => {
+  const n = new TextEncoder().encode(e), o = await crypto.subtle.digest("SHA-256", n);
+  return S(new Uint8Array(o), !0);
+}, T = async (e, c, u) => {
   try {
     if (!e)
       return [new Error("Flow not found"), null];
     const n = e.selectedScopes.join(" ");
     if (e.type === "clientCredentials" || e.type === "password")
-      return x(e, n, {
-        proxyUrl: u
-      });
-    const c = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
-    let m = null;
+      return k(
+        e,
+        n,
+        {
+          proxyUrl: u
+        },
+        c
+      );
+    const o = (Math.random() + 1).toString(36).substring(2, 10), _ = x(e.authorizationUrl, {
+      baseUrl: c?.url
+    }), t = new URL(_);
+    let y = null;
     if (e.type === "implicit")
       t.searchParams.set("response_type", "token");
     else if (e.type === "authorizationCode" && (t.searchParams.set("response_type", "code"), e["x-usePkce"] !== "no")) {
-      const r = w(), s = await U(r, e["x-usePkce"]);
-      m = {
+      const r = A(), a = await b(r, e["x-usePkce"]);
+      y = {
         codeVerifier: r,
-        codeChallenge: s,
+        codeChallenge: a,
         codeChallengeMethod: e["x-usePkce"] === "SHA-256" ? "S256" : "plain"
-      }, t.searchParams.set("code_challenge", s), t.searchParams.set("code_challenge_method", m.codeChallengeMethod);
+      }, t.searchParams.set("code_challenge", a), t.searchParams.set("code_challenge_method", y.codeChallengeMethod);
     }
     if (e["x-scalar-redirect-uri"].startsWith("/")) {
-      const r = l.url || window.location.origin + window.location.pathname, s = new URL(e["x-scalar-redirect-uri"], r).toString();
-      t.searchParams.set("redirect_uri", s);
+      const r = c?.url || window.location.origin + window.location.pathname, a = x(e["x-scalar-redirect-uri"], { baseUrl: r });
+      t.searchParams.set("redirect_uri", a);
     } else
       t.searchParams.set("redirect_uri", e["x-scalar-redirect-uri"]);
     e["x-scalar-security-query"] && Object.keys(e["x-scalar-security-query"]).forEach((r) => {
-      const s = e["x-scalar-security-query"]?.[r];
-      s && t.searchParams.set(r, s);
-    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", c), n && t.searchParams.set("scope", n);
-    const a = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
-    return a ? new Promise((r) => {
-      const s = setInterval(() => {
-        let o = null, d = null, h = null, y = null;
+      const a = e["x-scalar-security-query"]?.[r];
+      a && t.searchParams.set(r, a);
+    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", o), n && t.searchParams.set("scope", n);
+    const s = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
+    return s ? new Promise((r) => {
+      const a = setInterval(() => {
+        let h = null, l = null, d = null, m = null;
         try {
-          const i = new URL(a.location.href).searchParams, _ = e["x-tokenName"] || "access_token";
-          o = i.get(_), d = i.get("code"), h = i.get("error"), y = i.get("error_description");
-          const g = new URLSearchParams(a.location.href.split("#")[1]);
-          o ||= g.get(_), d ||= g.get("code"), h ||= g.get("error"), y ||= g.get("error_description");
+          const i = new URL(s.location.href).searchParams, P = e["x-tokenName"] || "access_token";
+          h = i.get(P), l = i.get("code"), d = i.get("error"), m = i.get("error_description");
+          const g = new URLSearchParams(s.location.href.split("#")[1]);
+          h ||= g.get(P), l ||= g.get("code"), d ||= g.get("error"), m ||= g.get("error_description");
         } catch {
         }
-        if (a.closed || o || d || h)
-          if (clearInterval(s), a.close(), h)
-            r([new Error(`OAuth error: ${h}${y ? ` (${y})` : ""}`), null]);
-          else if (o) {
-            const i = a.location.href.match(/state=([^&]*)/)?.[1];
-            r(i === c ? [null, o] : [new Error("State mismatch"), null]);
-          } else d ? new URL(a.location.href).searchParams.get("state") === c ? x(e, n, {
-            code: d,
-            pkce: m,
-            proxyUrl: u
-          }).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(s), r([new Error("Window was closed without granting authorization"), null]));
+        if (s.closed || h || l || d)
+          if (clearInterval(a), s.close(), d)
+            r([new Error(`OAuth error: ${d}${m ? ` (${m})` : ""}`), null]);
+          else if (h) {
+            const i = s.location.href.match(/state=([^&]*)/)?.[1];
+            r(i === o ? [null, h] : [new Error("State mismatch"), null]);
+          } else l ? new URL(s.location.href).searchParams.get("state") === o ? k(
+            e,
+            n,
+            {
+              code: l,
+              pkce: y,
+              proxyUrl: u
+            },
+            c
+          ).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(a), r([new Error("Window was closed without granting authorization"), null]));
       }, 200);
     }) : [new Error("Failed to open auth window"), null];
   } catch {
     return [new Error("Failed to authorize oauth2 flow"), null];
   }
-}, x = async (e, l, {
+}, k = async (e, c, {
   code: u,
   pkce: n,
-  proxyUrl: c
-} = {}) => {
+  proxyUrl: o
+} = {}, _) => {
   if (!e)
     return [new Error("OAuth2 flow was not defined"), null];
   const t = new URLSearchParams();
-  t.set("client_id", e["x-scalar-client-id"]), l && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", l), e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "body") && t.set("client_secret", e.clientSecret), "x-scalar-redirect-uri" in e && e["x-scalar-redirect-uri"] && t.set("redirect_uri", e["x-scalar-redirect-uri"]), u ? (t.set("code", u), t.set("grant_type", "authorization_code"), n && t.set("code_verifier", n.codeVerifier)) : e.type === "password" ? (t.set("grant_type", "password"), t.set("username", e.username), t.set("password", e.password)) : t.set("grant_type", "client_credentials"), e["x-scalar-security-body"] && Object.entries(e["x-scalar-security-body"]).forEach(([p, a]) => {
-    a && t.set(p, a);
+  t.set("client_id", e["x-scalar-client-id"]), c && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", c), e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "body") && t.set("client_secret", e.clientSecret), "x-scalar-redirect-uri" in e && e["x-scalar-redirect-uri"] && t.set("redirect_uri", e["x-scalar-redirect-uri"]), u ? (t.set("code", u), t.set("grant_type", "authorization_code"), n && t.set("code_verifier", n.codeVerifier)) : e.type === "password" ? (t.set("grant_type", "password"), t.set("username", e.username), t.set("password", e.password)) : t.set("grant_type", "client_credentials"), e["x-scalar-security-body"] && Object.entries(e["x-scalar-security-body"]).forEach(([p, s]) => {
+    s && t.set(p, s);
   });
   try {
     const p = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "header") && (p.Authorization = `Basic ${k(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
-    const r = S(c, e.tokenUrl) ? `${c}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, o = await (await fetch(r, {
+    e.clientSecret && (!e["x-scalar-credentials-location"] || e["x-scalar-credentials-location"] === "header") && (p.Authorization = `Basic ${w(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
+    const r = x(e.tokenUrl, { baseUrl: _?.url }), a = U(o, r) ? `${o}?${new URLSearchParams([["scalar_url", r]]).toString()}` : r, l = await (await fetch(a, {
       method: "POST",
       headers: p,
       body: t
     })).json(), d = e["x-tokenName"] || "access_token";
-    return [null, o[d]];
+    return [null, l[d]];
   } catch {
     return [new Error("Failed to get an access token. Please check your credentials."), null];
   }
 };
 export {
-  b as authorizeOauth2,
-  x as authorizeServers,
-  U as generateCodeChallenge
+  T as authorizeOauth2,
+  k as authorizeServers,
+  b as generateCodeChallenge
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.12.0",
+  "version": "2.14.0",
   "engines": {
     "node": ">=20"
   },
@@ -141,6 +141,121 @@
       "types": "./dist/types/index.d.ts",
       "default": "./dist/types/index.js"
     },
+    "./v2/blocks/operation-block": {
+      "import": "./dist/v2/blocks/operation-block/index.js",
+      "types": "./dist/v2/blocks/operation-block/index.d.ts",
+      "default": "./dist/v2/blocks/operation-block/index.js"
+    },
+    "./v2/blocks/operation-code-sample": {
+      "import": "./dist/v2/blocks/operation-code-sample/index.js",
+      "types": "./dist/v2/blocks/operation-code-sample/index.d.ts",
+      "default": "./dist/v2/blocks/operation-code-sample/index.js"
+    },
+    "./v2/blocks/request-block": {
+      "import": "./dist/v2/blocks/request-block/index.js",
+      "types": "./dist/v2/blocks/request-block/index.d.ts",
+      "default": "./dist/v2/blocks/request-block/index.js"
+    },
+    "./v2/blocks/response-block": {
+      "import": "./dist/v2/blocks/response-block/index.js",
+      "types": "./dist/v2/blocks/response-block/index.d.ts",
+      "default": "./dist/v2/blocks/response-block/index.js"
+    },
+    "./v2/blocks/scalar-address-bar-block": {
+      "import": "./dist/v2/blocks/scalar-address-bar-block/index.js",
+      "types": "./dist/v2/blocks/scalar-address-bar-block/index.d.ts",
+      "default": "./dist/v2/blocks/scalar-address-bar-block/index.js"
+    },
+    "./v2/blocks/scalar-auth-selector-block": {
+      "import": "./dist/v2/blocks/scalar-auth-selector-block/index.js",
+      "types": "./dist/v2/blocks/scalar-auth-selector-block/index.d.ts",
+      "default": "./dist/v2/blocks/scalar-auth-selector-block/index.js"
+    },
+    "./v2/components/code-input": {
+      "import": "./dist/v2/components/code-input/index.js",
+      "types": "./dist/v2/components/code-input/index.d.ts",
+      "default": "./dist/v2/components/code-input/index.js"
+    },
+    "./v2/components/data-table": {
+      "import": "./dist/v2/components/data-table/index.js",
+      "types": "./dist/v2/components/data-table/index.d.ts",
+      "default": "./dist/v2/components/data-table/index.js"
+    },
+    "./v2/components/forms": {
+      "import": "./dist/v2/components/forms/index.js",
+      "types": "./dist/v2/components/forms/index.d.ts",
+      "default": "./dist/v2/components/forms/index.js"
+    },
+    "./v2/components/layout": {
+      "import": "./dist/v2/components/layout/index.js",
+      "types": "./dist/v2/components/layout/index.d.ts",
+      "default": "./dist/v2/components/layout/index.js"
+    },
+    "./v2/components/modals": {
+      "import": "./dist/v2/components/modals/index.js",
+      "types": "./dist/v2/components/modals/index.d.ts",
+      "default": "./dist/v2/components/modals/index.js"
+    },
+    "./v2/components/resize": {
+      "import": "./dist/v2/components/resize/index.js",
+      "types": "./dist/v2/components/resize/index.d.ts",
+      "default": "./dist/v2/components/resize/index.js"
+    },
+    "./v2/components/server": {
+      "import": "./dist/v2/components/server/index.js",
+      "types": "./dist/v2/components/server/index.d.ts",
+      "default": "./dist/v2/components/server/index.js"
+    },
+    "./v2/components/sidebar": {
+      "import": "./dist/v2/components/sidebar/index.js",
+      "types": "./dist/v2/components/sidebar/index.d.ts",
+      "default": "./dist/v2/components/sidebar/index.js"
+    },
+    "./v2/features/app": {
+      "import": "./dist/v2/features/app/index.js",
+      "types": "./dist/v2/features/app/index.d.ts",
+      "default": "./dist/v2/features/app/index.js"
+    },
+    "./v2/features/app/components": {
+      "import": "./dist/v2/features/app/components/index.js",
+      "types": "./dist/v2/features/app/components/index.d.ts",
+      "default": "./dist/v2/features/app/components/index.js"
+    },
+    "./v2/features/command-palette/components": {
+      "import": "./dist/v2/features/command-palette/components/index.js",
+      "types": "./dist/v2/features/command-palette/components/index.d.ts",
+      "default": "./dist/v2/features/command-palette/components/index.js"
+    },
+    "./v2/features/environments": {
+      "import": "./dist/v2/features/environments/index.js",
+      "types": "./dist/v2/features/environments/index.d.ts",
+      "default": "./dist/v2/features/environments/index.js"
+    },
+    "./v2/features/global-cookies": {
+      "import": "./dist/v2/features/global-cookies/index.js",
+      "types": "./dist/v2/features/global-cookies/index.d.ts",
+      "default": "./dist/v2/features/global-cookies/index.js"
+    },
+    "./v2/features/modal": {
+      "import": "./dist/v2/features/modal/index.js",
+      "types": "./dist/v2/features/modal/index.d.ts",
+      "default": "./dist/v2/features/modal/index.js"
+    },
+    "./v2/features/operation": {
+      "import": "./dist/v2/features/operation/index.js",
+      "types": "./dist/v2/features/operation/index.d.ts",
+      "default": "./dist/v2/features/operation/index.js"
+    },
+    "./v2/features/search": {
+      "import": "./dist/v2/features/search/index.js",
+      "types": "./dist/v2/features/search/index.d.ts",
+      "default": "./dist/v2/features/search/index.js"
+    },
+    "./v2/features/settings": {
+      "import": "./dist/v2/features/settings/index.js",
+      "types": "./dist/v2/features/settings/index.d.ts",
+      "default": "./dist/v2/features/settings/index.js"
+    },
     "./views/Components/CodeSnippet": {
       "import": "./dist/views/Components/CodeSnippet/index.js",
       "types": "./dist/views/Components/CodeSnippet/index.d.ts",
@@ -180,31 +295,6 @@
       "import": "./dist/views/Request/types/index.js",
       "types": "./dist/views/Request/types/index.d.ts",
       "default": "./dist/views/Request/types/index.js"
-    },
-    "./v2/blocks/operation-code-sample": {
-      "import": "./dist/v2/blocks/operation-code-sample/index.js",
-      "types": "./dist/v2/blocks/operation-code-sample/index.d.ts",
-      "default": "./dist/v2/blocks/operation-code-sample/index.js"
-    },
-    "./v2/blocks/scalar-address-bar-block": {
-      "import": "./dist/v2/blocks/scalar-address-bar-block/index.js",
-      "types": "./dist/v2/blocks/scalar-address-bar-block/index.d.ts",
-      "default": "./dist/v2/blocks/scalar-address-bar-block/index.js"
-    },
-    "./v2/blocks/scalar-auth-selector-block": {
-      "import": "./dist/v2/blocks/scalar-auth-selector-block/index.js",
-      "types": "./dist/v2/blocks/scalar-auth-selector-block/index.d.ts",
-      "default": "./dist/v2/blocks/scalar-auth-selector-block/index.js"
-    },
-    "./v2/blocks/operation-block": {
-      "import": "./dist/v2/blocks/operation-block/index.js",
-      "types": "./dist/v2/blocks/operation-block/index.d.ts",
-      "default": "./dist/v2/blocks/operation-block/index.js"
-    },
-    "./v2/blocks/response-block": {
-      "import": "./dist/v2/blocks/response-block/index.js",
-      "types": "./dist/v2/blocks/response-block/index.d.ts",
-      "default": "./dist/v2/blocks/response-block/index.js"
     }
   },
   "files": [
@@ -233,24 +323,24 @@
     "zod": "4.1.11",
     "@scalar/analytics-client": "1.0.0",
     "@scalar/draggable": "0.3.0",
-    "@scalar/components": "0.16.4",
-    "@scalar/import": "0.4.35",
+    "@scalar/helpers": "0.2.0",
+    "@scalar/components": "0.16.6",
     "@scalar/icons": "0.5.0",
-    "@scalar/oas-utils": "0.6.4",
-    "@scalar/helpers": "0.1.2",
-    "@scalar/json-magic": "0.8.2",
-    "@scalar/object-utils": "1.2.12",
-    "@scalar/openapi-parser": "0.23.3",
-    "@scalar/openapi-types": "0.5.1",
-    "@scalar/postman-to-openapi": "0.3.45",
-    "@scalar/sidebar": "0.4.0",
-    "@scalar/themes": "0.13.24",
-    "@scalar/snippetz": "0.5.3",
-    "@scalar/types": "0.5.0",
-    "@scalar/use-codemirror": "0.12.48",
-    "@scalar/use-hooks": "0.3.0",
-    "@scalar/use-toasts": "0.9.0",
-    "@scalar/workspace-store": "0.21.0"
+    "@scalar/import": "0.4.37",
+    "@scalar/json-magic": "0.8.4",
+    "@scalar/object-utils": "1.2.14",
+    "@scalar/openapi-types": "0.5.2",
+    "@scalar/oas-utils": "0.6.6",
+    "@scalar/openapi-parser": "0.23.5",
+    "@scalar/postman-to-openapi": "0.3.47",
+    "@scalar/sidebar": "0.5.1",
+    "@scalar/snippetz": "0.5.4",
+    "@scalar/types": "0.5.1",
+    "@scalar/themes": "0.13.25",
+    "@scalar/use-hooks": "0.3.2",
+    "@scalar/use-toasts": "0.9.1",
+    "@scalar/workspace-store": "0.22.1",
+    "@scalar/use-codemirror": "0.13.0"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.7",
@@ -266,7 +356,7 @@
     "vite-svg-loader": "5.1.0",
     "vitest": "3.2.4",
     "@scalar/galaxy": "0.5.12",
-    "@scalar/build-tooling": "0.3.0"
+    "@scalar/build-tooling": "0.3.1"
   },
   "scripts": {
     "build": "scalar-build-vite",