@scalar/api-client 2.3.32 → 2.3.34

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

@@ -1,91 +1,97 @@
-import { shouldUseProxy as y } from "@scalar/oas-utils/helpers";
-const w = () => {
+import { shouldUseProxy as w } from "@scalar/oas-utils/helpers";
+const S = () => {
   const e = new Uint8Array(32);
   return crypto.getRandomValues(e), btoa(String.fromCharCode(...e)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-}, P = async (e, i) => {
-  if (i === "plain")
+}, x = async (e, l) => {
+  if (l === "plain")
     return e;
-  const a = new TextEncoder().encode(e), s = await crypto.subtle.digest("SHA-256", a);
-  return btoa(String.fromCharCode(...new Uint8Array(s))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}, C = async (e, i, o) => {
+  const a = new TextEncoder().encode(e), c = await crypto.subtle.digest("SHA-256", a);
+  return btoa(String.fromCharCode(...new Uint8Array(c))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}, k = async (e, l, d) => {
   try {
     if (!e)
       return [new Error("Flow not found"), null];
     const a = e.selectedScopes.join(" ");
     if (e.type === "clientCredentials" || e.type === "password")
-      return _(e, a, {
-        proxyUrl: o
+      return P(e, a, {
+        proxyUrl: d
       });
-    const s = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
-    let l = null;
+    const c = (Math.random() + 1).toString(36).substring(2, 10), t = new URL(e.authorizationUrl);
+    let u = 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(), c = await P(r, e["x-usePkce"]);
-      l = {
+      const r = S(), n = await x(r, e["x-usePkce"]);
+      u = {
         codeVerifier: r,
-        codeChallenge: c,
+        codeChallenge: n,
         codeChallengeMethod: e["x-usePkce"] === "SHA-256" ? "S256" : "plain"
-      }, t.searchParams.set("code_challenge", c), t.searchParams.set("code_challenge_method", l.codeChallengeMethod);
+      }, t.searchParams.set("code_challenge", n), t.searchParams.set("code_challenge_method", u.codeChallengeMethod);
     }
     if (e["x-scalar-redirect-uri"].startsWith("/")) {
-      const r = i.url || window.location.origin + window.location.pathname, c = new URL(e["x-scalar-redirect-uri"], r).toString();
-      t.searchParams.set("redirect_uri", c);
+      const r = l.url || window.location.origin + window.location.pathname, n = new URL(e["x-scalar-redirect-uri"], r).toString();
+      t.searchParams.set("redirect_uri", n);
     } else
       t.searchParams.set("redirect_uri", e["x-scalar-redirect-uri"]);
-    t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", s), a && t.searchParams.set("scope", a);
-    const n = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
-    return n ? new Promise((r) => {
-      const c = setInterval(() => {
-        var m;
-        let u = null, h = null;
+    e["x-scalar-security-query"] && Object.keys(e["x-scalar-security-query"]).forEach((r) => {
+      var i;
+      const n = (i = e["x-scalar-security-query"]) == null ? void 0 : i[r];
+      n && t.searchParams.set(r, n);
+    }), t.searchParams.set("client_id", e["x-scalar-client-id"]), t.searchParams.set("state", c), a && t.searchParams.set("scope", a);
+    const s = window.open(t, "openAuth2Window", "left=100,top=100,width=800,height=600");
+    return s ? new Promise((r) => {
+      const n = setInterval(() => {
+        var _;
+        let i = null, h = null, p = null, g = null;
         try {
-          const d = new URL(n.location.href).searchParams;
-          u = d.get("access_token"), h = d.get("code");
-          const g = new URLSearchParams(n.location.href.split("#")[1]);
-          u || (u = g.get("access_token")), h || (h = g.get("code"));
+          const o = new URL(s.location.href).searchParams;
+          i = o.get("access_token"), h = o.get("code"), p = o.get("error"), g = o.get("error_description");
+          const m = new URLSearchParams(s.location.href.split("#")[1]);
+          i || (i = m.get("access_token")), h || (h = m.get("code")), p || (p = m.get("error")), g || (g = m.get("error_description"));
         } catch {
         }
-        if (n.closed || u || h)
-          if (clearInterval(c), n.close(), u) {
-            const d = (m = n.location.href.match(/state=([^&]*)/)) == null ? void 0 : m[1];
-            r(d === s ? [null, u] : [new Error("State mismatch"), null]);
-          } else h ? new URL(n.location.href).searchParams.get("state") === s ? _(e, a, {
+        if (s.closed || i || h || p)
+          if (clearInterval(n), s.close(), p)
+            r([new Error(`OAuth error: ${p}${g ? ` (${g})` : ""}`), null]);
+          else if (i) {
+            const o = (_ = s.location.href.match(/state=([^&]*)/)) == null ? void 0 : _[1];
+            r(o === c ? [null, i] : [new Error("State mismatch"), null]);
+          } else h ? new URL(s.location.href).searchParams.get("state") === c ? P(e, a, {
             code: h,
-            pkce: l,
-            proxyUrl: o
-          }).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(c), r([new Error("Window was closed without granting authorization"), null]));
+            pkce: u,
+            proxyUrl: d
+          }).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(n), 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];
   }
-}, _ = async (e, i, {
-  code: o,
+}, P = async (e, l, {
+  code: d,
   pkce: a,
-  proxyUrl: s
+  proxyUrl: c
 } = {}) => {
   if (!e)
     return [new Error("OAuth2 flow was not defined"), null];
   const t = new URLSearchParams();
-  t.set("client_id", e["x-scalar-client-id"]), i && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", i), e.clientSecret && 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"]), o ? (t.set("code", o), t.set("grant_type", "authorization_code"), a && t.set("code_verifier", a.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");
+  t.set("client_id", e["x-scalar-client-id"]), l && (e.type === "clientCredentials" || e.type === "password") && t.set("scope", l), e.clientSecret && 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"]), d ? (t.set("code", d), t.set("grant_type", "authorization_code"), a && t.set("code_verifier", a.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");
   try {
-    const l = {
+    const u = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    e.clientSecret && (l.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
-    const p = y(s, e.tokenUrl) ? `${s}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, n = await fetch(p, {
+    e.clientSecret && (u.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`);
+    const y = w(c, e.tokenUrl) ? `${c}?${new URLSearchParams([["scalar_url", e.tokenUrl]]).toString()}` : e.tokenUrl, s = await fetch(y, {
       method: "POST",
-      headers: l,
+      headers: u,
       body: t
-    }), { access_token: r } = await n.json();
+    }), { access_token: r } = await s.json();
     return [null, r];
   } catch {
     return [new Error("Failed to get an access token. Please check your credentials."), null];
   }
 };
 export {
-  C as authorizeOauth2,
-  _ as authorizeServers,
-  P as generateCodeChallenge
+  k as authorizeOauth2,
+  P as authorizeServers,
+  x as generateCodeChallenge
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.3.32",
+  "version": "2.3.34",
   "engines": {
     "node": ">=18"
   },
@@ -199,20 +199,20 @@
     "whatwg-mimetype": "^4.0.0",
     "yaml": "^2.4.5",
     "zod": "3.24.1",
-    "@scalar/components": "0.13.57",
-    "@scalar/icons": "0.3.5",
+    "@scalar/components": "0.13.59",
     "@scalar/draggable": "0.1.11",
-    "@scalar/import": "0.3.25",
-    "@scalar/oas-utils": "0.2.142",
-    "@scalar/object-utils": "1.1.14",
+    "@scalar/icons": "0.3.7",
+    "@scalar/import": "0.3.27",
+    "@scalar/oas-utils": "0.2.144",
     "@scalar/openapi-parser": "0.10.17",
-    "@scalar/openapi-types": "0.2.2",
-    "@scalar/postman-to-openapi": "0.2.15",
+    "@scalar/object-utils": "1.1.14",
+    "@scalar/postman-to-openapi": "0.2.17",
+    "@scalar/openapi-types": "0.2.3",
     "@scalar/snippetz": "0.2.20",
-    "@scalar/themes": "0.11.1",
-    "@scalar/types": "0.1.14",
-    "@scalar/use-codemirror": "0.11.102",
-    "@scalar/use-hooks": "0.1.48",
+    "@scalar/types": "0.1.16",
+    "@scalar/use-codemirror": "0.11.104",
+    "@scalar/themes": "0.11.3",
+    "@scalar/use-hooks": "0.1.50",
     "@scalar/use-tooltip": "1.0.7",
     "@scalar/use-toasts": "0.7.10"
   },
@@ -229,8 +229,8 @@
     "vite": "5.4.19",
     "vite-svg-loader": "^5.1.0",
     "vitest": "^1.6.0",
-    "@scalar/build-tooling": "0.1.19",
-    "@scalar/galaxy": "0.3.2"
+    "@scalar/galaxy": "0.3.2",
+    "@scalar/build-tooling": "0.1.19"
   },
   "scripts": {
     "build": "scalar-build-vite",