Merge pull request #23 from cometh-hq/develop

fix: IsAuthorized (#22)

Author: yoanslvy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cometh/connect-sdk-viem",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Viem SDK Cometh Connect",
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.4",
-    "@cometh/connect-sdk": "^1.2.11",
+    "@cometh/connect-sdk": "^1.2.12",
     "@rainbow-me/rainbowkit": "^1.3.0",
     "@types/babel__core": "^7.20.0",
-    "viem": "^1.16.2",
-    "wagmi": "^1.4.7"
+    "viem": "^1.19.11",
+    "wagmi": "^1.4.13"
   }
 }

src/wagmi/connector.ts

@@ -6,7 +6,7 @@ import {
   webAuthnOptions
 } from '@cometh/connect-sdk'
 import { toHex } from 'viem'
-import { Chain, Connector, ConnectorNotFoundError } from 'wagmi'
+import { Chain, Connector } from 'wagmi'
 
 import {
   ConnectClient,
@@ -51,6 +51,7 @@ export class ComethConnectConnector extends Connector<
   ready = false
   wallet?: ComethWallet
   client?: ConnectClient
+  supportedChains?: SupportedNetworks[]
 
   protected shimDisconnectKey = `${this.id}.shimDisconnect`
 
@@ -145,27 +146,38 @@ export class ComethConnectConnector extends Connector<
         throw new Error('Network not supported')
 
       return providedChainId
-    } else {
-      const supportedChains = this.chains.reduce(
-        (chains: SupportedNetworks[], chain: Chain) => {
-          const chainId = toHex(chain.id)
-          if (!isSupportedNetwork(chainId)) {
-            console.warn(`${chain.name} not yet supported by cometh connect`)
-          } else {
-            chains.push(chainId)
-          }
-          return chains
-        },
-        []
-      )
-      if (supportedChains.length === 0)
-        throw new Error('Cometh Connect does not support the provided chains')
+    }
 
-      if (supportedChains.length > 1)
-        console.warn(`Cometh connect does not support multichain`)
+    // if autoconnect already provided
+    if (this.supportedChains) {
+      return this.supportedChains[0]
+    } else {
+      return this._getConfigChain()
+    }
+  }
 
-      return supportedChains[0]
+  private _getConfigChain() {
+    this.supportedChains = this.chains.reduce(
+      (chains: SupportedNetworks[], chain: Chain) => {
+        const chainId = toHex(chain.id)
+        if (!isSupportedNetwork(chainId)) {
+          console.warn(`${chain.name} not yet supported by cometh connect`)
+        } else {
+          chains.push(chainId)
+        }
+        return chains
+      },
+      []
+    )
+    if (this.supportedChains.length === 0) {
+      console.warn('Cometh Connect does not support any the provided chains')
+      throw new Error('Cometh Connect does not support the provided chains')
     }
+
+    if (this.supportedChains.length > 1)
+      console.warn(`Cometh connect does not support multichain`)
+
+    return this.supportedChains[0]
   }
   disconnect(): Promise<void> {
     if (!this.wallet) throw new Error('no')
@@ -203,8 +215,8 @@ export class ComethConnectConnector extends Connector<
       )
         return false
 
-      const provider = await this.getProvider()
-      if (!provider) throw new ConnectorNotFoundError()
+      this._getConfigChain()
+
       return true
     } catch {
       return false

yarn.lock

@@ -185,10 +185,10 @@
     stream-browserify "^3.0.0"
     util "^0.12.4"
 
-"@cometh/connect-sdk@^1.2.11":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@cometh/connect-sdk/-/connect-sdk-1.2.11.tgz#cb797d59ce48d9b29eee52fb24f80f2cf1f9c9ca"
-  integrity sha512-wCGzM7tbbnEAl1QnivWjVU20VdhQZj45W1KRoRaHsZfFsfiiA7xCYMmSwlSpRZRvgXW/vIuH1RaFsKQzklD1/Q==
+"@cometh/connect-sdk@^1.2.12":
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/@cometh/connect-sdk/-/connect-sdk-1.2.12.tgz#b380c9224cde8773c57a5c8aec2555a019f36a5f"
+  integrity sha512-SlG8AI9ruW/05ExJ9+8l8Xd/N/ZmSLkYmOUOnBgzJmxkz6DRu5yCJ3DHkNnFP0YTvzmX3ucl/IH+6w4eXmP1hQ==
   dependencies:
     "@alembic/ui" "^1.5.4"
     "@babel/traverse" "^7.23.4"
@@ -6299,7 +6299,7 @@ [email protected]:
     proxy-compare "2.5.1"
     use-sync-external-store "1.2.0"
 
-viem@^1.0.0, viem@^1.16.2, viem@^1.6.0:
+viem@^1.0.0, viem@^1.19.11, viem@^1.6.0:
   version "1.21.4"
   resolved "https://registry.yarnpkg.com/viem/-/viem-1.21.4.tgz#883760e9222540a5a7e0339809202b45fe6a842d"
   integrity sha512-BNVYdSaUjeS2zKQgPs+49e5JKocfo60Ib2yiXOWBT6LuVxY1I/6fFX3waEtpXvL1Xn4qu+BVitVtMh9lyThyhQ==
@@ -6313,7 +6313,7 @@ viem@^1.0.0, viem@^1.16.2, viem@^1.6.0:
     isows "1.0.3"
     ws "8.13.0"
 
-wagmi@^1.4.7:
+wagmi@^1.4.13:
   version "1.4.13"
   resolved "https://registry.yarnpkg.com/wagmi/-/wagmi-1.4.13.tgz#dc8dc077c7c2195877d7e33477b0417f5d2add4f"
   integrity sha512-AScVYFjqNt1wMgL99Bob7MLdhoTZ3XKiOZL5HVBdy4W1sh7QodA3gQ8IsmTuUrQ7oQaTxjiXEhwg7sWNrPBvJA==