feat(dapp-console): disable claim flow when user does not have github…

… account linked (ethereum-optimism#465)
kansas1295 · Sep 6, 2024 · 36ebd5e · 36ebd5e
1 parent 4acee11
commit 36ebd5e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/apps/dapp-console/app/faucet/components/ClaimButton.tsx b/apps/dapp-console/app/faucet/components/ClaimButton.tsx
@@ -1,14 +1,14 @@
 import { apiClient } from '@/app/helpers/apiClient'
 import { useConnectedWallet } from '@/app/hooks/useConnectedWallet'
 import { Button } from '@eth-optimism/ui-components/src/components/ui/button/button'
-import { usePrivy } from '@privy-io/react-auth'
 import { forwardRef } from 'react'
 import { Authentications } from '@/app/faucet/types'
 import {
   getOnchainAuthentication,
   hasAuthentication,
 } from '@/app/faucet/helpers'
 import { trackFaucetClaim } from '@/app/event-tracking/mixpanel'
+import { useFaucetVerifications } from '@/app/hooks/useFaucetVerifications'
 
 interface ClaimButtonProps {
   isDisabled: boolean
@@ -40,7 +40,7 @@ const ClaimButton = forwardRef<HTMLButtonElement, ClaimButtonProps>(
     ref,
   ) => {
     const { connectedWallet } = useConnectedWallet()
-    const { authenticated } = usePrivy()
+    const { authenticated } = useFaucetVerifications()
 
     const { mutateAsync: claimOnchain } =
       apiClient.faucet.onChainClaims.useMutation()

diff --git a/apps/dapp-console/app/faucet/components/FaucetContent.tsx b/apps/dapp-console/app/faucet/components/FaucetContent.tsx
@@ -19,7 +19,6 @@ import { SuccessDialog } from '@/app/faucet/components/SuccessDialog'
 import { useConnectedWallet } from '@/app/hooks/useConnectedWallet'
 import { generateClaimSignature } from '@/app/faucet/helpers'
 import { getFaucetNetworks } from '@/app/constants/faucet'
-import { usePrivy } from '@privy-io/react-auth'
 import { ClaimButton } from '@/app/faucet/components/ClaimButton'
 import { useFaucetVerifications } from '@/app/hooks/useFaucetVerifications'
 import { Alert } from '@eth-optimism/ui-components/src/components/ui/alert/alert'
@@ -30,9 +29,8 @@ import { useFeatureFlag } from '@/app/hooks/useFeatureFlag'
 
 const FaucetContent = () => {
   const { connectedWallet } = useConnectedWallet()
-  const { faucetAuthentications } = useFaucetVerifications()
+  const { authenticated, faucetAuthentications } = useFaucetVerifications()
 
-  const { authenticated } = usePrivy()
   const { secondsUntilNextDrip, refetchNextDrips } = useFaucetVerifications()
   const { unavailableNetworksChainIds } = useFaucetNetworks()
 

diff --git a/apps/dapp-console/app/hooks/useFaucetVerifications.ts b/apps/dapp-console/app/hooks/useFaucetVerifications.ts
@@ -6,7 +6,7 @@ import { usePrivy } from '@privy-io/react-auth'
 import { useAuth } from '@/app/hooks/useAuth'
 
 const useFaucetVerifications = () => {
-  const { authenticated, ready } = usePrivy()
+  const { authenticated: privyAuthenticated, ready } = usePrivy()
   const { userNeedsGithubAuth } = useAuth()
   const { connectedWallet } = useConnectedWallet()
   const walletAddress = connectedWallet?.address ?? ''
@@ -18,7 +18,7 @@ const useFaucetVerifications = () => {
         address: walletAddress,
       },
       {
-        enabled: !!walletAddress && !!authenticated,
+        enabled: !!walletAddress && !!privyAuthenticated,
         refetchOnWindowFocus: false,
       },
     )
@@ -29,7 +29,10 @@ const useFaucetVerifications = () => {
         authMode: 'COINBASE_VERIFICATION',
         walletAddress: walletAddress,
       },
-      { enabled: !!isCoinbaseVerified && !!walletAddress && !!authenticated },
+      {
+        enabled:
+          !!isCoinbaseVerified && !!walletAddress && !!privyAuthenticated,
+      },
     )
 
   // EAS check
@@ -39,7 +42,7 @@ const useFaucetVerifications = () => {
         address: walletAddress,
       },
       {
-        enabled: !!walletAddress && !!authenticated,
+        enabled: !!walletAddress && !!privyAuthenticated,
         refetchOnWindowFocus: false,
       },
     )
@@ -50,7 +53,7 @@ const useFaucetVerifications = () => {
         authMode: 'ATTESTATION',
         walletAddress: walletAddress,
       },
-      { enabled: !!isAttested && !!walletAddress && !!authenticated },
+      { enabled: !!isAttested && !!walletAddress && !!privyAuthenticated },
     )
 
   // Gitcoin check
@@ -60,7 +63,7 @@ const useFaucetVerifications = () => {
         address: walletAddress,
       },
       {
-        enabled: !!walletAddress && !!authenticated,
+        enabled: !!walletAddress && !!privyAuthenticated,
         refetchOnWindowFocus: false,
       },
     )
@@ -71,7 +74,9 @@ const useFaucetVerifications = () => {
         authMode: 'GITCOIN_PASSPORT',
         walletAddress: walletAddress,
       },
-      { enabled: !!isGitcoinVerified && !!walletAddress && !!authenticated },
+      {
+        enabled: !!isGitcoinVerified && !!walletAddress && !!privyAuthenticated,
+      },
     )
 
   // World ID check
@@ -80,7 +85,7 @@ const useFaucetVerifications = () => {
     refetch: refetchWorldId,
     isFetching: isWorldIDUserLoading,
   } = apiClient.auth.isWorldIdUser.useQuery(undefined, {
-    enabled: !!authenticated,
+    enabled: !!privyAuthenticated,
     refetchOnWindowFocus: false,
   })
 
@@ -89,15 +94,15 @@ const useFaucetVerifications = () => {
       {
         authMode: 'WORLD_ID',
       },
-      { enabled: !!isWorldIdUser && !!authenticated },
+      { enabled: !!isWorldIdUser && !!privyAuthenticated },
     )
 
   const { data: nextDripsPrivy, refetch: refetchPrivyNextDrips } =
     apiClient.faucet.nextDrips.useQuery(
       {
         authMode: 'PRIVY',
       },
-      { enabled: !!authenticated && !userNeedsGithubAuth },
+      { enabled: !!privyAuthenticated && !userNeedsGithubAuth },
     )
 
   const isAuthenticationLoading =
@@ -141,12 +146,17 @@ const useFaucetVerifications = () => {
     secondsUntilNextDrip = nextDripsPrivy?.secondsUntilNextDrip || 0
   }
 
+  const authenticated =
+    Object.values(faucetAuthentications).some((auth) => auth === true) ||
+    (ready && privyAuthenticated && !userNeedsGithubAuth)
+
   return {
     faucetAuthentications,
     secondsUntilNextDrip,
     refetchWorldId,
     refetchNextDrips,
     isAuthenticationLoading,
+    authenticated,
   }
 }