@scalar/api-client 2.33.0 → 2.34.0

package/dist/v2/blocks/request-block/helpers/get-default-headers.js

@@ -1,7 +1,7 @@
 import { canMethodHaveBody as m } from "@scalar/helpers/http/can-method-have-body";
 import { getResolvedRef as r } from "@scalar/workspace-store/helpers/get-resolved-ref";
 import { isElectron as y } from "../../../../libs/electron.js";
-const l = "2.33.0", T = "application/json", C = "*/*", a = (n, s, o) => ({
+const l = "2.34.0", T = "application/json", C = "*/*", a = (n, s, o) => ({
   name: n,
   defaultValue: s,
   isOverridden: o.has(n.toLowerCase())

package/dist/v2/blocks/scalar-auth-selector-block/components/OAuth2.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OAuth2.vue.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/components/OAuth2.vue"],"names":[],"mappings":"AAoYA,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2EAA2E,CAAA;AAGnH,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,8DAA8D,CAAA;AAOrE,OAAO,KAAK,EAIV,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,6DAA6D,CAAA;AAIpE,KAAK,WAAW,GAAG;IACjB,wCAAwC;IACxC,WAAW,EAAE,kBAAkB,CAAA;IAC/B,kBAAkB;IAClB,KAAK,EAAE,sBAAsB,CAAA;IAC7B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,sBAAsB,CAAA;IAClC,sBAAsB;IACtB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,sBAAsB;IACtB,MAAM,EAAE,0BAA0B,CAAA;IAClC,mCAAmC;IACnC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAA;IAC3B,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,2CAA2C;IAC3C,QAAQ,EAAE,iBAAiB,CAAA;CAC5B,CAAC;AA+uBF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;kFAGhB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}
+{"version":3,"file":"OAuth2.vue.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/components/OAuth2.vue"],"names":[],"mappings":"AA6YA,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2EAA2E,CAAA;AAGnH,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,8DAA8D,CAAA;AAOrE,OAAO,KAAK,EAIV,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,6DAA6D,CAAA;AAIpE,KAAK,WAAW,GAAG;IACjB,wCAAwC;IACxC,WAAW,EAAE,kBAAkB,CAAA;IAC/B,kBAAkB;IAClB,KAAK,EAAE,sBAAsB,CAAA;IAC7B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,sBAAsB,CAAA;IAClC,sBAAsB;IACtB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,sBAAsB;IACtB,MAAM,EAAE,0BAA0B,CAAA;IAClC,mCAAmC;IACnC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAA;IAC3B,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,2CAA2C;IAC3C,QAAQ,EAAE,iBAAiB,CAAA;CAC5B,CAAC;AAwvBF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;kFAGhB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}

package/dist/v2/blocks/scalar-auth-selector-block/components/OAuth2.vue.js

@@ -1,14 +1,14 @@
-import { defineComponent as P, computed as C, ref as R, watch as I, createElementBlock as p, openBlock as m, Fragment as V, createVNode as r, unref as o, withCtx as l, createTextVNode as d, createElementVNode as S, createBlock as f, createCommentVNode as v } from "vue";
-import { useLoadingState as L, ScalarButton as k } from "@scalar/components";
-import { pkceOptions as F } from "@scalar/oas-utils/entities/spec";
-import { useToasts as A } from "@scalar/use-toasts";
-import { getEnvironmentVariables as h } from "../../operation-block/helpers/get-environment-variables.js";
+import { defineComponent as O, computed as C, ref as P, watch as R, createElementBlock as k, openBlock as m, Fragment as p, createVNode as r, unref as o, withCtx as l, createTextVNode as d, createElementVNode as S, createBlock as v, createCommentVNode as f } from "vue";
+import { useLoadingState as I, ScalarButton as V } from "@scalar/components";
+import { pkceOptions as L } from "@scalar/oas-utils/entities/spec";
+import { useToasts as F } from "@scalar/use-toasts";
+import { getEnvironmentVariables as A } from "../../operation-block/helpers/get-environment-variables.js";
 import E from "./OAuthScopesInput.vue.js";
 /* empty css                      */
 import { authorizeOauth2 as N } from "../helpers/oauth.js";
 import c from "./RequestAuthDataTableInput.vue.js";
 import u from "../../../../components/DataTable/DataTableRow.vue.js";
-const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { class: "flex h-8 w-full items-center justify-end border-t" }, J = /* @__PURE__ */ P({
+const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { class: "flex h-8 w-full items-center justify-end border-t" }, J = /* @__PURE__ */ O({
   __name: "OAuth2",
   props: {
     environment: {},
@@ -22,8 +22,8 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
     eventBus: {}
   },
   emits: ["update:selectedScopes"],
-  setup(t, { emit: g }) {
-    const z = g, y = L(), { toast: B } = A(), n = C(() => t.flows[t.type]), U = C(
+  setup(t, { emit: T }) {
+    const g = T, y = I(), { toast: z } = F(), n = C(() => t.flows[t.type]), U = C(
       () => t.selectedScopes.filter((s) => s in (n.value.scopes ?? {}))
     ), x = (s) => {
       if (t.scheme.type === "openIdConnect")
@@ -43,10 +43,10 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
         [t.type]: s
       },
       name: t.name
-    }), T = () => t.eventBus.emit("auth:clear:security-scheme-secrets", {
+    }), B = () => t.eventBus.emit("auth:clear:security-scheme-secrets", {
       name: t.name
-    }), w = R(!1);
-    I(
+    }), w = P(!1);
+    R(
       () => n.value["x-scalar-secret-redirect-uri"],
       (s) => {
         w.value || s || typeof window > "u" || !("x-scalar-secret-redirect-uri" in n.value) || (w.value = !0, i({
@@ -65,13 +65,16 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
         U.value,
         t.server,
         t.proxyUrl,
-        h(t.environment)
+        A(t.environment)
       );
-      await y.clear(), e ? i({ "x-scalar-secret-token": e }) : (console.error(s), B(s?.message ?? "Failed to authorize", "error"));
-    }, O = (s) => x({
+      await y.clear(), e?.accessToken ? i({
+        "x-scalar-secret-token": e.accessToken,
+        ...e.refreshToken ? { "x-scalar-secret-refresh-token": e.refreshToken } : {}
+      }) : (console.error(s), z(s?.message ?? "Failed to authorize", "error"));
+    }, h = (s) => x({
       "x-scalar-credentials-location": s === "body" ? "body" : "header"
     });
-    return (s, e) => n.value["x-scalar-secret-token"] ? (m(), p(V, { key: 0 }, [
+    return (s, e) => n.value["x-scalar-secret-token"] ? (m(), k(p, { key: 0 }, [
       r(o(u), null, {
         default: l(() => [
           r(c, {
@@ -93,12 +96,15 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
       r(o(u), { class: "min-w-full" }, {
         default: l(() => [
           S("div", j, [
-            r(o(k), {
+            r(o(V), {
               class: "mr-1 p-0 px-2 py-0.5",
               loader: o(y),
               size: "sm",
               variant: "outlined",
-              onClick: e[1] || (e[1] = () => i({ "x-scalar-secret-token": "" }))
+              onClick: e[1] || (e[1] = () => i({
+                "x-scalar-secret-token": "",
+                "x-scalar-secret-refresh-token": ""
+              }))
             }, {
               default: l(() => [...e[13] || (e[13] = [
                 d(" Clear ", -1)
@@ -109,10 +115,10 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
         ]),
         _: 1
       })
-    ], 64)) : (m(), p(V, { key: 1 }, [
+    ], 64)) : (m(), k(p, { key: 1 }, [
       r(o(u), null, {
         default: l(() => [
-          "authorizationUrl" in n.value ? (m(), f(c, {
+          "authorizationUrl" in n.value ? (m(), v(c, {
             key: 0,
             containerClass: "border-r-0",
             environment: t.environment,
@@ -124,8 +130,8 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
               d(" Auth URL ", -1)
             ])]),
             _: 1
-          }, 8, ["environment", "modelValue"])) : v("", !0),
-          "tokenUrl" in n.value ? (m(), f(c, {
+          }, 8, ["environment", "modelValue"])) : f("", !0),
+          "tokenUrl" in n.value ? (m(), v(c, {
             key: 1,
             environment: t.environment,
             modelValue: n.value.tokenUrl,
@@ -136,11 +142,11 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
               d(" Token URL ", -1)
             ])]),
             _: 1
-          }, 8, ["environment", "modelValue"])) : v("", !0)
+          }, 8, ["environment", "modelValue"])) : f("", !0)
         ]),
         _: 1
       }),
-      "x-scalar-secret-redirect-uri" in n.value ? (m(), f(o(u), { key: 0 }, {
+      "x-scalar-secret-redirect-uri" in n.value ? (m(), v(o(u), { key: 0 }, {
         default: l(() => [
           r(c, {
             environment: t.environment,
@@ -155,8 +161,8 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
           }, 8, ["environment", "modelValue"])
         ]),
         _: 1
-      })) : v("", !0),
-      "x-scalar-secret-username" in n.value && "x-scalar-secret-password" in n.value ? (m(), p(V, { key: 1 }, [
+      })) : f("", !0),
+      "x-scalar-secret-username" in n.value && "x-scalar-secret-password" in n.value ? (m(), k(p, { key: 1 }, [
         r(o(u), null, {
           default: l(() => [
             r(c, {
@@ -191,7 +197,7 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
           ]),
           _: 1
         })
-      ], 64)) : v("", !0),
+      ], 64)) : f("", !0),
       r(o(u), null, {
         default: l(() => [
           r(c, {
@@ -208,7 +214,7 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
         ]),
         _: 1
       }),
-      "x-scalar-secret-client-secret" in n.value ? (m(), f(o(u), { key: 2 }, {
+      "x-scalar-secret-client-secret" in n.value ? (m(), v(o(u), { key: 2 }, {
         default: l(() => [
           r(c, {
             environment: t.environment,
@@ -224,11 +230,11 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
           }, 8, ["environment", "modelValue"])
         ]),
         _: 1
-      })) : v("", !0),
-      "x-usePkce" in n.value ? (m(), f(o(u), { key: 3 }, {
+      })) : f("", !0),
+      "x-usePkce" in n.value ? (m(), v(o(u), { key: 3 }, {
         default: l(() => [
           r(c, {
-            enum: o(F),
+            enum: o(L),
             environment: t.environment,
             modelValue: n.value["x-usePkce"],
             readOnly: "",
@@ -243,8 +249,8 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
           }, 8, ["enum", "environment", "modelValue"])
         ]),
         _: 1
-      })) : v("", !0),
-      t.type !== "implicit" ? (m(), f(o(u), { key: 4 }, {
+      })) : f("", !0),
+      t.type !== "implicit" ? (m(), v(o(u), { key: 4 }, {
         default: l(() => [
           r(c, {
             enum: ["header", "body"],
@@ -252,7 +258,7 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
             modelValue: n.value["x-scalar-credentials-location"] || "header",
             placeholder: "header",
             readOnly: "",
-            "onUpdate:modelValue": e[10] || (e[10] = (a) => O(a))
+            "onUpdate:modelValue": e[10] || (e[10] = (a) => h(a))
           }, {
             default: l(() => [...e[22] || (e[22] = [
               d(" Credentials Location ", -1)
@@ -261,14 +267,14 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
           }, 8, ["environment", "modelValue"])
         ]),
         _: 1
-      })) : v("", !0),
+      })) : f("", !0),
       r(o(u), null, {
         default: l(() => [
           r(E, {
             flow: n.value,
             flowType: t.type,
             selectedScopes: U.value,
-            "onUpdate:selectedScopes": e[11] || (e[11] = (a) => z("update:selectedScopes", a))
+            "onUpdate:selectedScopes": e[11] || (e[11] = (a) => g("update:selectedScopes", a))
           }, null, 8, ["flow", "flowType", "selectedScopes"])
         ]),
         _: 1
@@ -276,20 +282,20 @@ const j = { class: "flex h-8 items-center justify-end gap-2 border-t" }, Q = { c
       r(o(u), { class: "min-w-full" }, {
         default: l(() => [
           S("div", Q, [
-            t.scheme.type === "openIdConnect" ? (m(), f(o(k), {
+            t.scheme.type === "openIdConnect" ? (m(), v(o(V), {
               key: 0,
               class: "mr-1 p-0 px-2 py-0.5",
               loader: o(y),
               size: "sm",
               variant: "outlined",
-              onClick: T
+              onClick: B
             }, {
               default: l(() => [...e[23] || (e[23] = [
                 d(" Clear ", -1)
               ])]),
               _: 1
-            }, 8, ["loader"])) : v("", !0),
-            r(o(k), {
+            }, 8, ["loader"])) : f("", !0),
+            r(o(V), {
               class: "mr-0.75 p-0 px-2 py-0.5",
               loader: o(y),
               size: "sm",

package/dist/v2/blocks/scalar-auth-selector-block/helpers/extract-security-scheme-secrets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-security-scheme-secrets.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/extract-security-scheme-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,SAAS,EAA2C,MAAM,uCAAuC,CAAA;AAC/G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAOlF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAA;AAExG,OAAO,KAAK,EAUV,0BAA0B,EAC3B,MAAM,gBAAgB,CAAA;AAEvB,wGAAwG;AACxG,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,CAAA;AA0HjF,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,GAEvC,QAAQ,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,EAC1D,WAAW,SAAS,EACpB,MAAM,MAAM,EACZ,cAAc,MAAM,KACnB,0BAuDF,CAAA"}
+{"version":3,"file":"extract-security-scheme-secrets.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/extract-security-scheme-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,SAAS,EAA2C,MAAM,uCAAuC,CAAA;AAC/G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAOlF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAA;AAExG,OAAO,KAAK,EAUV,0BAA0B,EAC3B,MAAM,gBAAgB,CAAA;AAEvB,wGAAwG;AACxG,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,CAAA;AA0IjF,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,GAEvC,QAAQ,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,EAC1D,WAAW,SAAS,EACpB,MAAM,MAAM,EACZ,cAAc,MAAM,KACnB,0BAuDF,CAAA"}

package/dist/v2/blocks/scalar-auth-selector-block/helpers/extract-security-scheme-secrets.js

@@ -1,32 +1,36 @@
-import { isObject as p } from "@scalar/helpers/object/is-object";
-import { objectEntries as x } from "@scalar/helpers/object/object-entries";
-const u = {
+import { isObject as u } from "@scalar/helpers/object/is-object";
+import { objectEntries as p } from "@scalar/helpers/object/object-entries";
+const f = {
   "x-scalar-secret-client-id": "x-scalar-client-id",
   "x-scalar-secret-client-secret": "clientSecret",
   "x-scalar-secret-password": "password",
   "x-scalar-secret-redirect-uri": "x-scalar-redirect-uri",
   "x-scalar-secret-token": "token",
   "x-scalar-secret-username": "username"
-}, n = (t, c, i = {}) => Object.fromEntries(
+}, n = (t, s, i = {}) => Object.fromEntries(
   t.map((a) => {
-    const r = i[a] || c[a] || c[u[a]] || "";
+    const r = i[a] || s[a] || s[f[a]] || "";
     return [a, r];
   })
-), d = (t, c) => {
+), o = (t = {}) => {
+  const s = t["x-scalar-secret-refresh-token"];
+  return typeof s == "string" ? { "x-scalar-secret-refresh-token": s } : {};
+}, x = (t, s) => {
   const i = /* @__PURE__ */ new Set();
-  return { flows: x(t ?? {}).reduce((r, [e, s]) => {
-    if (!p(s))
+  return { flows: p(t ?? {}).reduce((r, [e, c]) => {
+    if (!u(c))
       return r;
-    const o = s.selectedScopes;
-    return Array.isArray(o) && o.forEach((l) => typeof l == "string" && i.add(l)), e === "implicit" && (r.implicit = {
-      ...s,
+    const l = c.selectedScopes;
+    return Array.isArray(l) && l.forEach((d) => typeof d == "string" && i.add(d)), e === "implicit" && (r.implicit = {
+      ...c,
       ...n(
         ["x-scalar-secret-client-id", "x-scalar-secret-redirect-uri", "x-scalar-secret-token"],
-        s,
-        c?.implicit
-      )
+        c,
+        s?.implicit
+      ),
+      ...o(s?.implicit)
     }), e === "password" && (r[e] = {
-      ...s,
+      ...c,
       ...n(
         [
           "x-scalar-secret-client-id",
@@ -35,18 +39,20 @@ const u = {
           "x-scalar-secret-password",
           "x-scalar-secret-token"
         ],
-        s,
-        c?.password
-      )
+        c,
+        s?.password
+      ),
+      ...o(s?.password)
     }), e === "clientCredentials" && (r[e] = {
-      ...s,
+      ...c,
       ...n(
         ["x-scalar-secret-client-id", "x-scalar-secret-client-secret", "x-scalar-secret-token"],
-        s,
-        c?.clientCredentials
-      )
+        c,
+        s?.clientCredentials
+      ),
+      ...o(s?.clientCredentials)
     }), e === "authorizationCode" && (r[e] = {
-      ...s,
+      ...c,
       ...n(
         [
           "x-scalar-secret-client-id",
@@ -54,13 +60,14 @@ const u = {
           "x-scalar-secret-redirect-uri",
           "x-scalar-secret-token"
         ],
-        s,
-        c?.authorizationCode
-      )
+        c,
+        s?.authorizationCode
+      ),
+      ...o(s?.authorizationCode)
     }), r;
   }, {}), selectedScopes: Array.from(i) };
-}, w = (t, c, i, a) => {
-  const r = c.getAuthSecrets(a, i);
+}, S = (t, s, i, a) => {
+  const r = s.getAuthSecrets(a, i);
   if (t.type === "apiKey") {
     const e = r?.type === "apiKey" ? r : void 0;
     return {
@@ -78,15 +85,15 @@ const u = {
     };
   }
   if (t.type === "oauth2") {
-    const e = r?.type === "oauth2" ? r : void 0, s = d(t.flows, e);
+    const e = r?.type === "oauth2" ? r : void 0, c = x(t.flows, e);
     return {
       ...t,
-      flows: s.flows,
-      "x-default-scopes": s.selectedScopes
+      flows: c.flows,
+      "x-default-scopes": c.selectedScopes
     };
   }
   if (t.type === "openIdConnect") {
-    const e = r?.type === "openIdConnect" ? r : void 0, s = d(
+    const e = r?.type === "openIdConnect" ? r : void 0, c = x(
       {
         implicit: e?.implicit,
         password: e?.password,
@@ -97,11 +104,11 @@ const u = {
     );
     return {
       ...t,
-      ...x(s.flows).length ? { flows: s.flows } : {}
+      ...p(c.flows).length ? { flows: c.flows } : {}
     };
   }
   return t;
 };
 export {
-  w as extractSecuritySchemeSecrets
+  S as extractSecuritySchemeSecrets
 };

package/dist/v2/blocks/scalar-auth-selector-block/helpers/oauth.d.ts

@@ -1,10 +1,14 @@
 import type { ServerObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
 import type { ErrorResponse } from '../../../../libs/errors.js';
 import type { OAuthFlowsObjectSecret } from '../../../../v2/blocks/scalar-auth-selector-block/helpers/secret-types';
+export type OAuth2Tokens = {
+    accessToken: string;
+    refreshToken?: string;
+};
 /**
  * Authorize oauth2 flow
  *
- * @returns the accessToken
+ * @returns the resolved oauth2 tokens
  */
 export declare const authorizeOauth2: (flows: OAuthFlowsObjectSecret, type: keyof OAuthFlowsObjectSecret, selectedScopes: string[], 
 /** We use the active server to set a base for relative redirect uris */
@@ -12,5 +16,5 @@ activeServer: ServerObject | null,
 /** If we want to use the proxy */
 proxyUrl: string, 
 /** Flattened environment variables used to resolve server URL templates like `{protocol}` */
-environmentVariables?: Record<string, string>) => Promise<ErrorResponse<string>>;
+environmentVariables?: Record<string, string>) => Promise<ErrorResponse<OAuth2Tokens>>;
 //# sourceMappingURL=oauth.d.ts.map

package/dist/v2/blocks/scalar-auth-selector-block/helpers/oauth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/oauth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAA;AA+DzG;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,sBAAsB,EAC7B,MAAM,MAAM,sBAAsB,EAClC,gBAAgB,MAAM,EAAE;AACxB,wEAAwE;AACxE,cAAc,YAAY,GAAG,IAAI;AACjC,kCAAkC;AAClC,UAAU,MAAM;AAChB,6FAA6F;AAC7F,uBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,KAChD,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAqL/B,CAAA"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/oauth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAA;AAYzG,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAqDD;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,sBAAsB,EAC7B,MAAM,MAAM,sBAAsB,EAClC,gBAAgB,MAAM,EAAE;AACxB,wEAAwE;AACxE,cAAc,YAAY,GAAG,IAAI;AACjC,kCAAkC;AAClC,UAAU,MAAM;AAChB,6FAA6F;AAC7F,uBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,KAChD,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAwLrC,CAAA"}

package/dist/v2/blocks/scalar-auth-selector-block/helpers/oauth.js

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

package/dist/v2/blocks/scalar-auth-selector-block/helpers/secret-types.d.ts

@@ -1,7 +1,7 @@
-import type { XScalarSecretClientId, XScalarSecretClientSecret, XScalarSecretHTTP, XScalarSecretRedirectUri, XScalarSecretToken } from '@scalar/workspace-store/schemas/extensions/security';
+import type { XScalarSecretClientId, XScalarSecretClientSecret, XScalarSecretHTTP, XScalarSecretRedirectUri, XScalarSecretRefreshToken, XScalarSecretToken } from '@scalar/workspace-store/schemas/extensions/security';
 import type { OAuthFlowAuthorizationCode, OAuthFlowClientCredentials, OAuthFlowImplicit, OAuthFlowPassword } from '@scalar/workspace-store/schemas/v3.1/strict/oauth-flow';
 import type { ApiKeyObject, HttpObject, OAuth2Object, OpenIdConnectObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
-type OAuthFlowCommonSecret = XScalarSecretClientId & XScalarSecretToken;
+type OAuthFlowCommonSecret = XScalarSecretClientId & XScalarSecretToken & XScalarSecretRefreshToken;
 export type OAuthFlowImplicitSecret = OAuthFlowImplicit & OAuthFlowCommonSecret & XScalarSecretRedirectUri;
 export type OAuthFlowPasswordSecret = OAuthFlowPassword & OAuthFlowCommonSecret & XScalarSecretHTTP & XScalarSecretClientSecret;
 export type OAuthFlowClientCredentialsSecret = OAuthFlowClientCredentials & OAuthFlowCommonSecret & XScalarSecretClientSecret;

package/dist/v2/blocks/scalar-auth-selector-block/helpers/secret-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret-types.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/secret-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,qDAAqD,CAAA;AAC5D,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,mBAAmB,EACpB,MAAM,8DAA8D,CAAA;AAErE,KAAK,qBAAqB,GAAG,qBAAqB,GAAG,kBAAkB,CAAA;AAEvE,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,qBAAqB,GAAG,wBAAwB,CAAA;AAE1G,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GACrD,qBAAqB,GACrB,iBAAiB,GACjB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,GACzB,wBAAwB,CAAA;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;IACpD,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAClE,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;AAClF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAChG,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAEhG,MAAM,MAAM,0BAA0B,GAClC,kBAAkB,GAClB,gBAAgB,GAChB,kBAAkB,GAClB,yBAAyB,CAAA"}
+{"version":3,"file":"secret-types.d.ts","sourceRoot":"","sources":["../../../../../src/v2/blocks/scalar-auth-selector-block/helpers/secret-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,qDAAqD,CAAA;AAC5D,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,wDAAwD,CAAA;AAC/D,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,mBAAmB,EACpB,MAAM,8DAA8D,CAAA;AAErE,KAAK,qBAAqB,GAAG,qBAAqB,GAAG,kBAAkB,GAAG,yBAAyB,CAAA;AAEnG,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,qBAAqB,GAAG,wBAAwB,CAAA;AAE1G,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GACrD,qBAAqB,GACrB,iBAAiB,GACjB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,CAAA;AAE3B,MAAM,MAAM,gCAAgC,GAAG,0BAA0B,GACvE,qBAAqB,GACrB,yBAAyB,GACzB,wBAAwB,CAAA;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,QAAQ,CAAC,EAAE,uBAAuB,CAAA;IAClC,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;IACpD,iBAAiB,CAAC,EAAE,gCAAgC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAClE,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;AAClF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAChG,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAAA;AAEhG,MAAM,MAAM,0BAA0B,GAClC,kBAAkB,GAClB,gBAAgB,GAChB,kBAAkB,GAClB,yBAAyB,CAAA"}