thirdweb 5.40.1-nightly-b128530355f0dc47d897bd2ef7c3823752ea9b6c-20240727000321 → 5.42.0-nightly-e27ebef85bb61342c3de53f85e134cf4a29f787c-20240730000342

package/src/wallets/in-app/core/authentication/getLoginPath.ts

@@ -3,17 +3,30 @@ import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
 import type { SocialAuthOption } from "../../../../wallets/types.js";
 import type { Ecosystem } from "../../web/types.js";
 
-export const getSocialAuthLoginPath = (
-  authOption: SocialAuthOption,
-  client: ThirdwebClient,
-  ecosystem?: Ecosystem,
-) => {
-  const baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
+export const getSocialAuthLoginPath = ({
+  authOption,
+  client,
+  ecosystem,
+  mode = "popup",
+}: {
+  authOption: SocialAuthOption;
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+  mode?: "popup" | "redirect";
+}) => {
+  let baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
   if (ecosystem?.partnerId) {
-    return `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
+    baseUrl = `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
+  } else if (ecosystem) {
+    baseUrl = `${baseUrl}&ecosystemId=${ecosystem.id}`;
   }
-  if (ecosystem) {
-    return `${baseUrl}&ecosystemId=${ecosystem.id}`;
+
+  if (mode === "redirect") {
+    const redirectUrl = new URL(window.location.href);
+    redirectUrl.searchParams.set("walletId", ecosystem?.id || "inApp");
+    redirectUrl.searchParams.set("authProvider", authOption);
+    baseUrl = `${baseUrl}&redirectUrl=${encodeURIComponent(redirectUrl.toString())}`;
   }
+
   return baseUrl;
 };

package/src/wallets/in-app/core/authentication/type.ts

@@ -62,6 +62,7 @@ export enum AuthProvider {
   APPLE = "Apple",
   PASSKEY = "Passkey",
   DISCORD = "Discord",
+  FARCASTER = "Farcaster",
 }
 
 export type OauthOption = {

package/src/wallets/in-app/core/wallet/index.ts

@@ -44,10 +44,9 @@ export async function connectInAppWallet(
     connector.authenticateWithRedirect
   ) {
     const strategy = options.strategy;
-    if (!socialAuthOptions.includes(strategy as SocialAuthOption)) {
-      throw new Error("This authentication method does not support redirects");
+    if (socialAuthOptions.includes(strategy as SocialAuthOption)) {
+      connector.authenticateWithRedirect(strategy as SocialAuthOption);
     }
-    connector.authenticateWithRedirect(strategy as SocialAuthOption);
   }
   // If we don't have authenticateWithRedirect then it's likely react native, so the default is to redirect and we can carry on
   // IF WE EVER ADD MORE CONNECTOR TYPES, this could cause redirect to be ignored despite being specified

package/src/wallets/in-app/native/auth/native-auth.ts

@@ -208,7 +208,11 @@ export async function socialLogin(
   auth: OauthOption,
   client: ThirdwebClient,
 ): Promise<AuthStoredTokenWithCookieReturnType> {
-  const loginUrl = `${getSocialAuthLoginPath(auth.strategy, client)}&redirectUrl=${encodeURIComponent(auth.redirectUrl)}`;
+  const loginUrl = getSocialAuthLoginPath({
+    authOption: auth.strategy,
+    client,
+    mode: "popup",
+  });
 
   const result = await WebBrowser.openAuthSessionAsync(
     loginUrl,

package/src/wallets/in-app/native/native-connector.ts

@@ -109,6 +109,7 @@ export class InAppNativeConnector implements InAppConnector {
       case "google":
       case "facebook":
       case "discord":
+      case "farcaster":
       case "apple": {
         const ExpoLinking = require("expo-linking");
         const redirectUrl =

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

@@ -2,6 +2,7 @@ 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 type { SocialAuthOption } from "../../../../../wallets/types.js";
+import { getSocialAuthLoginPath } from "../../../core/authentication/getLoginPath.js";
 import type { Ecosystem } from "../../types.js";
 import { DEFAULT_POP_UP_SIZE } from "./constants.js";
 
@@ -25,30 +26,15 @@ const closeWindow = ({
   }
 };
 
-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 loginWithOauthRedirect = (options: {
   authOption: SocialAuthOption;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
 }): void => {
-  const redirectUrl = new URL(window.location.href);
-  redirectUrl.searchParams.set("walletId", options.ecosystem?.id || "inApp");
-  redirectUrl.searchParams.set("authProvider", options.authOption);
-  const loginUrl = `${getSocialAuthLoginPath(options.authOption, options.client, options.ecosystem)}&redirectUrl=${encodeURIComponent(redirectUrl.toString())}`;
+  const loginUrl = getSocialAuthLoginPath({
+    ...options,
+    mode: "redirect",
+  });
   window.location.href = loginUrl;
 };
 
@@ -63,11 +49,7 @@ export const loginWithOauth = async (options: {
   let isWindowOpenedByFn = false;
   if (!win) {
     win = window.open(
-      getSocialAuthLoginPath(
-        options.authOption,
-        options.client,
-        options.ecosystem,
-      ),
+      getSocialAuthLoginPath({ ...options, mode: "popup" }),
       `Login to ${options.authOption}`,
       DEFAULT_POP_UP_SIZE,
     );

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

@@ -222,6 +222,7 @@ export class InAppWebConnector implements InAppConnector {
       case "apple":
       case "facebook":
       case "google":
+      case "farcaster":
       case "discord": {
         const authToken = await loginWithOauth({
           authOption: strategy,

package/src/wallets/types.ts

@@ -24,6 +24,7 @@ export const socialAuthOptions = [
   "apple",
   "facebook",
   "discord",
+  "farcaster",
 ] as const;
 export type SocialAuthOption = (typeof socialAuthOptions)[number];
 

package/dist/cjs/react/web/ui/ConnectWallet/screens/ViewFunds.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViewFunds = ViewFunds;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const index_js_1 = require("../../../../core/design-system/index.js");
-const Spacer_js_1 = require("../../components/Spacer.js");
-const basic_js_1 = require("../../components/basic.js");
-const text_js_1 = require("../../components/text.js");
-const MenuButton_js_1 = require("../MenuButton.js");
-const CoinsIcon_js_1 = require("../icons/CoinsIcon.js");
-const ImageIcon_js_1 = require("../icons/ImageIcon.js");
-/**
- * @internal
- */
-function ViewFunds(props) {
-    const { connectLocale } = props;
-    return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { style: {
-            minHeight: "300px",
-        }, children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { p: "lg", children: (0, jsx_runtime_1.jsx)(basic_js_1.ModalHeader, { title: connectLocale.viewFunds.title, onBack: props.onBack }) }), (0, jsx_runtime_1.jsx)(basic_js_1.Line, {}), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { px: "sm", scrollY: true, style: {
-                    maxHeight: "500px",
-                }, children: [(0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" }), (0, jsx_runtime_1.jsxs)(MenuButton_js_1.MenuButton, { onClick: () => {
-                            props.setScreen("view-tokens");
-                        }, style: {
-                            fontSize: index_js_1.fontSize.sm,
-                        }, children: [(0, jsx_runtime_1.jsx)(CoinsIcon_js_1.CoinsIcon, { size: index_js_1.iconSize.md }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "primaryText", children: connectLocale.viewFunds.viewTokens })] }), (0, jsx_runtime_1.jsxs)(MenuButton_js_1.MenuButton, { onClick: () => {
-                            props.setScreen("view-nfts");
-                        }, style: {
-                            fontSize: index_js_1.fontSize.sm,
-                        }, children: [(0, jsx_runtime_1.jsx)(ImageIcon_js_1.ImageIcon, { size: index_js_1.iconSize.md }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "primaryText", children: connectLocale.viewFunds.viewNFTs })] }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" })] })] }));
-}
-//# sourceMappingURL=ViewFunds.js.map

package/dist/cjs/react/web/ui/ConnectWallet/screens/ViewFunds.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ViewFunds.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ViewFunds.tsx"],"names":[],"mappings":";;AAkBA,8BAyDC;;AA1ED,sEAA6E;AAK7E,0DAAoD;AACpD,wDAAyE;AACzE,sDAAgD;AAChD,oDAA8C;AAC9C,wDAAkD;AAClD,wDAAkD;AAIlD;;GAEG;AACH,SAAgB,SAAS,CAAC,KAOzB;IACC,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAChC,OAAO,CACL,wBAAC,oBAAS,IACR,KAAK,EAAE;YACL,SAAS,EAAE,OAAO;SACnB,aAED,uBAAC,oBAAS,IAAC,CAAC,EAAC,IAAI,YACf,uBAAC,sBAAW,IACV,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,KAAK,EACpC,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,GACQ,EACZ,uBAAC,eAAI,KAAG,EACR,wBAAC,oBAAS,IACR,EAAE,EAAC,IAAI,EACP,OAAO,QACP,KAAK,EAAE;oBACL,SAAS,EAAE,OAAO;iBACnB,aAED,uBAAC,kBAAM,IAAC,CAAC,EAAC,IAAI,GAAG,EAEjB,wBAAC,0BAAU,IACT,OAAO,EAAE,GAAG,EAAE;4BACZ,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;wBACjC,CAAC,EACD,KAAK,EAAE;4BACL,QAAQ,EAAE,mBAAQ,CAAC,EAAE;yBACtB,aAED,uBAAC,wBAAS,IAAC,IAAI,EAAE,mBAAQ,CAAC,EAAE,GAAI,EAChC,uBAAC,cAAI,IAAC,KAAK,EAAC,aAAa,YAAE,aAAa,CAAC,SAAS,CAAC,UAAU,GAAQ,IAC1D,EACb,wBAAC,0BAAU,IACT,OAAO,EAAE,GAAG,EAAE;4BACZ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAC/B,CAAC,EACD,KAAK,EAAE;4BACL,QAAQ,EAAE,mBAAQ,CAAC,EAAE;yBACtB,aAED,uBAAC,wBAAS,IAAC,IAAI,EAAE,mBAAQ,CAAC,EAAE,GAAI,EAChC,uBAAC,cAAI,IAAC,KAAK,EAAC,aAAa,YAAE,aAAa,CAAC,SAAS,CAAC,QAAQ,GAAQ,IACxD,EACb,uBAAC,kBAAM,IAAC,CAAC,EAAC,IAAI,GAAG,IACP,IACF,CACb,CAAC;AACJ,CAAC"}

package/dist/esm/react/web/ui/ConnectWallet/screens/ViewFunds.js

@@ -1,28 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { fontSize, iconSize } from "../../../../core/design-system/index.js";
-import { Spacer } from "../../components/Spacer.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
-import { Text } from "../../components/text.js";
-import { MenuButton } from "../MenuButton.js";
-import { CoinsIcon } from "../icons/CoinsIcon.js";
-import { ImageIcon } from "../icons/ImageIcon.js";
-/**
- * @internal
- */
-export function ViewFunds(props) {
-    const { connectLocale } = props;
-    return (_jsxs(Container, { style: {
-            minHeight: "300px",
-        }, children: [_jsx(Container, { p: "lg", children: _jsx(ModalHeader, { title: connectLocale.viewFunds.title, onBack: props.onBack }) }), _jsx(Line, {}), _jsxs(Container, { px: "sm", scrollY: true, style: {
-                    maxHeight: "500px",
-                }, children: [_jsx(Spacer, { y: "md" }), _jsxs(MenuButton, { onClick: () => {
-                            props.setScreen("view-tokens");
-                        }, style: {
-                            fontSize: fontSize.sm,
-                        }, children: [_jsx(CoinsIcon, { size: iconSize.md }), _jsx(Text, { color: "primaryText", children: connectLocale.viewFunds.viewTokens })] }), _jsxs(MenuButton, { onClick: () => {
-                            props.setScreen("view-nfts");
-                        }, style: {
-                            fontSize: fontSize.sm,
-                        }, children: [_jsx(ImageIcon, { size: iconSize.md }), _jsx(Text, { color: "primaryText", children: connectLocale.viewFunds.viewNFTs })] }), _jsx(Spacer, { y: "lg" })] })] }));
-}
-//# sourceMappingURL=ViewFunds.js.map

package/dist/esm/react/web/ui/ConnectWallet/screens/ViewFunds.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ViewFunds.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ViewFunds.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AAK7E,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,KAOzB;IACC,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAChC,OAAO,CACL,MAAC,SAAS,IACR,KAAK,EAAE;YACL,SAAS,EAAE,OAAO;SACnB,aAED,KAAC,SAAS,IAAC,CAAC,EAAC,IAAI,YACf,KAAC,WAAW,IACV,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,KAAK,EACpC,MAAM,EAAE,KAAK,CAAC,MAAM,GACpB,GACQ,EACZ,KAAC,IAAI,KAAG,EACR,MAAC,SAAS,IACR,EAAE,EAAC,IAAI,EACP,OAAO,QACP,KAAK,EAAE;oBACL,SAAS,EAAE,OAAO;iBACnB,aAED,KAAC,MAAM,IAAC,CAAC,EAAC,IAAI,GAAG,EAEjB,MAAC,UAAU,IACT,OAAO,EAAE,GAAG,EAAE;4BACZ,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;wBACjC,CAAC,EACD,KAAK,EAAE;4BACL,QAAQ,EAAE,QAAQ,CAAC,EAAE;yBACtB,aAED,KAAC,SAAS,IAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAI,EAChC,KAAC,IAAI,IAAC,KAAK,EAAC,aAAa,YAAE,aAAa,CAAC,SAAS,CAAC,UAAU,GAAQ,IAC1D,EACb,MAAC,UAAU,IACT,OAAO,EAAE,GAAG,EAAE;4BACZ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAC/B,CAAC,EACD,KAAK,EAAE;4BACL,QAAQ,EAAE,QAAQ,CAAC,EAAE;yBACtB,aAED,KAAC,SAAS,IAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAI,EAChC,KAAC,IAAI,IAAC,KAAK,EAAC,aAAa,YAAE,aAAa,CAAC,SAAS,CAAC,QAAQ,GAAQ,IACxD,EACb,KAAC,MAAM,IAAC,CAAC,EAAC,IAAI,GAAG,IACP,IACF,CACb,CAAC;AACJ,CAAC"}

package/dist/types/react/web/ui/ConnectWallet/screens/ViewFunds.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ViewFunds.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ViewFunds.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EAChB,MAAM,yCAAyC,CAAC;AAOjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACtD,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;CAC9B,8CAkDA"}

package/src/react/web/ui/ConnectWallet/screens/ViewFunds.tsx

@@ -1,76 +0,0 @@
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { fontSize, iconSize } from "../../../../core/design-system/index.js";
-import type {
-  SupportedNFTs,
-  SupportedTokens,
-} from "../../../../core/utils/defaultTokens.js";
-import { Spacer } from "../../components/Spacer.js";
-import { Container, Line, ModalHeader } from "../../components/basic.js";
-import { Text } from "../../components/text.js";
-import { MenuButton } from "../MenuButton.js";
-import { CoinsIcon } from "../icons/CoinsIcon.js";
-import { ImageIcon } from "../icons/ImageIcon.js";
-import type { ConnectLocale } from "../locale/types.js";
-import type { WalletDetailsModalScreen } from "./types.js";
-
-/**
- * @internal
- */
-export function ViewFunds(props: {
-  supportedTokens?: SupportedTokens;
-  supportedNFTs?: SupportedNFTs;
-  onBack: () => void;
-  setScreen: (screen: WalletDetailsModalScreen) => void;
-  client: ThirdwebClient;
-  connectLocale: ConnectLocale;
-}) {
-  const { connectLocale } = props;
-  return (
-    <Container
-      style={{
-        minHeight: "300px",
-      }}
-    >
-      <Container p="lg">
-        <ModalHeader
-          title={connectLocale.viewFunds.title}
-          onBack={props.onBack}
-        />
-      </Container>
-      <Line />
-      <Container
-        px="sm"
-        scrollY
-        style={{
-          maxHeight: "500px",
-        }}
-      >
-        <Spacer y="md" />
-
-        <MenuButton
-          onClick={() => {
-            props.setScreen("view-tokens");
-          }}
-          style={{
-            fontSize: fontSize.sm,
-          }}
-        >
-          <CoinsIcon size={iconSize.md} />
-          <Text color="primaryText">{connectLocale.viewFunds.viewTokens}</Text>
-        </MenuButton>
-        <MenuButton
-          onClick={() => {
-            props.setScreen("view-nfts");
-          }}
-          style={{
-            fontSize: fontSize.sm,
-          }}
-        >
-          <ImageIcon size={iconSize.md} />
-          <Text color="primaryText">{connectLocale.viewFunds.viewNFTs}</Text>
-        </MenuButton>
-        <Spacer y="lg" />
-      </Container>
-    </Container>
-  );
-}