feature(unlock-app): remove Coinbase WaaS API handling and improve mi…

…gration messaging (#15241)

unlock-app/app/providers.tsx

@@ -18,7 +18,6 @@ import { ConnectModalProvider } from '~/hooks/useConnectModal'
 import Privy from '~/config/PrivyProvider'
 import LoadingFallback from './Components/LoadingFallback'
 import AuthenticationContext from '~/contexts/AuthenticationContext'
-import { SessionProvider as NextAuthSessionProvider } from 'next-auth/react'
 
 function makeQueryClient() {
   return new QueryClient({
@@ -55,20 +54,18 @@ export default function Providers({ children }: { children: React.ReactNode }) {
           <GlobalWrapper>
             <SessionProvider>
               <Suspense fallback={<LoadingFallback />}>
-                <NextAuthSessionProvider>
-                  <ConnectModalProvider>
-                    <AirstackProvider
-                      apiKey={'162b7c4dda5c44afdb0857b6b04454f99'}
+                <ConnectModalProvider>
+                  <AirstackProvider
+                    apiKey={'162b7c4dda5c44afdb0857b6b04454f99'}
+                  >
+                    <ErrorBoundary
+                      fallback={(props: any) => <ErrorFallback {...props} />}
                     >
-                      <ErrorBoundary
-                        fallback={(props: any) => <ErrorFallback {...props} />}
-                      >
-                        <ShouldOpenConnectModal />
-                        {children}
-                      </ErrorBoundary>
-                    </AirstackProvider>
-                  </ConnectModalProvider>
-                </NextAuthSessionProvider>
+                      <ShouldOpenConnectModal />
+                      {children}
+                    </ErrorBoundary>
+                  </AirstackProvider>
+                </ConnectModalProvider>
                 <Toaster />
               </Suspense>
             </SessionProvider>

unlock-app/package.json

@@ -8,7 +8,6 @@
   },
   "dependencies": {
     "@airstack/airstack-react": "0.6.4",
-    "@coinbase/waas-sdk-web": "3.3.3",
     "@crossmint/client-sdk-react-ui": "1.2.2",
     "@decent.xyz/box-common": "4.0.3",
     "@enzoferey/ethers-error-parser": "0.2.3",
@@ -45,7 +44,6 @@
     "graphql": "16.9.0",
     "lottie-react": "2.4.0",
     "next": "14.2.18",
-    "next-auth": "4.24.10",
     "node-forge": "1.3.1",
     "postmate": "1.5.2",
     "qr-scanner": "1.4.2",

unlock-app/src/components/legacy-auth/ConnectToPrivy.tsx

@@ -3,7 +3,6 @@
 import { useLogin } from '@privy-io/react-auth'
 import { useEffect, useRef } from 'react'
 import { LoginModal } from '@privy-io/react-auth'
-import { signOut as nextAuthSignOut, useSession } from 'next-auth/react'
 
 interface ConnectToPrivyProps {
   userEmail: string
@@ -16,14 +15,8 @@ export default function ConnectToPrivy({
   onNext,
   setPrivyConnected,
 }: ConnectToPrivyProps) {
-  const { data: session } = useSession()
-
   const { login } = useLogin({
     onComplete: async () => {
-      // When Privy login is complete, sign out of next-auth session
-      if (session) {
-        await nextAuthSignOut({ redirect: false })
-      }
       // Set Privy connection status to true
       setPrivyConnected(true)
       // Then proceed to next step

unlock-app/src/components/legacy-auth/MigrateUserCheckout.tsx

@@ -4,10 +4,7 @@ import { useState, useEffect } from 'react'
 import { useMutation } from '@tanstack/react-query'
 import { locksmith } from '~/config/locksmith'
 import MigrationFeedback from './MigrationFeedback'
-import { UserAccountType } from '~/utils/userAccountType'
 import { SignInWithPassword } from './SignInWithPassword'
-import { SignInWithCode } from './SignInWithCode'
-import { SignInWithGoogle } from './SignInWithGoogle'
 import { Placeholder } from '@unlock-protocol/ui'
 
 interface MigrateUserCheckoutProps {
@@ -20,38 +17,23 @@ export const MigrateUserCheckout = ({
   onSignOut,
 }: MigrateUserCheckoutProps) => {
   const [walletPk, setWalletPk] = useState<string | null>(null)
-  const [userAccountType, setUserAccountType] = useState<UserAccountType[]>([])
+  const [isUnlockAccount, setIsUnlockAccount] = useState<boolean>(false)
 
   // Mutation to handle the user account type
   const checkUserAccountType = useMutation({
     mutationFn: async (email: string) => {
       const response = await locksmith.getUserAccountType(email)
-      // Map the API response to our local enum
-      const userAccountType =
-        response.data.userAccountType?.map((type: string) => {
-          switch (type) {
-            case 'EMAIL_CODE':
-              return UserAccountType.EmailCodeAccount
-            case 'UNLOCK_ACCOUNT':
-              return UserAccountType.UnlockAccount
-            case 'GOOGLE_ACCOUNT':
-              return UserAccountType.GoogleAccount
-            case 'PASSKEY_ACCOUNT':
-              return UserAccountType.PasskeyAccount
-            default:
-              throw new Error(`Unknown account type: ${type}`)
-          }
-        }) || []
-      return userAccountType
+      // Check if user has an Unlock 1.0 account type
+      return response.data.userAccountType?.includes('UNLOCK_ACCOUNT') || false
     },
   })
 
   // trigger the mutation when component loads
   useEffect(() => {
     if (userEmail) {
       checkUserAccountType.mutate(userEmail, {
-        onSuccess: (types) => {
-          setUserAccountType(types)
+        onSuccess: (isUnlock) => {
+          setIsUnlockAccount(isUnlock)
         },
       })
     }
@@ -68,15 +50,9 @@ export const MigrateUserCheckout = ({
       )
     }
 
-    if (userAccountType?.includes(UserAccountType.UnlockAccount)) {
+    if (isUnlockAccount) {
       return <SignInWithPassword userEmail={userEmail} onNext={setWalletPk} />
     }
-    if (userAccountType?.includes(UserAccountType.EmailCodeAccount)) {
-      return <SignInWithCode email={userEmail} onNext={setWalletPk} />
-    }
-    if (userAccountType?.includes(UserAccountType.GoogleAccount)) {
-      return <SignInWithGoogle onNext={setWalletPk} />
-    }
     return null
   }