Merge pull request #41 from dappforce/fix/provider

Add validation for only enabled provider
dappforce · Sep 6, 2024 · f7a60c9 · f7a60c9
2 parents f94ef47 + cdc2c15
commit f7a60c9
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx b/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx
@@ -105,7 +105,7 @@ export default function LinkedIdentitiesContent() {
           withAtSymbolForUsername,
         }) => {
           const isLinked = linkedIdentity?.externalProviders.find(
-            (p) => p.provider === provider
+            (p) => p.provider === provider && p.enabled
           )
           let text = `Connect your ${name}`
           if (isLinked) {
@@ -158,7 +158,7 @@ function EvmConnectButton() {
     getLinkedIdentityQuery.useQuery(grillAddress ?? '')
 
   const hasEvmProvider = linkedIdentity?.externalProviders.some(
-    (p) => p.provider === IdentityProvider.Evm
+    (p) => p.provider === IdentityProvider.Evm && p.enabled
   )
 
   const {

diff --git a/src/components/auth/common/evm/CommonEvmModalContent.tsx b/src/components/auth/common/evm/CommonEvmModalContent.tsx
@@ -78,7 +78,7 @@ export const CommonEVMLoginContent = ({
   useEffect(() => {
     if (
       linkedIdentity?.externalProviders.find(
-        (p) => p.provider === IdentityProvider.Evm
+        (p) => p.provider === IdentityProvider.Evm && p.enabled
       )
     ) {
       const res = onSuccess?.(linkedIdentity)

diff --git a/src/components/navbar/Navbar/telegramLogin/useLoginInTelegramMiniApps.tsx b/src/components/navbar/Navbar/telegramLogin/useLoginInTelegramMiniApps.tsx
@@ -63,7 +63,7 @@ const useLoginInTelegramMiniApps = () => {
   useEffect(() => {
     if (!data) return
     const foundMatchingProvider = linkedIdentity?.externalProviders.find(
-      (p) => p.provider === IdentityProvider.Telegram
+      (p) => p.provider === IdentityProvider.Telegram && p.enabled
     )
     if (!linkedIdentity || !foundMatchingProvider) return
 

diff --git a/src/components/wallets/UnlinkWalletModal.tsx b/src/components/wallets/UnlinkWalletModal.tsx
@@ -31,17 +31,18 @@ export default function UnlinkWalletModal({
   const { mutate, isLoading, isSuccess, reset } = useUpdateExternalProvider({
     onSuccess: (_, { externalProvider }) => {
       reloadEveryIntervalUntilLinkedIdentityFound((identity) => {
-        const found = identity?.externalProviders.find(
+        const isStillEnabled = identity?.externalProviders.find(
           (p) =>
             // @ts-expect-error different provider for IdentityProvider, one from generated type, one from sdk
             p.provider === externalProvider.provider &&
-            p.externalId === externalProvider.id
+            p.externalId === externalProvider.id &&
+            p.enabled
         )
-        if (!found) {
-          refetch()
+        if (!isStillEnabled) {
           props.closeModal()
+          return true
         }
-        return !found
+        return false
       })
     },
   })

diff --git a/src/hooks/useLinkedProviders.ts b/src/hooks/useLinkedProviders.ts
@@ -55,7 +55,8 @@ export default function useLinkedAddress(
   const usedLoading = address ? isLoadingMainAddress : isLoadingMy
 
   const providers = usedLinkedIdentity?.externalProviders.filter(
-    (identity) => identity.provider === identityProvider.toString()
+    (identity) =>
+      identity.provider === identityProvider.toString() && identity.enabled
   )
   let latestAddress = ''
   let latestCreatedTime = 0

diff --git a/src/hooks/useTgLink.ts b/src/hooks/useTgLink.ts
@@ -12,7 +12,7 @@ export default function useTgLink(address: string, asLink?: boolean) {
     })
 
   const telegramProvider = linkedIdentity?.externalProviders.find(
-    (p) => p.provider === IdentityProvider.Telegram
+    (p) => p.provider === IdentityProvider.Telegram && p.enabled
   )
   const telegramLink = shouldSeeUsername
     ? getUserTelegramLink(linkedIdentity)

diff --git a/src/providers/config/NeynarLoginProvider.tsx b/src/providers/config/NeynarLoginProvider.tsx
@@ -79,7 +79,7 @@ export default function NeynarLoginProvider({
     getLinkedIdentityQuery.useQuery(myGrillAddress)
   useEffect(() => {
     const foundIdentity = linkedIdentity?.externalProviders.find(
-      (p) => p.provider === IdentityProvider.Farcaster
+      (p) => p.provider === IdentityProvider.Farcaster && p.enabled
     )
     if (linkedIdentity && foundIdentity) {
       resetLinking()

diff --git a/src/providers/config/TelegramLoginProvider.tsx b/src/providers/config/TelegramLoginProvider.tsx
@@ -88,7 +88,7 @@ export default function TelegramLoginProvider({
       myGrillAddress
     )
     const foundMatchingProvider = linkedIdentity?.externalProviders.find(
-      (p) => p.provider === IdentityProvider.Telegram
+      (p) => p.provider === IdentityProvider.Telegram && p.enabled
     )
     if (!linkedIdentity || !foundMatchingProvider) return false
 

diff --git a/src/services/datahub/identity/fetcher.ts b/src/services/datahub/identity/fetcher.ts
@@ -16,6 +16,7 @@ export type Identity = {
     externalId: string
     username?: string | null
     createdAtTime: string
+    enabled: boolean
   }[]
 }
 

diff --git a/src/services/datahub/identity/mutation.ts b/src/services/datahub/identity/mutation.ts
@@ -127,7 +127,8 @@ export const useAddExternalProviderToIdentity = mutationWrapper(
             (p) =>
               // @ts-expect-error different provider for IdentityProvider, one from generated type, one from sdk
               p.provider === externalProvider.provider &&
-              p.externalId === externalProvider.id
+              p.externalId === externalProvider.id &&
+              p.enabled
           )
       )
     },

diff --git a/src/services/datahub/identity/subscription.ts b/src/services/datahub/identity/subscription.ts
@@ -147,6 +147,7 @@ async function processSessionCreated(
         provider: p.provider,
         username: p.username,
         createdAtTime: p.createdAtTime,
+        enabled: p.enabled,
       })) ?? [],
   }
   if (session.id === useMyAccount.getState().address)

diff --git a/src/utils/links.ts b/src/utils/links.ts
@@ -105,7 +105,8 @@ export function getUserTelegramLink(
 ) {
   if (!linkedIdentity) return undefined
   const telegram = linkedIdentity.externalProviders.find(
-    (provider) => provider.provider === IdentityProvider.Telegram
+    (provider) =>
+      provider.provider === IdentityProvider.Telegram && provider.enabled
   )
   if (!telegram?.username) return undefined
   return `https://t.me/${telegram.username}`