@scalar/api-client 2.5.17 → 2.5.19

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

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

package/dist/views/Settings/SettingsGeneral.vue.js

@@ -4,9 +4,9 @@ import { themeLabels as E } from "@scalar/themes";
 import V from "../../components/ImportCollection/IntegrationLogo.vue.js";
 import { useActiveEntities as W } from "../../store/active-entities.js";
 import F from "./components/SettingsAppearance.vue.js";
-import C from "./components/SettingsSection.vue.js";
+import w from "./components/SettingsSection.vue.js";
 import { useWorkspace as O } from "../../store/store.js";
-const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto ml-auto w-full max-w-[720px] px-5 py-5" }, q = { class: "flex flex-col gap-8" }, H = { class: "flex flex-col gap-2" }, M = { class: "flex flex-col gap-2" }, X = { class: "grid grid-cols-2 gap-2" }, Y = { class: "flex items-center gap-2" }, J = { class: "flex items-center gap-1" }, K = { class: "grid grid-cols-2 gap-2" }, Q = { class: "flex items-center gap-2" }, Z = { class: "flex items-center gap-1" }, I = { class: "size-7 rounded-xl" }, w = "https://proxy.scalar.com", ce = /* @__PURE__ */ P({
+const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto ml-auto w-full max-w-[720px] px-5 py-5" }, q = { class: "flex flex-col gap-8" }, H = { class: "flex flex-col gap-2" }, M = { class: "flex flex-col gap-2" }, X = { class: "grid grid-cols-2 gap-2" }, Y = { class: "flex items-center gap-2" }, J = { class: "flex items-center gap-1" }, K = { class: "grid grid-cols-2 gap-2" }, Q = { class: "flex items-center gap-2" }, Z = { class: "flex items-center gap-1" }, I = { class: "size-7 rounded-xl" }, _ = "https://proxy.scalar.com", ce = /* @__PURE__ */ P({
   __name: "SettingsGeneral",
   setup(ee) {
     const { activeWorkspace: o } = W(), { proxyUrl: k, workspaceMutators: j } = O(), L = [
@@ -21,7 +21,7 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
       // 'mars',
       // 'deepSpace',
       // 'laserwave',
-    ], N = ["elysiajs", "fastify"], _ = (x) => ({
+    ], N = ["elysiajs", "fastify"], C = (x) => ({
       default: { light: "#fff", dark: "#0f0f0f", accent: "#0099ff" },
       alternate: { light: "#f9f9f9", dark: "#131313", accent: "#e7e7e7" },
       moon: { light: "#ccc9b3", dark: "#313332", accent: "#645b0f" },
@@ -55,7 +55,7 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
           t[13] || (t[13] = r("div", null, [
             r("h2", { class: "mt-10 text-xl font-bold" }, "Settings")
           ], -1)),
-          c(C, null, {
+          c(w, null, {
             title: n(() => t[3] || (t[3] = [
               a(" CORS Proxy ")
             ])),
@@ -82,21 +82,21 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
                     class: f(
                       e(v)(
                         e(g)({
-                          active: ((s = e(o)) == null ? void 0 : s.proxyUrl) === w
+                          active: ((s = e(o)) == null ? void 0 : s.proxyUrl) === _
                         })
                       )
                     ),
-                    onClick: t[0] || (t[0] = (l) => U(w))
+                    onClick: t[0] || (t[0] = (l) => U(_))
                   }, {
                     default: n(() => {
                       var l, p;
                       return [
                         r("div", {
                           class: f(["flex h-5 w-5 items-center justify-center rounded-full border-[1.5px] p-1", {
-                            "bg-c-accent text-b-1 border-transparent": ((l = e(o)) == null ? void 0 : l.proxyUrl) === w
+                            "bg-c-accent text-b-1 border-transparent": ((l = e(o)) == null ? void 0 : l.proxyUrl) === _
                           }])
                         }, [
-                          ((p = e(o)) == null ? void 0 : p.proxyUrl) === w ? (d(), m(e(h), {
+                          ((p = e(o)) == null ? void 0 : p.proxyUrl) === _ ? (d(), m(e(h), {
                             key: 0,
                             icon: "Checkmark",
                             size: "xs",
@@ -106,9 +106,10 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
                         t[5] || (t[5] = a(" Use proxy.scalar.com (default) "))
                       ];
                     }),
-                    _: 1
+                    _: 1,
+                    __: [5]
                   }, 8, ["class"]),
-                  e(k) && e(k) !== w ? (d(), m(e(y), {
+                  e(k) && e(k) !== _ ? (d(), m(e(y), {
                     key: 0,
                     class: f(
                       e(v)(
@@ -162,14 +163,15 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
                         t[6] || (t[6] = a(" Skip the proxy "))
                       ];
                     }),
-                    _: 1
+                    _: 1,
+                    __: [6]
                   }, 8, ["class"])
                 ])
               ];
             }),
             _: 1
           }),
-          c(C, null, {
+          c(w, null, {
             title: n(() => t[7] || (t[7] = [
               a(" Themes ")
             ])),
@@ -214,19 +216,19 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
                             r("span", {
                               class: "border-c-3 -mr-3 inline-block h-5 w-5 rounded-full",
                               style: $({
-                                backgroundColor: _(s).light
+                                backgroundColor: C(s).light
                               })
                             }, null, 4),
                             r("span", {
                               class: "border-c-3 -mr-3 inline-block h-5 w-5 rounded-full",
                               style: $({
-                                backgroundColor: _(s).dark
+                                backgroundColor: C(s).dark
                               })
                             }, null, 4),
                             r("span", {
                               class: "border-c-3 inline-block h-5 w-5 rounded-full",
                               style: $({
-                                backgroundColor: _(s).accent
+                                backgroundColor: C(s).accent
                               })
                             }, null, 4)
                           ])
@@ -240,7 +242,7 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
             ]),
             _: 1
           }),
-          c(C, null, {
+          c(w, null, {
             title: n(() => t[9] || (t[9] = [
               a(" Framework Themes ")
             ])),
@@ -294,7 +296,7 @@ const D = { class: "bg-b-1 h-full w-full overflow-auto" }, G = { class: "mr-auto
             ]),
             _: 1
           }),
-          c(C, null, {
+          c(w, null, {
             title: n(() => t[11] || (t[11] = [
               a(" Appearance ")
             ])),

package/dist/views/Settings/components/SettingsAppearance.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent as x, createElementBlock as y, openBlock as o, createVNode as l, unref as e, normalizeClass as s, withCtx as c, createElementVNode as i, createTextVNode as d, createBlock as u, createCommentVNode as f } from "vue";
 import { cva as g, ScalarButton as m, cx as p, ScalarIcon as k } from "@scalar/components";
 import { useColorMode as v } from "@scalar/use-hooks/useColorMode";
-const C = { class: "flex flex-col gap-2" }, z = /* @__PURE__ */ x({
+const C = { class: "flex flex-col gap-2" }, j = /* @__PURE__ */ x({
   __name: "SettingsAppearance",
   setup(h) {
     const { colorMode: r, setColorMode: n } = v(), a = g({
@@ -33,7 +33,8 @@ const C = { class: "flex flex-col gap-2" }, z = /* @__PURE__ */ x({
           ], 2),
           t[3] || (t[3] = d(" System Preference (default) "))
         ]),
-        _: 1
+        _: 1,
+        __: [3]
       }, 8, ["class"]),
       l(e(m), {
         class: s(e(p)(e(a)({ active: e(r) === "light" }))),
@@ -54,7 +55,8 @@ const C = { class: "flex flex-col gap-2" }, z = /* @__PURE__ */ x({
           ], 2),
           t[4] || (t[4] = d(" Light Mode Always "))
         ]),
-        _: 1
+        _: 1,
+        __: [4]
       }, 8, ["class"]),
       l(e(m), {
         class: s(e(p)(e(a)({ active: e(r) === "dark" }))),
@@ -75,11 +77,12 @@ const C = { class: "flex flex-col gap-2" }, z = /* @__PURE__ */ x({
           ], 2),
           t[5] || (t[5] = d(" Dark Mode Always "))
         ]),
-        _: 1
+        _: 1,
+        __: [5]
       }, 8, ["class"])
     ]));
   }
 });
 export {
-  z as default
+  j as default
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.5.17",
+  "version": "2.5.19",
   "engines": {
     "node": ">=20"
   },
@@ -187,41 +187,41 @@
   ],
   "module": "dist/index.js",
   "dependencies": {
-    "@headlessui/tailwindcss": "^0.2.0",
-    "@headlessui/vue": "^1.7.20",
+    "@headlessui/tailwindcss": "^0.2.2",
+    "@headlessui/vue": "^1.7.23",
     "@types/har-format": "^1.2.15",
     "@vueuse/core": "^10.10.0",
     "@vueuse/integrations": "^11.2.0",
     "focus-trap": "^7",
-    "fuse.js": "^7.0.0",
-    "microdiff": "^1.4.0",
+    "fuse.js": "^7.1.0",
+    "microdiff": "^1.5.0",
     "nanoid": "5.1.5",
     "pretty-bytes": "^6.1.1",
     "pretty-ms": "^8.0.0",
     "shell-quote": "^1.8.1",
     "type-fest": "4.41.0",
-    "vue": "^3.5.12",
+    "vue": "^3.5.17",
     "vue-router": "^4.3.0",
     "whatwg-mimetype": "^4.0.0",
     "yaml": "2.8.0",
     "zod": "3.24.1",
-    "@scalar/components": "0.14.18",
+    "@scalar/components": "0.14.20",
     "@scalar/draggable": "0.2.0",
+    "@scalar/helpers": "0.0.6",
+    "@scalar/import": "0.4.14",
     "@scalar/icons": "0.4.6",
-    "@scalar/oas-utils": "0.4.13",
     "@scalar/object-utils": "1.2.2",
-    "@scalar/helpers": "0.0.6",
-    "@scalar/import": "0.4.13",
-    "@scalar/openapi-types": "0.3.5",
-    "@scalar/openapi-parser": "0.18.1",
-    "@scalar/postman-to-openapi": "0.3.16",
-    "@scalar/snippetz": "0.4.1",
-    "@scalar/use-hooks": "0.2.4",
+    "@scalar/openapi-types": "0.3.6",
+    "@scalar/openapi-parser": "0.18.2",
+    "@scalar/oas-utils": "0.4.15",
+    "@scalar/postman-to-openapi": "0.3.18",
+    "@scalar/snippetz": "0.4.3",
+    "@scalar/themes": "0.13.11",
+    "@scalar/types": "0.2.10",
+    "@scalar/use-codemirror": "0.12.21",
     "@scalar/use-toasts": "0.8.0",
-    "@scalar/themes": "0.13.9",
-    "@scalar/use-codemirror": "0.12.19",
-    "@scalar/use-tooltip": "1.1.0",
-    "@scalar/types": "0.2.8"
+    "@scalar/use-hooks": "0.2.4",
+    "@scalar/use-tooltip": "1.1.0"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.7",
@@ -235,7 +235,7 @@
     "vite-svg-loader": "^5.1.0",
     "vitest": "^1.6.1",
     "@scalar/build-tooling": "0.2.4",
-    "@scalar/galaxy": "0.5.3"
+    "@scalar/galaxy": "0.5.5"
   },
   "scripts": {
     "build": "scalar-build-vite",