@scalar/api-client 2.0.34 → 2.0.35

package/dist/views/Request/consts/new-auth-options.js

@@ -0,0 +1,83 @@
+const t = {
+  apiKeyCookie: {
+    label: "API Key in Cookies",
+    payload: {
+      type: "apiKey",
+      in: "cookie"
+    }
+  },
+  apiKeyHeader: {
+    label: "API Key in Headers",
+    payload: {
+      type: "apiKey",
+      in: "header"
+    }
+  },
+  apiKeyQuery: {
+    label: "API Key in Query Params",
+    payload: {
+      type: "apiKey",
+      in: "query"
+    }
+  },
+  httpBasic: {
+    label: "HTTP Basic",
+    payload: {
+      type: "http",
+      scheme: "basic"
+    }
+  },
+  httpBearer: {
+    label: "HTTP Bearer",
+    payload: {
+      type: "http",
+      scheme: "bearer"
+    }
+  },
+  oauth2Implicit: {
+    label: "Oauth2 Implicit Flow",
+    payload: {
+      type: "oauth2",
+      flow: {
+        type: "implicit"
+      }
+    }
+  },
+  oauth2Password: {
+    label: "Oauth2 Password Flow",
+    payload: {
+      type: "oauth2",
+      flow: {
+        type: "password"
+      }
+    }
+  },
+  oauth2ClientCredentials: {
+    label: "Oauth2 Client Credentials",
+    payload: {
+      type: "oauth2",
+      flow: {
+        type: "clientCredentials"
+      }
+    }
+  },
+  oauth2AuthorizationFlow: {
+    label: "Oauth2 Authorization Code",
+    payload: {
+      type: "oauth2",
+      flow: {
+        type: "authorizationCode"
+      }
+    }
+  }
+}, l = Object.entries(t), o = l.map(
+  ([a, e]) => ({
+    id: a,
+    ...e,
+    labelWithoutId: e.label
+  })
+);
+export {
+  t as ADD_AUTH_DICT,
+  o as ADD_AUTH_OPTIONS
+};

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

@@ -1,26 +1,13 @@
-import type { SecuritySchemeOauth2, SelectedSchemeOauth2 } from '@scalar/oas-utils/entities/workspace/security';
-export type SecuritySchemeOptionBase = {
-    id: string;
-    label: string;
-};
-export type SecuritySchemeOptionOauth = SecuritySchemeOptionBase & {
-    flowKey: keyof SecuritySchemeOauth2['flows'];
-    uid: string;
-};
-/** Type for the dropdown options */
-export type SecuritySchemeOption = {
-    id: string;
-    label: string;
-} | SecuritySchemeOptionOauth;
+import type { SecuritySchemeOauth2 } from '@scalar/oas-utils/entities/workspace/security';
 /**
  * Authorize oauth2 flow
  *
  * @returns the accessToken
  */
-export declare const authorizeOauth2: (activeScheme: SelectedSchemeOauth2, schemeModel: SecuritySchemeOptionOauth) => Promise<string>;
+export declare const authorizeOauth2: (scheme: SecuritySchemeOauth2) => Promise<string>;
 /**
  * Makes the BE authorization call to grab the token server to server
  * Used for clientCredentials and authorizationCode
  */
-export declare const authorizeServers: (activeScheme: SelectedSchemeOauth2, code?: string) => Promise<string>;
+export declare const authorizeServers: (scheme: SecuritySchemeOauth2, code?: string) => Promise<string>;
 //# 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,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,+CAA+C,CAAA;AAEtD,MAAM,MAAM,wBAAwB,GAAG;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,MAAM,MAAM,yBAAyB,GAAG,wBAAwB,GAAG;IACjE,OAAO,EAAE,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAC5C,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,oCAAoC;AACpC,MAAM,MAAM,oBAAoB,GAC5B;IACE,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,GACD,yBAAyB,CAAA;AAE7B;;;;GAIG;AACH,eAAO,MAAM,eAAe,iBACZ,oBAAoB,eACrB,yBAAyB,oBAgFpC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,gBAAgB,iBACb,oBAAoB,SAC3B,MAAM,KACZ,OAAO,CAAC,MAAM,CAwDhB,CAAA"}
+{"version":3,"file":"oauth2.d.ts","sourceRoot":"","sources":["../../../../src/views/Request/libs/oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAA;AAEzF;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAAY,oBAAoB,oBA2ExD,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WACnB,oBAAoB,SACrB,MAAM,KACZ,OAAO,CAAC,MAAM,CAwDhB,CAAA"}

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

@@ -1,51 +1,48 @@
-const _ = (r, n) => new Promise((t, o) => {
-  const { flow: a, scheme: e } = r;
-  if (n.flowKey === "clientCredentials" || n.flowKey === "password")
-    p(r).then(t).catch(o);
+const p = (t) => new Promise((r, n) => {
+  if (t.flow.type === "clientCredentials" || t.flow.type === "password")
+    u(t).then(r).catch(n);
   else {
-    const d = a.selectedScopes.join(" "), w = (Math.random() + 1).toString(36).substring(7), s = new URL(
-      "authorizationUrl" in a ? a.authorizationUrl : a.tokenUrl
-    );
-    n.flowKey === "implicit" ? s.searchParams.set("response_type", "token") : n.flowKey === "authorizationCode" && s.searchParams.set("response_type", "code"), s.searchParams.set("client_id", e.clientId), s.searchParams.set("redirect_uri", e.redirectUri), s.searchParams.set("scope", d), s.searchParams.set("state", w);
-    const i = window.open(s, "openAuth2Window", "left=100,top=100,width=800,height=600");
+    const e = t.flow.selectedScopes.join(" "), a = (Math.random() + 1).toString(36).substring(7), o = new URL(t.flow.authorizationUrl);
+    t.flow.type === "implicit" ? o.searchParams.set("response_type", "token") : t.flow.type === "authorizationCode" && o.searchParams.set("response_type", "code"), o.searchParams.set("client_id", t.clientId), o.searchParams.set("redirect_uri", t.flow.redirectUri), o.searchParams.set("scope", e), o.searchParams.set("state", a);
+    const i = window.open(o, "openAuth2Window", "left=100,top=100,width=800,height=600");
     if (i) {
-      const f = setInterval(function() {
-        var u;
-        let c = null, h = null;
+      const d = setInterval(function() {
+        var f;
+        let s = null, c = null;
         try {
           const l = new URL(i.location.href).searchParams;
-          c = l.get("access_token"), h = l.get("code");
+          s = l.get("access_token"), c = l.get("code");
         } catch {
         }
-        if (i.closed || c || h)
-          if (clearInterval(f), i.close(), c) {
-            const l = (u = i.location.href.match(/state=([^&]*)/)) == null ? void 0 : u[1];
-            c && l === w && t(c);
-          } else h ? p(r, h).then(t).catch(o) : (clearInterval(f), o(
+        if (i.closed || s || c)
+          if (clearInterval(d), i.close(), s) {
+            const l = (f = i.location.href.match(/state=([^&]*)/)) == null ? void 0 : f[1];
+            s && l === a && r(s);
+          } else c ? u(t, c).then(r).catch(n) : (clearInterval(d), n(
             new Error("Window was closed without granting authorization")
           ));
       }, 200);
     }
   }
-}), p = async (r, n) => {
-  if (!("clientSecret" in r.flow))
+}), u = async (t, r) => {
+  if (!("clientSecret" in t.flow))
     throw new Error(
       "Authorize Servers only works for Client Credentials or Authorization Code flow"
     );
-  if (!r.flow) throw new Error("OAuth2 flow was not defined");
-  const { flow: t, scheme: o } = r, a = t.selectedScopes.join(" "), e = new URLSearchParams();
-  e.set("client_id", o.clientId), e.set("scope", a), t.clientSecret && e.set("client_secret", t.clientSecret), o.redirectUri && e.set("redirect_uri", o.redirectUri), n && (e.set("code", n), e.set("grant_type", "authorization_code")), "secondValue" in t ? (e.set("grant_type", "password"), e.set("username", t.value), e.set("password", t.secondValue)) : e.set("grant_type", "client_credentials");
+  if (!t.flow) throw new Error("OAuth2 flow was not defined");
+  const n = t.flow.selectedScopes.join(" "), e = new URLSearchParams();
+  e.set("client_id", t.clientId), e.set("scope", n), t.flow.clientSecret && e.set("client_secret", t.flow.clientSecret), "redirectUri" in t.flow && e.set("redirect_uri", t.flow.redirectUri), r && (e.set("code", r), e.set("grant_type", "authorization_code")), "secondValue" in t.flow ? (e.set("grant_type", "password"), e.set("username", t.flow.value), e.set("password", t.flow.secondValue)) : e.set("grant_type", "client_credentials");
   try {
-    const d = {
+    const a = {
       "Content-Type": "application/x-www-form-urlencoded"
     };
-    o.clientId && t.clientSecret && (d.Authorization = `Basic ${btoa(`${o.clientId}:${t.clientSecret}`)}`);
-    const w = await fetch(t.tokenUrl, {
+    t.clientId && t.flow.clientSecret && (a.Authorization = `Basic ${btoa(`${t.clientId}:${t.flow.clientSecret}`)}`);
+    const o = await fetch(t.flow.tokenUrl, {
       method: "POST",
-      headers: d,
+      headers: a,
       body: e
-    }), { access_token: s } = await w.json();
-    return s;
+    }), { access_token: w } = await o.json();
+    return w;
   } catch {
     throw new Error(
       "Failed to get an access token. Please check your credentials."
@@ -53,6 +50,6 @@ const _ = (r, n) => new Promise((t, o) => {
   }
 };
 export {
-  _ as authorizeOauth2,
-  p as authorizeServers
+  p as authorizeOauth2,
+  u as authorizeServers
 };

package/package.json

@@ -18,7 +18,7 @@
     "rest",
     "testing"
   ],
-  "version": "2.0.34",
+  "version": "2.0.35",
   "engines": {
     "node": ">=18"
   },
@@ -33,6 +33,10 @@
       "import": "./dist/views/Request/libs/index.js",
       "types": "./dist/views/Request/libs/index.d.ts"
     },
+    "./views/Request/consts": {
+      "import": "./dist/views/Request/consts/index.js",
+      "types": "./dist/views/Request/consts/index.d.ts"
+    },
     "./views/Request/components": {
       "import": "./dist/views/Request/components/index.js",
       "types": "./dist/views/Request/components/index.d.ts"
@@ -122,14 +126,14 @@
     "vue": "^3.4.29",
     "vue-router": "^4.3.0",
     "zod": "^3.22.4",
-    "@scalar/components": "0.12.21",
-    "@scalar/oas-utils": "0.2.18",
-    "@scalar/object-utils": "1.1.5",
+    "@scalar/components": "0.12.22",
     "@scalar/draggable": "0.1.3",
+    "@scalar/oas-utils": "0.2.19",
+    "@scalar/object-utils": "1.1.5",
     "@scalar/themes": "0.9.16",
     "@scalar/use-codemirror": "0.11.8",
-    "@scalar/use-tooltip": "1.0.2",
-    "@scalar/use-toasts": "0.7.4"
+    "@scalar/use-toasts": "0.7.4",
+    "@scalar/use-tooltip": "1.0.2"
   },
   "devDependencies": {
     "@types/content-type": "^1.1.8",