experimental google auth redirect

0xsequence · Sep 26, 2024 · 878e07d · 878e07d
1 parent 56597d9
commit 878e07d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/packages/kit/src/components/Connect/Connect.tsx b/packages/kit/src/components/Connect/Connect.tsx
@@ -31,12 +31,13 @@ import { ExtendedWalletList } from './ExtendedWalletList'
 interface ConnectWalletContentProps extends KitConnectProviderProps {
   emailConflictInfo?: FormattedEmailConflictInfo | null
   onClose: () => void
+  googleUseRedirectMode?: boolean
 }
 
 export const Connect = (props: ConnectWalletContentProps) => {
   useScript(appleAuthHelpers.APPLE_SCRIPT_SRC)
 
-  const { onClose, emailConflictInfo, config = {} } = props
+  const { onClose, emailConflictInfo, config = {}, googleUseRedirectMode } = props
   const { signIn = {} } = config as KitConfig
   const { isConnected } = useAccount()
   const storage = useStorage()
@@ -231,7 +232,11 @@ export const Connect = (props: ConnectWalletContentProps) => {
                   return (
                     <Box key={connector.uid} aspectRatio="1/1" alignItems="center" justifyContent="center">
                       {connector._wallet.id === 'google-waas' ? (
-                        <GoogleWaasConnectButton connector={connector} onConnect={onConnect} />
+                        <GoogleWaasConnectButton
+                          connector={connector}
+                          onConnect={onConnect}
+                          googleUseRedirectMode={googleUseRedirectMode}
+                        />
                       ) : connector._wallet.id === 'apple-waas' ? (
                         <AppleWaasConnectButton connector={connector} onConnect={onConnect} />
                       ) : connector._wallet.id.includes('email') ? (

diff --git a/packages/kit/src/components/Connect/ConnectWalletContent.tsx b/packages/kit/src/components/Connect/ConnectWalletContent.tsx
@@ -10,6 +10,7 @@ import { Connect } from './Connect'
 interface ConnectWalletContent extends KitConnectProviderProps {
   emailConflictInfo?: FormattedEmailConflictInfo | null
   onClose: () => void
+  googleUseRedirectMode?: boolean
 }
 
 export const ConnectWalletContent = (props: ConnectWalletContent) => {

diff --git a/packages/kit/src/components/ConnectButton/ConnectButton.tsx b/packages/kit/src/components/ConnectButton/ConnectButton.tsx
@@ -19,6 +19,7 @@ interface ConnectButtonProps {
   connector: ExtendedConnector
   label?: string
   onConnect: (connector: ExtendedConnector) => void
+  googleUseRedirectMode?: boolean
 }
 
 export const ConnectButton = (props: ConnectButtonProps) => {
@@ -47,7 +48,7 @@ export const ConnectButton = (props: ConnectButtonProps) => {
 }
 
 export const GoogleWaasConnectButton = (props: ConnectButtonProps) => {
-  const { connector, onConnect } = props
+  const { connector, onConnect, googleUseRedirectMode } = props
   const storage = useStorage()
 
   const [enableGoogleTooltip, setEnableGoogleTooltip] = useState(false)
@@ -95,6 +96,7 @@ export const GoogleWaasConnectButton = (props: ConnectButtonProps) => {
             onError={() => {
               console.log('Login Failed')
             }}
+            ux_mode={googleUseRedirectMode ? 'redirect' : 'popup'}
           />
         </Box>
         <Box

diff --git a/packages/kit/src/components/KitPreviewProvider/KitPreviewProvider.tsx b/packages/kit/src/components/KitPreviewProvider/KitPreviewProvider.tsx
@@ -126,6 +126,7 @@ export const KitPreviewProvider = (props: KitConnectProviderProps) => {
                     <ConnectWalletContent
                       onClose={() => setOpenConnectModal(false)}
                       emailConflictInfo={emailConflictInfo}
+                      googleUseRedirectMode={props.config.googleUseRedirectMode}
                       {...props}
                     />
                   </ThemeProvider>

diff --git a/packages/kit/src/components/KitProvider/KitProvider.tsx b/packages/kit/src/components/KitProvider/KitProvider.tsx
@@ -159,6 +159,7 @@ export const KitProvider = (props: KitConnectProviderProps) => {
                           <ConnectWalletContent
                             onClose={() => setOpenConnectModal(false)}
                             emailConflictInfo={emailConflictInfo}
+                            googleUseRedirectMode={props.config.googleUseRedirectMode}
                             {...props}
                           />
                         </Modal>

diff --git a/packages/kit/src/types.ts b/packages/kit/src/types.ts
@@ -74,6 +74,7 @@ export interface KitConfig {
   displayedAssets?: DisplayedAsset[]
   ethAuth?: EthAuthSettings
   isDev?: boolean
+  googleUseRedirectMode?: boolean
 }
 
 export type StorageItem = {