@scalar/api-client 2.1.42 → 2.1.43

package/dist/views/Request/RequestSection/RequestAuth/OAuth2.vue.d.ts

@@ -1,4 +1,4 @@
-import type { SecuritySchemeOauth2, SecuritySchemeOauth2ExampleValue } from '@scalar/oas-utils/entities/spec';
+import { type SecuritySchemeOauth2, type SecuritySchemeOauth2ExampleValue } from '@scalar/oas-utils/entities/spec';
 declare const _default: import("vue").DefineComponent<{
     example: SecuritySchemeOauth2ExampleValue;
     scheme: SecuritySchemeOauth2;

package/dist/views/Request/RequestSection/RequestAuth/OAuth2.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OAuth2.vue.d.ts","sourceRoot":"","sources":["../../../../../src/views/Request/RequestSection/RequestAuth/OAuth2.vue"],"names":[],"mappings":"AAqNA,OAAO,KAAK,EACV,oBAAoB,EACpB,gCAAgC,EACjC,MAAM,iCAAiC,CAAA;;aAO7B,gCAAgC;YACjC,oBAAoB;;aADnB,gCAAgC;YACjC,oBAAoB;;AAshB9B,wBAMG"}
+{"version":3,"file":"OAuth2.vue.d.ts","sourceRoot":"","sources":["../../../../../src/views/Request/RequestSection/RequestAuth/OAuth2.vue"],"names":[],"mappings":"AA4OA,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,gCAAgC,EAEtC,MAAM,iCAAiC,CAAA;;aAQ7B,gCAAgC;YACjC,oBAAoB;;aADnB,gCAAgC;YACjC,oBAAoB;;AAwkB9B,wBAMG"}

package/dist/views/Request/RequestSection/RequestAuth/OAuth2.vue.js

@@ -1,46 +1,48 @@
-import { defineComponent as T, openBlock as s, createElementBlock as w, Fragment as y, createVNode as t, unref as d, withCtx as o, createTextVNode as u, createElementVNode as U, createBlock as f, createCommentVNode as n } from "vue";
+import { defineComponent as F, openBlock as r, createElementBlock as w, Fragment as y, createVNode as d, unref as a, withCtx as o, createTextVNode as u, createElementVNode as U, createBlock as m, createCommentVNode as n } from "vue";
 import i from "../RequestAuthDataTableInput.vue.js";
 import { useLoadingState as x, ScalarButton as c } from "@scalar/components";
-import F from "./OAuthScopesInput.vue.js";
-import r from "../../../../components/DataTable/DataTableRow.vue.js";
-import { authorizeOauth2 as A } from "../../libs/oauth2.js";
-import { useWorkspace as B } from "../../../../store/store.js";
-const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8 flex items-center justify-self-end" }, P = /* @__PURE__ */ T({
+import { pkceOptions as P } from "@scalar/oas-utils/entities/spec";
+import { useToasts as A } from "@scalar/use-toasts";
+import B from "./OAuthScopesInput.vue.js";
+import s from "../../../../components/DataTable/DataTableRow.vue.js";
+import { authorizeOauth2 as O } from "../../libs/oauth2.js";
+import { useWorkspace as I } from "../../../../store/store.js";
+const R = { class: "h-8 flex items-center justify-self-end" }, b = { class: "h-8 flex items-center justify-self-end" }, W = /* @__PURE__ */ F({
   __name: "OAuth2",
   props: {
     example: {},
     scheme: {}
   },
-  setup($) {
-    const m = $, h = x(), {
+  setup(g) {
+    const p = g, h = x(), { toast: $ } = A(), {
       activeCollection: V,
-      activeServer: g,
-      collectionMutators: v,
-      isReadOnly: S,
-      securitySchemeMutators: z
-    } = B(), p = (l, e) => V.value && v.edit(V.value.uid, l, e), k = (l, e) => z.edit(m.scheme.uid, l, e), C = async () => {
-      var e;
-      if (h.isLoading || !((e = V.value) != null && e.uid)) return;
+      activeServer: v,
+      collectionMutators: S,
+      isReadOnly: z,
+      securitySchemeMutators: C
+    } = I(), f = (l, e) => V.value && S.edit(V.value.uid, l, e), k = (l, e) => C.edit(p.scheme.uid, l, e), T = async () => {
+      var t;
+      if (h.isLoading || !((t = V.value) != null && t.uid)) return;
       h.startLoading();
-      const l = await A(
-        m.scheme,
-        m.example,
-        g.value
+      const [l, e] = await O(
+        p.scheme,
+        p.example,
+        v.value
       ).finally(() => h.stopLoading());
-      l && p(`auth.${m.scheme.uid}.token`, l);
+      e ? f(`auth.${p.scheme.uid}.token`, e) : (console.error(l), $((l == null ? void 0 : l.message) ?? "Failed to authorize", "error"));
     };
-    return (l, e) => l.example.token ? (s(), w(y, { key: 0 }, [
-      t(d(r), null, {
+    return (l, e) => l.example.token ? (r(), w(y, { key: 0 }, [
+      d(a(s), null, {
         default: o(() => [
-          t(i, {
+          d(i, {
             id: "oauth2-access-token",
             class: "border-r-transparent",
             modelValue: l.example.token,
             placeholder: "QUxMIFlPVVIgQkFTRSBBUkUgQkVMT05HIFRPIFVT",
             type: "password",
-            "onUpdate:modelValue": e[0] || (e[0] = (a) => p(`auth.${m.scheme.uid}.token`, a))
+            "onUpdate:modelValue": e[0] || (e[0] = (t) => f(`auth.${p.scheme.uid}.token`, t))
           }, {
-            default: o(() => e[9] || (e[9] = [
+            default: o(() => e[10] || (e[10] = [
               u(" Access Token ")
             ])),
             _: 1
@@ -48,17 +50,17 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       }),
-      t(d(r), { class: "min-w-full" }, {
+      d(a(s), { class: "min-w-full" }, {
         default: o(() => [
-          U("div", I, [
-            t(d(c), {
+          U("div", R, [
+            d(a(c), {
               class: "p-0 py-0.5 px-2 mr-1",
-              loading: d(h),
+              loading: a(h),
               size: "sm",
               variant: "outlined",
-              onClick: e[1] || (e[1] = (a) => p(`auth.${m.scheme.uid}.token`, ""))
+              onClick: e[1] || (e[1] = (t) => f(`auth.${p.scheme.uid}.token`, ""))
             }, {
-              default: o(() => e[10] || (e[10] = [
+              default: o(() => e[11] || (e[11] = [
                 u(" Clear ")
               ])),
               _: 1
@@ -67,29 +69,29 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       })
-    ], 64)) : (s(), w(y, { key: 1 }, [
-      d(S) ? n("", !0) : (s(), f(d(r), { key: 0 }, {
+    ], 64)) : (r(), w(y, { key: 1 }, [
+      a(z) ? n("", !0) : (r(), m(a(s), { key: 0 }, {
         default: o(() => [
-          "authorizationUrl" in l.scheme.flow ? (s(), f(i, {
+          "authorizationUrl" in l.scheme.flow ? (r(), m(i, {
             key: 0,
             id: `oauth2-authorization-url-${l.scheme.uid}`,
             modelValue: l.scheme.flow.authorizationUrl,
             placeholder: "https://galaxy.scalar.com/authorize",
-            "onUpdate:modelValue": e[2] || (e[2] = (a) => k("flow.authorizationUrl", a))
+            "onUpdate:modelValue": e[2] || (e[2] = (t) => k("flow.authorizationUrl", t))
           }, {
-            default: o(() => e[11] || (e[11] = [
+            default: o(() => e[12] || (e[12] = [
               u(" Auth Url ")
             ])),
             _: 1
           }, 8, ["id", "modelValue"])) : n("", !0),
-          "tokenUrl" in l.scheme.flow ? (s(), f(i, {
+          "tokenUrl" in l.scheme.flow ? (r(), m(i, {
             key: 1,
             id: `oauth2-token-url-${l.scheme.uid}`,
             modelValue: l.scheme.flow.tokenUrl,
             placeholder: "https://galaxy.scalar.com/token",
-            "onUpdate:modelValue": e[3] || (e[3] = (a) => k("flow.tokenUrl", a))
+            "onUpdate:modelValue": e[3] || (e[3] = (t) => k("flow.tokenUrl", t))
           }, {
-            default: o(() => e[12] || (e[12] = [
+            default: o(() => e[13] || (e[13] = [
               u(" Token Url ")
             ])),
             _: 1
@@ -97,15 +99,15 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       })),
-      "x-scalar-redirect-uri" in l.scheme.flow ? (s(), f(d(r), { key: 1 }, {
+      "x-scalar-redirect-uri" in l.scheme.flow ? (r(), m(a(s), { key: 1 }, {
         default: o(() => [
-          t(i, {
+          d(i, {
             id: `oauth2-redirect-uri-${l.scheme.uid}`,
             modelValue: l.scheme.flow["x-scalar-redirect-uri"],
             placeholder: "https://galaxy.scalar.com/callback",
-            "onUpdate:modelValue": e[4] || (e[4] = (a) => k("flow.x-scalar-redirect-uri", a))
+            "onUpdate:modelValue": e[4] || (e[4] = (t) => k("flow.x-scalar-redirect-uri", t))
           }, {
-            default: o(() => e[13] || (e[13] = [
+            default: o(() => e[14] || (e[14] = [
               u(" Redirect Url ")
             ])),
             _: 1
@@ -113,17 +115,17 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       })) : n("", !0),
-      l.example.type === "oauth-password" ? (s(), w(y, { key: 2 }, [
-        t(d(r), null, {
+      l.example.type === "oauth-password" ? (r(), w(y, { key: 2 }, [
+        d(a(s), null, {
           default: o(() => [
-            t(i, {
+            d(i, {
               id: `oauth2-password-username-${l.scheme.uid}`,
               class: "text-c-2",
               modelValue: l.example.username,
               placeholder: "ScalarEnjoyer01",
-              "onUpdate:modelValue": e[5] || (e[5] = (a) => p(`auth.${l.scheme.uid}.username`, a))
+              "onUpdate:modelValue": e[5] || (e[5] = (t) => f(`auth.${l.scheme.uid}.username`, t))
             }, {
-              default: o(() => e[14] || (e[14] = [
+              default: o(() => e[15] || (e[15] = [
                 u(" Username ")
               ])),
               _: 1
@@ -131,16 +133,16 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
           ]),
           _: 1
         }),
-        t(d(r), null, {
+        d(a(s), null, {
           default: o(() => [
-            t(i, {
+            d(i, {
               id: `oauth2-password-password-${l.scheme.uid}`,
               modelValue: l.example.password,
               placeholder: "xxxxxx",
               type: "password",
-              "onUpdate:modelValue": e[6] || (e[6] = (a) => p(`auth.${l.scheme.uid}.password`, a))
+              "onUpdate:modelValue": e[6] || (e[6] = (t) => f(`auth.${l.scheme.uid}.password`, t))
             }, {
-              default: o(() => e[15] || (e[15] = [
+              default: o(() => e[16] || (e[16] = [
                 u(" Password ")
               ])),
               _: 1
@@ -149,15 +151,15 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
           _: 1
         })
       ], 64)) : n("", !0),
-      t(d(r), null, {
+      d(a(s), null, {
         default: o(() => [
-          t(i, {
+          d(i, {
             id: `oauth2-client-id-${l.scheme.uid}`,
             modelValue: l.scheme["x-scalar-client-id"],
             placeholder: "12345",
-            "onUpdate:modelValue": e[7] || (e[7] = (a) => k("x-scalar-client-id", a))
+            "onUpdate:modelValue": e[7] || (e[7] = (t) => k("x-scalar-client-id", t))
           }, {
-            default: o(() => e[16] || (e[16] = [
+            default: o(() => e[17] || (e[17] = [
               u(" Client ID ")
             ])),
             _: 1
@@ -165,16 +167,16 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       }),
-      "clientSecret" in l.example ? (s(), f(d(r), { key: 3 }, {
+      "clientSecret" in l.example ? (r(), m(a(s), { key: 3 }, {
         default: o(() => [
-          t(i, {
+          d(i, {
             id: `oauth2-client-secret-${l.scheme.uid}`,
             modelValue: l.example.clientSecret,
             placeholder: "XYZ123",
             type: "password",
-            "onUpdate:modelValue": e[8] || (e[8] = (a) => p(`auth.${l.scheme.uid}.clientSecret`, a))
+            "onUpdate:modelValue": e[8] || (e[8] = (t) => f(`auth.${l.scheme.uid}.clientSecret`, t))
           }, {
-            default: o(() => e[17] || (e[17] = [
+            default: o(() => e[18] || (e[18] = [
               u(" Client Secret ")
             ])),
             _: 1
@@ -182,26 +184,43 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
         ]),
         _: 1
       })) : n("", !0),
-      l.scheme.flow.scopes ? (s(), f(d(r), { key: 4 }, {
+      "x-usePkce" in l.scheme.flow ? (r(), m(a(s), { key: 4 }, {
         default: o(() => [
-          t(F, {
+          d(i, {
+            id: `oauth2-use-pkce-${l.scheme.uid}`,
+            enum: a(P),
+            modelValue: l.scheme.flow["x-usePkce"],
+            readOnly: "",
+            "onUpdate:modelValue": e[9] || (e[9] = (t) => k("flow.x-usePkce", t))
+          }, {
+            default: o(() => e[19] || (e[19] = [
+              u(" Use PKCE ")
+            ])),
+            _: 1
+          }, 8, ["id", "enum", "modelValue"])
+        ]),
+        _: 1
+      })) : n("", !0),
+      Object.keys(l.scheme.flow.scopes ?? {}).length ? (r(), m(a(s), { key: 5 }, {
+        default: o(() => [
+          d(B, {
             activeFlow: l.scheme.flow,
             updateScheme: k
           }, null, 8, ["activeFlow"])
         ]),
         _: 1
       })) : n("", !0),
-      t(d(r), { class: "min-w-full" }, {
+      d(a(s), { class: "min-w-full" }, {
         default: o(() => [
-          U("div", R, [
-            t(d(c), {
+          U("div", b, [
+            d(a(c), {
               class: "p-0 py-0.5 px-2 mr-1",
-              loading: d(h),
+              loading: a(h),
               size: "sm",
               variant: "outlined",
-              onClick: C
+              onClick: T
             }, {
-              default: o(() => e[18] || (e[18] = [
+              default: o(() => e[20] || (e[20] = [
                 u(" Authorize ")
               ])),
               _: 1
@@ -214,5 +233,5 @@ const I = { class: "h-8 flex items-center justify-self-end" }, R = { class: "h-8
   }
 });
 export {
-  P as default
+  W as default
 };

package/dist/views/Request/RequestSection/RequestAuthDataTableInput.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestAuthDataTableInput.vue.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/RequestSection/RequestAuthDataTableInput.vue"],"names":[],"mappings":"AAmFA,iBAAS,cAAc;qBAiGO,GAAG;kBACN,GAAG;EAuB7B;AACD,QAAA,MAAM,eAAe;QAzJb,MAAM;WACH,MAAM;qBACI,MAAM;eACZ,OAAO;gBACN,MAAM,GAAG,MAAM;eAChB,OAAO;;;;;;;QALd,MAAM;WACH,MAAM;qBACI,MAAM;eACZ,OAAO;gBACN,MAAM,GAAG,MAAM;eAChB,OAAO;;;;;;;cAFP,OAAO;cAEP,OAAO;6EAiKpB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAAvG,wBAAwG;AAexG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACpC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}
+{"version":3,"file":"RequestAuthDataTableInput.vue.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/RequestSection/RequestAuthDataTableInput.vue"],"names":[],"mappings":"AAoFA,iBAAS,cAAc;qBAiGO,GAAG;kBACN,GAAG;EAuB7B;AACD,QAAA,MAAM,eAAe;QAzJb,MAAM;WACH,MAAM;qBACI,MAAM;eACZ,OAAO;gBACN,MAAM,GAAG,MAAM;eAChB,OAAO;;;;;;;QALd,MAAM;WACH,MAAM;qBACI,MAAM;eACZ,OAAO;gBACN,MAAM,GAAG,MAAM;eAChB,OAAO;;;;;;;cAFP,OAAO;cAEP,OAAO;6EAiKpB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAAvG,wBAAwG;AAexG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACpC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}

package/dist/views/Request/RequestSection/RequestAuthDataTableInput.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent as d, openBlock as i, createBlock as p, mergeProps as m, withCtx as a, createElementVNode as f, renderSlot as r } from "vue";
+import { defineComponent as s, openBlock as i, createBlock as p, mergeProps as m, withCtx as a, createElementVNode as f, renderSlot as r } from "vue";
 import V from "../../../components/DataTable/DataTableInput.vue.js";
-const y = ["for"], C = /* @__PURE__ */ d({
+const y = ["for"], B = /* @__PURE__ */ s({
   __name: "RequestAuthDataTableInput",
   props: {
     id: {},
@@ -11,24 +11,25 @@ const y = ["for"], C = /* @__PURE__ */ d({
     readOnly: { type: Boolean, default: !1 }
   },
   emits: ["update:modelValue", "inputFocus", "inputBlur", "selectVariable"],
-  setup(u, { emit: s }) {
-    const t = u, o = s;
-    return (n, e) => (i(), p(V, m({
-      id: t.id,
-      containerClass: t.containerClass,
-      modelValue: t.modelValue,
-      readOnly: t.readOnly,
-      required: t.required,
-      type: t.type
+  setup(u, { emit: d }) {
+    const e = u, o = d;
+    return (n, t) => (i(), p(V, m({
+      id: e.id,
+      canAddCustomEnumValue: !e.readOnly,
+      containerClass: e.containerClass,
+      modelValue: e.modelValue,
+      readOnly: e.readOnly,
+      required: e.required,
+      type: e.type
     }, n.$attrs, {
-      onInputBlur: e[0] || (e[0] = (l) => o("inputBlur")),
-      onInputFocus: e[1] || (e[1] = (l) => o("inputFocus")),
-      onSelectVariable: e[2] || (e[2] = (l) => o("selectVariable", l)),
-      "onUpdate:modelValue": e[3] || (e[3] = (l) => o("update:modelValue", l))
+      onInputBlur: t[0] || (t[0] = (l) => o("inputBlur")),
+      onInputFocus: t[1] || (t[1] = (l) => o("inputFocus")),
+      onSelectVariable: t[2] || (t[2] = (l) => o("selectVariable", l)),
+      "onUpdate:modelValue": t[3] || (t[3] = (l) => o("update:modelValue", l))
     }), {
       default: a(() => [
         f("label", {
-          for: t.id
+          for: e.id
         }, [
           r(n.$slots, "default")
         ], 8, y)
@@ -37,9 +38,9 @@ const y = ["for"], C = /* @__PURE__ */ d({
         r(n.$slots, "icon")
       ]),
       _: 3
-    }, 16, ["id", "containerClass", "modelValue", "readOnly", "required", "type"]));
+    }, 16, ["id", "canAddCustomEnumValue", "containerClass", "modelValue", "readOnly", "required", "type"]));
   }
 });
 export {
-  C as default
+  B as default
 };

package/dist/views/Request/ResponseSection/ResponseEmpty.vue2.js

@@ -14,7 +14,7 @@ const B = { class: "relative col-1 flex-center gap-6 p-2 capitalize" }, S = { cl
       s.commandPalette.emit({ commandName: "Create Request" });
     }, c = (n) => {
       n != null && n.createNew && y.name === "request" && m();
-    }, k = "2.1.42";
+    }, k = "2.1.43";
     return _(() => s.hotKeys.on(c)), b(() => s.hotKeys.off(c)), (n, e) => (r(), l("div", B, [
       t("div", S, [
         o(f).isReadOnly ? u("", !0) : (r(), l("div", h, [

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

@@ -1,9 +1,10 @@
-import { createSchemeValueSet as t, displaySchemeFormatter as a } from "./auth.js";
-import { authorizeOauth2 as h, authorizeServers as m, isOauth2Example as u } from "./oauth2.js";
+import { createSchemeValueSet as a, displaySchemeFormatter as t } from "./auth.js";
+import { authorizeOauth2 as h, authorizeServers as m, generateCodeChallenge as l, isOauth2Example as u } from "./oauth2.js";
 export {
   h as authorizeOauth2,
   m as authorizeServers,
-  t as createSchemeValueSet,
-  a as displaySchemeFormatter,
+  a as createSchemeValueSet,
+  t as displaySchemeFormatter,
+  l as generateCodeChallenge,
   u as isOauth2Example
 };

package/dist/views/Request/libs/oauth2.d.ts

@@ -1,3 +1,4 @@
+import type { ErrorResponse } from '../../../libs/index.js';
 import type { SecuritySchemeExampleValue, SecuritySchemeOauth2, SecuritySchemeOauth2ExampleValue, Server } from '@scalar/oas-utils/entities/spec';
 /** Oauth2 security schemes which are not implicit */
 type SecuritySchemeOauth2NonImplicit = Omit<SecuritySchemeOauth2, 'flow'> & {
@@ -7,16 +8,25 @@ type SecuritySchemeOauth2NonImplicit = Omit<SecuritySchemeOauth2, 'flow'> & {
 };
 /** Type guard to check for oauth2 example */
 export declare const isOauth2Example: (example: SecuritySchemeExampleValue) => example is SecuritySchemeOauth2ExampleValue;
+type PKCEState = {
+    codeVerifier: string;
+    codeChallenge: string;
+    codeChallengeMethod: string;
+};
+/**
+ * Creates a code challenge from the code verifier
+ */
+export declare const generateCodeChallenge: (verifier: string, encoding: "SHA-256" | "plain") => Promise<string>;
 /**
  * Authorize oauth2 flow
  *
  * @returns the accessToken
  */
-export declare const authorizeOauth2: (scheme: SecuritySchemeOauth2, example: SecuritySchemeOauth2ExampleValue, activeServer: Server) => Promise<string>;
+export declare const authorizeOauth2: (scheme: SecuritySchemeOauth2, example: SecuritySchemeOauth2ExampleValue, activeServer: Server) => Promise<ErrorResponse<string>>;
 /**
  * Makes the BE authorization call to grab the token server to server
  * Used for clientCredentials and authorizationCode
  */
-export declare const authorizeServers: (scheme: SecuritySchemeOauth2NonImplicit, example: SecuritySchemeOauth2ExampleValue, scopes: string, code?: string) => Promise<string>;
+export declare const authorizeServers: (scheme: SecuritySchemeOauth2NonImplicit, example: SecuritySchemeOauth2ExampleValue, scopes: string, code?: string, pkce?: PKCEState | null) => Promise<ErrorResponse<string>>;
 export {};
 //# sourceMappingURL=oauth2.d.ts.map

package/dist/views/Request/libs/oauth2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,gCAAgC,EAChC,MAAM,EACP,MAAM,iCAAiC,CAAA;AAExC,qDAAqD;AACrD,KAAK,+BAA+B,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,GAAG;IAC1E,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAClE,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,eAAe,YACjB,0BAA0B,KAClC,OAAO,IAAI,gCACoB,CAAA;AAElC;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAClB,oBAAoB,WACnB,gCAAgC,gBAE3B,MAAM,oBA4HlB,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WACnB,+BAA+B,WAC9B,gCAAgC,UACjC,MAAM,SACP,MAAM,KACZ,OAAO,CAAC,MAAM,CAqDhB,CAAA"}
+{"version":3,"file":"oauth2.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,gCAAgC,EAChC,MAAM,EACP,MAAM,iCAAiC,CAAA;AAExC,qDAAqD;AACrD,KAAK,+BAA+B,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,GAAG;IAC1E,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAClE,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,eAAe,YACjB,0BAA0B,KAClC,OAAO,IAAI,gCACoB,CAAA;AAElC,KAAK,SAAS,GAAG;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAmBD;;GAEG;AACH,eAAO,MAAM,qBAAqB,aACtB,MAAM,YACN,SAAS,GAAG,OAAO,KAC5B,OAAO,CAAC,MAAM,CAahB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAClB,oBAAoB,WACnB,gCAAgC,gBAE3B,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CA8J/B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WACnB,+BAA+B,WAC9B,gCAAgC,UACjC,MAAM,SACP,MAAM,SACN,SAAS,GAAG,IAAI,KACtB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAgE/B,CAAA"}

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
 };