@scalar/api-client 2.1.52 → 2.2.0

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

@@ -1,77 +1,70 @@
-const P = (e) => e.type.startsWith("oauth"), y = () => {
+const w = () => {
   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) => {
+}, _ = async (e, i) => {
+  if (i === "plain") return e;
+  const s = new TextEncoder().encode(e), t = await crypto.subtle.digest("SHA-256", s);
+  return btoa(String.fromCharCode(...new Uint8Array(t))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}, y = async (e, i) => {
   try {
-    const a = e.flow.selectedScopes.join(" ");
-    if (e.flow.type === "clientCredentials" || e.flow.type === "password")
-      return g(
-        e,
-        r,
-        a
-      );
+    if (!e) return [new Error("Flow not found"), null];
+    const a = e.selectedScopes.join(" ");
+    if (e.type === "clientCredentials" || e.type === "password")
+      return m(e, a);
     {
-      const s = (Math.random() + 1).toString(36).substring(7), t = new URL(e.flow.authorizationUrl);
-      let c = null;
-      if (e.flow.type === "implicit")
+      const s = (Math.random() + 1).toString(36).substring(7), t = new URL(e.authorizationUrl);
+      let o = null;
+      if (e.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"]
+      else if (e.type === "authorizationCode" && (t.searchParams.set("response_type", "code"), e["x-usePkce"] !== "no")) {
+        const r = w(), c = await _(
+          r,
+          e["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(
+        o = {
+          codeVerifier: r,
+          codeChallenge: c,
+          codeChallengeMethod: e["x-usePkce"] === "SHA-256" ? "S256" : "plain"
+        }, t.searchParams.set("code_challenge", c), t.searchParams.set(
           "code_challenge_method",
-          c.codeChallengeMethod
+          o.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
+      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", i);
+        t.searchParams.set("redirect_uri", c);
       } else
-        t.searchParams.set(
-          "redirect_uri",
-          e.flow["x-scalar-redirect-uri"]
-        );
+        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((o) => {
-        const i = setInterval(() => {
-          var h;
-          let w = null, u = null;
+      return n ? new Promise((r) => {
+        const c = setInterval(() => {
+          var p;
+          let d = 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(
+            d = l.get("access_token"), u = l.get("code");
+            const g = new URLSearchParams(
               n.location.href.split("#")[1]
             );
-            w || (w = p.get("access_token")), u || (u = p.get("code"));
+            d || (d = g.get("access_token")), u || (u = g.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]);
+          if (n.closed || d || u)
+            if (clearInterval(c), n.close(), d) {
+              const l = (p = n.location.href.match(/state=([^&]*)/)) == null ? void 0 : p[1];
+              r(l === s ? [null, d] : [new Error("State mismatch"), null]);
             } else u ? new URL(
               n.location.href
-            ).searchParams.get("state") === s ? g(
+            ).searchParams.get("state") === s ? m(
               e,
-              r,
               a,
               u,
-              c
-            ).then(o) : o([new Error("State mismatch"), null]) : (clearInterval(i), o([
+              o
+            ).then(r) : r([new Error("State mismatch"), null]) : (clearInterval(c), r([
               new Error("Window was closed without granting authorization"),
               null
             ]));
@@ -81,27 +74,20 @@ const P = (e) => e.type.startsWith("oauth"), y = () => {
   } catch {
     return [new Error("Failed to authorize oauth2 flow"), null];
   }
-}, g = async (e, r, d, a, s) => {
-  if (!("clientSecret" in r))
-    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];
+}, m = async (e, i, a, s) => {
+  if (!e) 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");
+  t.set("client_id", e["x-scalar-client-id"]), i && 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"]), a ? (t.set("code", a), 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");
   try {
-    const c = {
+    const o = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    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, {
+    o.Authorization = `Basic ${btoa(`${e["x-scalar-client-id"]}:${e.clientSecret}`)}`;
+    const h = await fetch(e.tokenUrl, {
       method: "POST",
-      headers: c,
+      headers: o,
       body: t
-    }), { access_token: n } = await f.json();
+    }), { access_token: n } = await h.json();
     return [null, n];
   } catch {
     return [
@@ -113,8 +99,7 @@ const P = (e) => e.type.startsWith("oauth"), y = () => {
   }
 };
 export {
-  S as authorizeOauth2,
-  g as authorizeServers,
-  _ as generateCodeChallenge,
-  P as isOauth2Example
+  y as authorizeOauth2,
+  m as authorizeServers,
+  _ as generateCodeChallenge
 };

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":";AAyNA,wBAMG"}
+{"version":3,"file":"ServerForm.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/ServerForm.vue"],"names":[],"mappings":";AA6NA,wBAMG"}

package/dist/views/Servers/ServerForm.vue.js

@@ -1,18 +1,19 @@
-import { defineComponent as S, computed as l, openBlock as u, createElementBlock as d, Fragment as b, createVNode as g, createBlock as y, createCommentVNode as p } from "vue";
+import { defineComponent as S, computed as l, openBlock as n, createElementBlock as d, Fragment as b, createVNode as g, createBlock as y, createCommentVNode as p } from "vue";
 import m from "../../components/Form/Form.vue.js";
-import { useRoute as O } from "vue-router";
-import { useWorkspace as V } from "../../store/store.js";
-const j = { class: "w-full" }, L = /* @__PURE__ */ S({
+import { useActiveEntities as O } from "../../store/active-entities.js";
+import { useRoute as V } from "vue-router";
+import { useWorkspace as j } from "../../store/store.js";
+const B = { class: "w-full" }, N = /* @__PURE__ */ S({
   __name: "ServerForm",
-  setup(B) {
-    const { activeCollection: a, servers: v, serverMutators: n } = V(), f = [
+  setup(C) {
+    const { activeCollection: a } = O(), { servers: v, serverMutators: u } = j(), f = [
       { label: "URL", key: "url", placeholder: "https://void.scalar.com/api" },
       {
         label: "Label",
         key: "description",
         placeholder: "Production"
       }
-    ], c = O(), o = l(
+    ], c = V(), o = l(
       () => {
         var e, t;
         return v[a.value && c.params.server === "default" ? (e = a.value) == null ? void 0 : e.servers[0] : ((t = a.value) == null ? void 0 : t.servers.find(
@@ -20,9 +21,9 @@ const j = { class: "w-full" }, L = /* @__PURE__ */ S({
         )) ?? ""];
       }
     ), _ = (e, t) => {
-      a.value && n.edit(o.value.uid, e, t);
+      a.value && u.edit(o.value.uid, e, t);
     }, k = (e, t) => {
-      a.value && n.edit(o.value.uid, `variables.${e}.value`, t);
+      a.value && u.edit(o.value.uid, `variables.${e}.value`, t);
     }, h = l(
       () => {
         var e;
@@ -43,15 +44,15 @@ const j = { class: "w-full" }, L = /* @__PURE__ */ S({
         return e[t] = (r.default ?? ((s = r == null ? void 0 : r.enum) == null ? void 0 : s[0]) ?? "").toString(), e;
       }, {})
     );
-    return (e, t) => (u(), d("div", j, [
-      o.value ? (u(), d(b, { key: 0 }, [
+    return (e, t) => (n(), d("div", B, [
+      o.value ? (n(), d(b, { key: 0 }, [
         g(m, {
           data: o.value,
           onUpdate: _,
           options: f,
           title: "Server"
         }, null, 8, ["data"]),
-        Object.keys(i.value).length ? (u(), y(m, {
+        Object.keys(i.value).length ? (n(), y(m, {
           key: 0,
           data: i.value,
           onUpdate: k,
@@ -63,5 +64,5 @@ const j = { class: "w-full" }, L = /* @__PURE__ */ S({
   }
 });
 export {
-  L as default
+  N as default
 };

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":";AAgOA,wBAMG"}
+{"version":3,"file":"Servers.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Servers/Servers.vue"],"names":[],"mappings":";AAoOA,wBAMG"}

package/dist/views/Servers/Servers.vue2.js

@@ -1,20 +1,21 @@
-import { defineComponent as p, openBlock as s, createBlock as m, withCtx as e, createVNode as r, unref as n, createElementVNode as _, createElementBlock as v, Fragment as S, renderList as x, createTextVNode as b } from "vue";
+import { defineComponent as d, openBlock as a, createBlock as m, withCtx as e, createVNode as r, unref as n, createElementVNode as _, createElementBlock as v, Fragment as S, renderList as x, createTextVNode as b } from "vue";
 import k from "../../components/Sidebar/SidebarButton.vue.js";
 import h from "../../components/Sidebar/SidebarList.vue.js";
 import L from "../../components/Sidebar/SidebarListElement.vue.js";
 import V from "../../components/ViewLayout/ViewLayout.vue.js";
 import w from "../../components/ViewLayout/ViewLayoutContent.vue.js";
-import { serverSchema as C } from "@scalar/oas-utils/entities/spec";
+import { useActiveEntities as C } from "../../store/active-entities.js";
+import { serverSchema as E } from "@scalar/oas-utils/entities/spec";
 import { useRouter as y } from "vue-router";
 import B from "./ServerForm.vue.js";
-import { useWorkspace as E } from "../../store/store.js";
-import N from "../../components/Sidebar/Sidebar.vue.js";
-const $ = { class: "flex-1" }, G = /* @__PURE__ */ p({
+import { useWorkspace as N } from "../../store/store.js";
+import A from "../../components/Sidebar/Sidebar.vue.js";
+const $ = { class: "flex-1" }, J = /* @__PURE__ */ d({
   __name: "Servers",
   setup(g) {
-    const { activeCollection: t, servers: u, serverMutators: c } = E(), { push: f } = y(), d = () => {
+    const { activeCollection: t } = C(), { servers: u, serverMutators: c } = N(), { push: f } = y(), p = () => {
       if (!t.value) return;
-      const o = C.parse({ url: "http://localhost" });
+      const o = E.parse({ url: "http://localhost" });
       c.add(o, t.value.uid), f({
         name: "servers",
         params: {
@@ -22,21 +23,21 @@ const $ = { class: "flex-1" }, G = /* @__PURE__ */ p({
         }
       });
     };
-    return (o, l) => (s(), m(V, null, {
+    return (o, i) => (a(), m(V, null, {
       default: e(() => [
-        r(n(N), { title: "Servers" }, {
+        r(n(A), { title: "Servers" }, {
           content: e(() => [
             _("div", $, [
               r(h, null, {
                 default: e(() => {
-                  var i;
+                  var l;
                   return [
-                    (s(!0), v(S, null, x((i = n(t)) == null ? void 0 : i.servers, (a) => (s(), m(L, {
-                      key: a,
+                    (a(!0), v(S, null, x((l = n(t)) == null ? void 0 : l.servers, (s) => (a(), m(L, {
+                      key: s,
                       class: "text-xs",
                       variable: {
-                        name: n(u)[a].url ?? "",
-                        uid: a
+                        name: n(u)[s].url ?? "",
+                        uid: s
                       }
                     }, null, 8, ["variable"]))), 128))
                   ];
@@ -46,8 +47,8 @@ const $ = { class: "flex-1" }, G = /* @__PURE__ */ p({
             ])
           ]),
           button: e(() => [
-            r(k, { click: d }, {
-              title: e(() => l[0] || (l[0] = [
+            r(k, { click: p }, {
+              title: e(() => i[0] || (i[0] = [
                 b("Add Server")
               ])),
               _: 1
@@ -67,5 +68,5 @@ const $ = { class: "flex-1" }, G = /* @__PURE__ */ p({
   }
 });
 export {
-  G as default
+  J as default
 };

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":";AAqoBA,wBAMG"}
+{"version":3,"file":"SettingsGeneral.vue.d.ts","sourceRoot":"","sources":["../../../src/views/Settings/SettingsGeneral.vue"],"names":[],"mappings":";AA+2BA,wBAMG"}