@scalar/api-client 2.1.42 → 2.1.44

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

@@ -1,79 +1,120 @@
-const y = (t) => t.type.startsWith("oauth"), P = (t, r, f) => new Promise((i, e) => {
-  const n = t.flow.selectedScopes.join(" ");
-  if (t.flow.type === "clientCredentials" || t.flow.type === "password")
-    p(
-      t,
-      r,
-      n
-    ).then(i).catch(e);
-  else {
-    const c = (Math.random() + 1).toString(36).substring(7), a = new URL(t.flow.authorizationUrl);
-    if (t.flow.type === "implicit" ? a.searchParams.set("response_type", "token") : t.flow.type === "authorizationCode" && a.searchParams.set("response_type", "code"), t.flow["x-scalar-redirect-uri"].startsWith("/")) {
-      const d = f.url || window.location.origin + window.location.pathname, s = new URL(
-        t.flow["x-scalar-redirect-uri"],
-        d
-      ).toString();
-      a.searchParams.set("redirect_uri", s);
-    } else
-      a.searchParams.set(
-        "redirect_uri",
-        t.flow["x-scalar-redirect-uri"]
+const P = (e) => e.type.startsWith("oauth"), y = () => {
+  const e = new Uint8Array(32);
+  return crypto.getRandomValues(e), btoa(String.fromCharCode(...e)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}, _ = async (e, r) => {
+  if (r === "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(/=+$/, "");
+}, S = async (e, r, d) => {
+  try {
+    const a = e.flow.selectedScopes.join(" ");
+    if (e.flow.type === "clientCredentials" || e.flow.type === "password")
+      return g(
+        e,
+        r,
+        a
       );
-    a.searchParams.set("client_id", t["x-scalar-client-id"]), a.searchParams.set("scope", n), a.searchParams.set("state", c);
-    const o = window.open(a, "openAuth2Window", "left=100,top=100,width=800,height=600");
-    if (o) {
-      const d = setInterval(function() {
-        var h;
-        let s = null, l = null;
-        try {
-          const w = new URL(o.location.href).searchParams;
-          s = w.get("access_token"), l = w.get("code");
-          const u = new URLSearchParams(
-            o.location.href.split("#")[1]
-          );
-          s || (s = u.get("access_token")), l || (l = u.get("code"));
-        } catch {
-        }
-        (o.closed || s || l) && (clearInterval(d), o.close(), s ? ((h = o.location.href.match(/state=([^&]*)/)) == null ? void 0 : h[1]) === c ? i(s) : e(new Error("State mismatch")) : l ? new URL(o.location.href).searchParams.get(
-          "state"
-        ) === c ? p(
-          t,
-          r,
-          n,
-          l
-        ).then(i).catch(e) : e(new Error("State mismatch")) : (clearInterval(d), e(
-          new Error("Window was closed without granting authorization")
-        )));
-      }, 200);
+    {
+      const s = (Math.random() + 1).toString(36).substring(7), t = new URL(e.flow.authorizationUrl);
+      let c = null;
+      if (e.flow.type === "implicit")
+        t.searchParams.set("response_type", "token");
+      else if (e.flow.type === "authorizationCode" && (t.searchParams.set("response_type", "code"), e.flow["x-usePkce"] !== "no")) {
+        const o = y(), i = await _(
+          o,
+          e.flow["x-usePkce"]
+        );
+        c = {
+          codeVerifier: o,
+          codeChallenge: i,
+          codeChallengeMethod: e.flow["x-usePkce"] === "SHA-256" ? "S256" : "plain"
+        }, t.searchParams.set("code_challenge", i), t.searchParams.set(
+          "code_challenge_method",
+          c.codeChallengeMethod
+        );
+      }
+      if (e.flow["x-scalar-redirect-uri"].startsWith("/")) {
+        const o = d.url || window.location.origin + window.location.pathname, i = new URL(
+          e.flow["x-scalar-redirect-uri"],
+          o
+        ).toString();
+        t.searchParams.set("redirect_uri", i);
+      } else
+        t.searchParams.set(
+          "redirect_uri",
+          e.flow["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((o) => {
+        const i = setInterval(() => {
+          var h;
+          let w = null, u = null;
+          try {
+            const l = new URL(n.location.href).searchParams;
+            w = l.get("access_token"), u = l.get("code");
+            const p = new URLSearchParams(
+              n.location.href.split("#")[1]
+            );
+            w || (w = p.get("access_token")), u || (u = p.get("code"));
+          } catch {
+          }
+          if (n.closed || w || u)
+            if (clearInterval(i), n.close(), w) {
+              const l = (h = n.location.href.match(/state=([^&]*)/)) == null ? void 0 : h[1];
+              o(l === s ? [null, w] : [new Error("State mismatch"), null]);
+            } else u ? new URL(
+              n.location.href
+            ).searchParams.get("state") === s ? g(
+              e,
+              r,
+              a,
+              u,
+              c
+            ).then(o) : o([new Error("State mismatch"), null]) : (clearInterval(i), o([
+              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];
   }
-}), p = async (t, r, f, i) => {
+}, g = async (e, r, d, a, s) => {
   if (!("clientSecret" in r))
-    throw new Error(
-      "Authorize Servers only works for Password, Client Credentials or Authorization Code flow"
-    );
-  if (!t.flow) throw new Error("OAuth2 flow was not defined");
-  const e = new URLSearchParams();
-  e.set("client_id", t["x-scalar-client-id"]), e.set("scope", f), r.clientSecret && e.set("client_secret", r.clientSecret), "x-scalar-redirect-uri" in t.flow && e.set("redirect_uri", t.flow["x-scalar-redirect-uri"]), i ? (e.set("code", i), e.set("grant_type", "authorization_code")) : r.type === "oauth-password" ? (e.set("grant_type", "password"), e.set("username", r.username), e.set("password", r.password)) : e.set("grant_type", "client_credentials");
+    return [
+      new Error(
+        "Authorize Servers only works for Password, Client Credentials or Authorization Code flow"
+      ),
+      null
+    ];
+  if (!e.flow) return [new Error("OAuth2 flow was not defined"), null];
+  const t = new URLSearchParams();
+  t.set("client_id", e["x-scalar-client-id"]), d && t.set("scope", d), r.clientSecret && t.set("client_secret", r.clientSecret), "x-scalar-redirect-uri" in e.flow && t.set("redirect_uri", e.flow["x-scalar-redirect-uri"]), a ? (t.set("code", a), t.set("grant_type", "authorization_code"), s && t.set("code_verifier", s.codeVerifier)) : r.type === "oauth-password" ? (t.set("grant_type", "password"), t.set("username", r.username), t.set("password", r.password)) : t.set("grant_type", "client_credentials");
   try {
-    const n = {
+    const c = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    t["x-scalar-client-id"] && r.clientSecret && (n.Authorization = `Basic ${btoa(`${t["x-scalar-client-id"]}:${r.clientSecret}`)}`);
-    const c = await fetch(t.flow.tokenUrl, {
+    e["x-scalar-client-id"] && r.clientSecret && (c.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${r.clientSecret}`)}`);
+    const f = await fetch(e.flow.tokenUrl, {
       method: "POST",
-      headers: n,
-      body: e
-    }), { access_token: a } = await c.json();
-    return a;
+      headers: c,
+      body: t
+    }), { access_token: n } = await f.json();
+    return [null, n];
   } catch {
-    throw new Error(
-      "Failed to get an access token. Please check your credentials."
-    );
+    return [
+      new Error(
+        "Failed to get an access token. Please check your credentials."
+      ),
+      null
+    ];
   }
 };
 export {
-  P as authorizeOauth2,
-  p as authorizeServers,
-  y as isOauth2Example
+  S as authorizeOauth2,
+  g as authorizeServers,
+  _ as generateCodeChallenge,
+  P as isOauth2Example
 };

package/dist/views/Servers/ServerForm.vue.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;
 //# sourceMappingURL=ServerForm.vue.d.ts.map

package/dist/views/Servers/ServerForm.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerForm.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/ServerForm.vue"],"names":[],"mappings":";AAgNA,wBAKG"}
+{"version":3,"file":"ServerForm.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/ServerForm.vue"],"names":[],"mappings":";AAyNA,wBAMG"}

package/dist/views/Servers/Servers.vue.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;
 //# sourceMappingURL=Servers.vue.d.ts.map

package/dist/views/Servers/Servers.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Servers.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/Servers.vue"],"names":[],"mappings":";AAoNA,wBAKG"}
+{"version":3,"file":"Servers.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/Servers.vue"],"names":[],"mappings":";AAsNA,wBAMG"}

package/dist/views/Settings/Settings.vue.d.ts

@@ -1,4 +1,4 @@
 import { type DefineComponent } from 'vue';
-declare const _default: DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;
 //# sourceMappingURL=Settings.vue.d.ts.map

package/dist/views/Settings/Settings.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/Settings.vue"],"names":[],"mappings":"AAgCA,OAAO,EAAE,KAAK,eAAe,EAAO,MAAM,KAAK,CAAA;;AAiF/C,wBAKG"}
+{"version":3,"file":"Settings.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/Settings.vue"],"names":[],"mappings":"AAgCA,OAAO,EAAE,KAAK,eAAe,EAAO,MAAM,KAAK,CAAA;;AA8F/C,wBAMG"}

package/dist/views/Settings/SettingsGeneral.vue.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;
 //# sourceMappingURL=SettingsGeneral.vue.d.ts.map

package/dist/views/Settings/SettingsGeneral.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SettingsGeneral.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/SettingsGeneral.vue"],"names":[],"mappings":";AAusBA,wBAKG"}
+{"version":3,"file":"SettingsGeneral.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/SettingsGeneral.vue"],"names":[],"mappings":";AAqoBA,wBAMG"}

package/dist/views/Settings/SettingsGeneralMode.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SettingsGeneralMode.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/SettingsGeneralMode.vue"],"names":[],"mappings":";AAoXA,wBAKG"}
+{"version":3,"file":"SettingsGeneralMode.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/SettingsGeneralMode.vue"],"names":[],"mappings":";AAuVA,wBAKG"}

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.1.42",
+  "version": "2.1.44",
   "engines": {
     "node": ">=18"
   },
@@ -153,19 +153,19 @@
     "whatwg-mimetype": "^4.0.0",
     "yaml": "^2.4.5",
     "zod": "^3.23.8",
+    "@scalar/components": "0.12.64",
     "@scalar/draggable": "0.1.6",
     "@scalar/icons": "0.1.1",
-    "@scalar/import": "0.0.4",
-    "@scalar/oas-utils": "0.2.68",
+    "@scalar/import": "0.0.5",
+    "@scalar/oas-utils": "0.2.70",
     "@scalar/object-utils": "1.1.11",
-    "@scalar/openapi-parser": "0.8.8",
-    "@scalar/components": "0.12.63",
-    "@scalar/openapi-types": "0.1.4",
-    "@scalar/themes": "0.9.45",
-    "@scalar/types": "0.0.18",
-    "@scalar/use-codemirror": "0.11.30",
-    "@scalar/use-toasts": "0.7.7",
-    "@scalar/use-tooltip": "1.0.3"
+    "@scalar/openapi-parser": "0.8.9",
+    "@scalar/openapi-types": "0.1.5",
+    "@scalar/themes": "0.9.46",
+    "@scalar/types": "0.0.19",
+    "@scalar/use-codemirror": "0.11.31",
+    "@scalar/use-tooltip": "1.0.3",
+    "@scalar/use-toasts": "0.7.7"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",
@@ -183,7 +183,7 @@
     "vite-svg-loader": "^5.1.0",
     "vitest": "^1.6.0",
     "@scalar/build-tooling": "0.1.11",
-    "@scalar/galaxy": "0.2.14"
+    "@scalar/galaxy": "0.2.16"
   },
   "scripts": {
     "build": "vite build && pnpm types:build && tsc-alias -p tsconfig.build.json",