fix(unlock-app): ensuring that users are connected

unlock-protocol · Nov 13, 2024 · 61cac23 · 61cac23
1 parent 55a4697
commit 61cac23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/unlock-app/src/config/PrivyProvider.tsx b/unlock-app/src/config/PrivyProvider.tsx
@@ -15,10 +15,14 @@ import AuthenticationContext from '~/contexts/AuthenticationContext'
 export const onSignedInWithPrivy = async (user: any) => {
   try {
     const accessToken = await privyGetAccessToken()
+    if (!accessToken) {
+      console.error('No access token found in Privy')
+      return null
+    }
     const walletAddress = user.wallet.address
     if (walletAddress) {
       const response = await locksmith.loginWithPrivy({
-        accessToken: accessToken!,
+        accessToken,
         walletAddress,
       })
       const { accessToken: locksmithAccessToken } = response.data
@@ -30,6 +34,7 @@ export const onSignedInWithPrivy = async (user: any) => {
         window.dispatchEvent(
           new CustomEvent('locksmith.authenticated', { detail: walletAddress })
         )
+        return walletAddress
       }
     } else {
       console.error(

diff --git a/unlock-app/src/hooks/useAuthenticate.ts b/unlock-app/src/hooks/useAuthenticate.ts
@@ -131,9 +131,7 @@ export function useAuthenticate() {
   const signInWithPrivy = async ({ onshowUI }: { onshowUI: () => void }) => {
     if (!(await signInWithExistingSession())) {
       setAccount(undefined)
-      if (privyAuthenticated) {
-        await onSignedInWithPrivy(user)
-      } else {
+      if (!privyAuthenticated || !(await onSignedInWithPrivy(user))) {
         privyLogin()
         onshowUI()
       }