thirdweb 5.37.1-nightly-26d825bc4f0475523ea761aa18ab979557295c28-20240722000339 → 5.38.1-nightly-5fabe6661399615b393d1055a722b9de59bf19bb-20240724000323

package/src/wallets/in-app/web/lib/auth/{discord.ts → oauth.ts}

@@ -1,23 +1,62 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import type { AuthStoredTokenWithCookieReturnType } from "../../../../../wallets/in-app/core/authentication/type.js";
-import { getDiscordLoginPath } from "../../../core/authentication/getLoginPath.js";
+import type { SocialAuthOption } from "../../../../../wallets/types.js";
 import type { Ecosystem } from "../../types.js";
 import { DEFAULT_POP_UP_SIZE } from "./constants.js";
-import { closeWindow } from "./utils.js";
 
-export async function loginWithDiscord(options: {
+const closeWindow = ({
+  isWindowOpenedByFn,
+  win,
+  closeOpenedWindow,
+}: {
+  win?: Window | null;
+  isWindowOpenedByFn: boolean;
+  closeOpenedWindow?: (openedWindow: Window) => void;
+}) => {
+  if (isWindowOpenedByFn) {
+    win?.close();
+  } else {
+    if (win && closeOpenedWindow) {
+      closeOpenedWindow(win);
+    } else if (win) {
+      win.close();
+    }
+  }
+};
+
+export const getSocialAuthLoginPath = (
+  authOption: SocialAuthOption,
+  client: ThirdwebClient,
+  ecosystem?: Ecosystem,
+) => {
+  const baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
+  if (ecosystem?.partnerId) {
+    return `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
+  }
+  if (ecosystem) {
+    return `${baseUrl}&ecosystemId=${ecosystem.id}`;
+  }
+  return baseUrl;
+};
+
+export const loginWithOauth = async (options: {
+  authOption: SocialAuthOption;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   openedWindow?: Window | null | undefined;
   closeOpenedWindow?: ((openedWindow: Window) => void) | undefined;
-}): Promise<AuthStoredTokenWithCookieReturnType> {
+}): Promise<AuthStoredTokenWithCookieReturnType> => {
   let win = options.openedWindow;
   let isWindowOpenedByFn = false;
   if (!win) {
     win = window.open(
-      getDiscordLoginPath(options.client, options.ecosystem),
-      "Login to discord",
+      getSocialAuthLoginPath(
+        options.authOption,
+        options.client,
+        options.ecosystem,
+      ),
+      `Login to ${options.authOption}`,
       DEFAULT_POP_UP_SIZE,
     );
     isWindowOpenedByFn = true;
@@ -30,9 +69,6 @@ export async function loginWithDiscord(options: {
     (resolve, reject) => {
       // detect when the user closes the login window
       const pollTimer = window.setInterval(async () => {
-        if (!win) {
-          return;
-        }
         if (win.closed) {
           clearInterval(pollTimer);
           window.removeEventListener("message", messageListener);
@@ -89,4 +125,4 @@ export async function loginWithDiscord(options: {
     },
   );
   return result;
-}
+};

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -10,13 +10,12 @@ import {
   type SendEmailOtpReturnType,
   type SingleStepAuthArgsType,
   UserWalletStatus,
-  oauthStrategyToAuthProvider,
 } from "../../core/authentication/type.js";
 import type { InAppConnector } from "../../core/interfaces/connector.js";
 import type { InAppWalletConstructorType } from "../types.js";
 import { InAppWalletIframeCommunicator } from "../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
-import { loginWithDiscord } from "./auth/discord.js";
 import { Auth, type AuthQuerierTypes } from "./auth/iframe-auth.js";
+import { loginWithOauth } from "./auth/oauth.js";
 import { loginWithPasskey, registerPasskey } from "./auth/passkeys.js";
 import { IFrameWallet } from "./in-app-account.js";
 
@@ -169,16 +168,6 @@ export class InAppWebConnector implements InAppConnector {
           phoneNumber: args.phoneNumber,
         });
       }
-      case "apple":
-      case "facebook":
-      case "google": {
-        const oauthProvider = oauthStrategyToAuthProvider[strategy];
-        return this.auth.loginWithOauth({
-          oauthProvider,
-          closeOpenedWindow: args.closeOpenedWindow,
-          openedWindow: args.openedWindow,
-        });
-      }
       case "jwt": {
         return this.auth.loginWithCustomJwt({
           jwt: args.jwt,
@@ -216,8 +205,12 @@ export class InAppWebConnector implements InAppConnector {
         });
         return this.auth.loginWithAuthToken(authToken);
       }
+      case "apple":
+      case "facebook":
+      case "google":
       case "discord": {
-        const authToken = await loginWithDiscord({
+        const authToken = await loginWithOauth({
+          authOption: strategy,
           client: this.wallet.client,
           ecosystem: this.wallet.ecosystem,
           closeOpenedWindow: args.closeOpenedWindow,

package/dist/cjs/wallets/in-app/web/lib/auth/discord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"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"}

package/dist/cjs/wallets/in-app/web/lib/auth/utils.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeWindow = void 0;
-const closeWindow = ({ isWindowOpenedByFn, win, closeOpenedWindow, }) => {
-    if (isWindowOpenedByFn) {
-        win?.close();
-    }
-    else {
-        if (win && closeOpenedWindow) {
-            closeOpenedWindow(win);
-        }
-        else if (win) {
-            win.close();
-        }
-    }
-};
-exports.closeWindow = closeWindow;
-//# sourceMappingURL=utils.js.map

package/dist/cjs/wallets/in-app/web/lib/auth/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,WAAW,GAAG,CAAC,EAC1B,kBAAkB,EAClB,GAAG,EACH,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,EAAE,KAAK,EAAE,CAAC;IACf,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB"}

package/dist/esm/wallets/in-app/web/lib/auth/discord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"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"}

package/dist/esm/wallets/in-app/web/lib/auth/utils.js

@@ -1,14 +0,0 @@
-export const closeWindow = ({ isWindowOpenedByFn, win, closeOpenedWindow, }) => {
-    if (isWindowOpenedByFn) {
-        win?.close();
-    }
-    else {
-        if (win && closeOpenedWindow) {
-            closeOpenedWindow(win);
-        }
-        else if (win) {
-            win.close();
-        }
-    }
-};
-//# sourceMappingURL=utils.js.map

package/dist/esm/wallets/in-app/web/lib/auth/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,kBAAkB,EAClB,GAAG,EACH,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,EAAE,KAAK,EAAE,CAAC;IACf,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/types/wallets/in-app/web/lib/auth/discord.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.d.ts","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,2DAA2D,CAAC;AAErH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,iBAAiB,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CAClE,GAAG,OAAO,CAAC,mCAAmC,CAAC,CA8E/C"}

package/dist/types/wallets/in-app/web/lib/auth/utils.d.ts

@@ -1,6 +0,0 @@
-export declare const closeWindow: ({ isWindowOpenedByFn, win, closeOpenedWindow, }: {
-    win?: Window | null;
-    isWindowOpenedByFn: boolean;
-    closeOpenedWindow?: (openedWindow: Window) => void;
-}) => void;
-//# sourceMappingURL=utils.d.ts.map

package/dist/types/wallets/in-app/web/lib/auth/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,oDAIrB;IACD,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACpD,SAUA,CAAC"}

package/src/wallets/in-app/web/lib/auth/utils.ts

@@ -1,19 +0,0 @@
-export const closeWindow = ({
-  isWindowOpenedByFn,
-  win,
-  closeOpenedWindow,
-}: {
-  win?: Window | null;
-  isWindowOpenedByFn: boolean;
-  closeOpenedWindow?: (openedWindow: Window) => void;
-}) => {
-  if (isWindowOpenedByFn) {
-    win?.close();
-  } else {
-    if (win && closeOpenedWindow) {
-      closeOpenedWindow(win);
-    } else if (win) {
-      win.close();
-    }
-  }
-};