@xylex-group/athena 2.13.0 → 3.0.0

package/dist/social-providers.cjs

@@ -167,7 +167,7 @@ async function athenaFetch(url, options = {}) {
       redirect: options.redirect ?? "follow",
       signal: options.signal
     });
-    options.onResponse?.({ response });
+    await options.onResponse?.({ response });
     if (!response.ok) {
       let message = response.statusText || `HTTP ${response.status}`;
       try {
@@ -184,7 +184,7 @@ async function athenaFetch(url, options = {}) {
         status: response.status,
         statusText: response.statusText
       };
-      options.onError?.({ response, error });
+      await options.onError?.({ response, error });
       return { data: null, error };
     }
     const contentType = response.headers.get("content-type") ?? "";
@@ -207,7 +207,7 @@ async function athenaFetch(url, options = {}) {
       status: 0,
       statusText: "NetworkError"
     };
-    options.onError?.({
+    await options.onError?.({
       response: new Response(null, { status: 502, statusText: "Network Error" }),
       error: cause
     });
@@ -304,13 +304,13 @@ async function createAuthorizationURL({
     url.searchParams.set("scope", scopes.join(scopeJoiner || " "));
   }
   url.searchParams.set("redirect_uri", options.redirectURI || redirectURI);
-  duration && url.searchParams.set("duration", duration);
-  display && url.searchParams.set("display", display);
-  loginHint && url.searchParams.set("login_hint", loginHint);
-  prompt && url.searchParams.set("prompt", prompt);
-  hd && url.searchParams.set("hd", hd);
-  accessType && url.searchParams.set("access_type", accessType);
-  responseMode && url.searchParams.set("response_mode", responseMode);
+  if (duration) url.searchParams.set("duration", duration);
+  if (display) url.searchParams.set("display", display);
+  if (loginHint) url.searchParams.set("login_hint", loginHint);
+  if (prompt) url.searchParams.set("prompt", prompt);
+  if (hd) url.searchParams.set("hd", hd);
+  if (accessType) url.searchParams.set("access_type", accessType);
+  if (responseMode) url.searchParams.set("response_mode", responseMode);
   if (codeVerifier) {
     const codeChallenge = await generateCodeChallenge(codeVerifier);
     url.searchParams.set("code_challenge_method", "S256");
@@ -354,16 +354,17 @@ function createRefreshAccessTokenRequest({
   };
   body.set("grant_type", "refresh_token");
   body.set("refresh_token", refreshToken);
+  const primaryClientId = getPrimaryClientId(options.clientId);
   if (authentication === "basic") {
-    const primaryClientId = Array.isArray(options.clientId) ? options.clientId[0] : options.clientId;
     if (primaryClientId) {
       headers["authorization"] = "Basic " + base64.encode(`${primaryClientId}:${options.clientSecret ?? ""}`);
     } else {
       headers["authorization"] = "Basic " + base64.encode(`:${options.clientSecret ?? ""}`);
     }
   } else {
-    const primaryClientId = Array.isArray(options.clientId) ? options.clientId[0] : options.clientId;
-    body.set("client_id", primaryClientId);
+    if (primaryClientId) {
+      body.set("client_id", primaryClientId);
+    }
     if (options.clientSecret) {
       body.set("client_secret", options.clientSecret);
     }
@@ -472,9 +473,15 @@ function createAuthorizationCodeRequest({
   };
   body.set("grant_type", "authorization_code");
   body.set("code", code);
-  codeVerifier && body.set("code_verifier", codeVerifier);
-  options.clientKey && body.set("client_key", options.clientKey);
-  deviceId && body.set("device_id", deviceId);
+  if (codeVerifier) {
+    body.set("code_verifier", codeVerifier);
+  }
+  if (options.clientKey) {
+    body.set("client_key", options.clientKey);
+  }
+  if (deviceId) {
+    body.set("device_id", deviceId);
+  }
   body.set("redirect_uri", options.redirectURI || redirectURI);
   if (resource) {
     if (typeof resource === "string") {
@@ -485,15 +492,16 @@ function createAuthorizationCodeRequest({
       }
     }
   }
+  const primaryClientId = getPrimaryClientId(options.clientId);
   if (authentication === "basic") {
-    const primaryClientId = Array.isArray(options.clientId) ? options.clientId[0] : options.clientId;
     const encodedCredentials = base64.encode(
-      `${primaryClientId}:${options.clientSecret ?? ""}`
+      `${primaryClientId ?? ""}:${options.clientSecret ?? ""}`
     );
     requestHeaders["authorization"] = `Basic ${encodedCredentials}`;
   } else {
-    const primaryClientId = Array.isArray(options.clientId) ? options.clientId[0] : options.clientId;
-    body.set("client_id", primaryClientId);
+    if (primaryClientId) {
+      body.set("client_id", primaryClientId);
+    }
     if (options.clientSecret) {
       body.set("client_secret", options.clientSecret);
     }
@@ -3900,8 +3908,8 @@ var wechat = (options) => {
     name: "WeChat",
     createAuthorizationURL({ state, scopes, redirectURI }) {
       const _scopes = options.disableDefaultScope ? [] : ["snsapi_login"];
-      options.scope && _scopes.push(...options.scope);
-      scopes && _scopes.push(...scopes);
+      if (options.scope) _scopes.push(...options.scope);
+      if (scopes) _scopes.push(...scopes);
       const url = new URL("https://open.weixin.qq.com/connect/qrconnect");
       url.searchParams.set("scope", _scopes.join(","));
       url.searchParams.set("response_type", "code");
@@ -4047,7 +4055,7 @@ var zoom = (userOptions) => {
         codeVerifier,
         options,
         tokenEndpoint: "https://zoom.us/oauth/token",
-        authentication: "post"
+        authentication: "basic"
       });
     },
     refreshAccessToken: options.refreshAccessToken ? options.refreshAccessToken : async (refreshToken) => refreshAccessToken({
@@ -4057,7 +4065,8 @@ var zoom = (userOptions) => {
         clientKey: options.clientKey,
         clientSecret: options.clientSecret
       },
-      tokenEndpoint: "https://zoom.us/oauth/token"
+      tokenEndpoint: "https://zoom.us/oauth/token",
+      authentication: "basic"
     }),
     async getUserInfo(token) {
       if (options.getUserInfo) {