Merge pull request #1442 from WalletConnect/link_mode/fix_double_redi…

…rect Link mode: fix double redirect
WalletConnect · Jul 15, 2024 · 26d731c · 26d731c
2 parents 67444c1 + 17372f8
commit 26d731c
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 31 deletions.
diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt b/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt
@@ -37,7 +37,7 @@ internal fun String.isValidRelayServerUrl(): Boolean {
 @JvmSynthetic
 internal fun String.projectId(): String {
     return Uri.parse(this)!!.let { relayUrl ->
-         relayUrl.getQueryParameter("projectId")!!
+        relayUrl.getQueryParameter("projectId")!!
     }
 }
 
@@ -47,15 +47,26 @@ internal val Throwable.toWalletConnectException: WalletConnectException
         when {
             this.message?.contains(HttpURLConnection.HTTP_UNAUTHORIZED.toString()) == true ->
                 UnableToConnectToWebsocketException("${this.message}. It's possible that JWT has expired. Try initializing the CoreClient again.")
+
             this.message?.contains(HttpURLConnection.HTTP_NOT_FOUND.toString()) == true ->
                 ProjectIdDoesNotExistException(this.message)
+
             this.message?.contains(HttpURLConnection.HTTP_FORBIDDEN.toString()) == true ->
                 InvalidProjectIdException(this.message)
+
             else -> GenericException("Error while connecting, please check your Internet connection or contact support: $this")
         }
 
 @get:JvmSynthetic
 val Int.Companion.DefaultId
     get() = -1
 
-fun AppMetaData?.toClient() = Core.Model.AppMetaData(this?.name ?: String.Empty, this?.description ?: String.Empty, this?.url ?: String.Empty, this?.icons ?: emptyList(), this?.redirect?.native)
+fun AppMetaData?.toClient() = Core.Model.AppMetaData(
+    name = this?.name ?: String.Empty,
+    description = this?.description ?: String.Empty,
+    url = this?.url ?: String.Empty,
+    icons = this?.icons ?: emptyList(),
+    redirect = this?.redirect?.native,
+    appLink = this?.redirect?.universal,
+    linkMode = this?.redirect?.linkMode ?: false
+)
diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/MetaData.sq b/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/MetaData.sq
@@ -19,7 +19,7 @@ CREATE TABLE MetaData(
 
 insertOrAbortMetaData:
 INSERT OR ABORT INTO MetaData(sequence_topic, name, description, url, icons, native, type, app_link, link_mode)
-VALUES (?, ?, ?, ?, ?, ?,?,?, ?);
+VALUES (?,?,?,?,?,?,?,?,?);
 
 updateMetaData:
 UPDATE MetaData

diff --git a/core/android/src/main/sqldelight/databases/10.db b/core/android/src/main/sqldelight/databases/10.db
diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt
@@ -202,28 +202,8 @@ internal class SignEngine(
     }
 
     fun setup() {
-        //todo: clean up
-        if (envelopeRequestsJob == null) {
-            envelopeRequestsJob = linkModeJsonRpcInteractor.clientSyncJsonRpc
-                .filter { request -> request.params is SignParams }
-                .onEach { request ->
-                    when (val requestParams = request.params) {
-                        is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
-                        is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
-                    }
-                }.launchIn(scope)
-        }
-
-        if (envelopeResponsesJob == null) {
-            envelopeResponsesJob = linkModeJsonRpcInteractor.peerResponse
-                .filter { request -> request.params is SignParams }
-                .onEach { response ->
-                    when (val params = response.params) {
-                        is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
-                        is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
-                    }
-                }.launchIn(scope)
-        }
+        handleLinkModeRequests()
+        handleLinkModeResponses()
 
         if (signEventsJob == null) {
             signEventsJob = collectSignEvents()
@@ -233,6 +213,10 @@ internal class SignEngine(
             internalErrorsJob = collectInternalErrors()
         }
 
+        handleRelayRequestsAndResponses()
+    }
+
+    private fun handleRelayRequestsAndResponses() {
         jsonRpcInteractor.wssConnectionState
             .filterIsInstance<WSSConnectionState.Connected>()
             .onEach {
@@ -253,6 +237,32 @@ internal class SignEngine(
             }.launchIn(scope)
     }
 
+    private fun handleLinkModeResponses() {
+        if (envelopeResponsesJob == null) {
+            envelopeResponsesJob = linkModeJsonRpcInteractor.peerResponse
+                .filter { request -> request.params is SignParams }
+                .onEach { response ->
+                    when (val params = response.params) {
+                        is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
+                        is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
+                    }
+                }.launchIn(scope)
+        }
+    }
+
+    private fun handleLinkModeRequests() {
+        if (envelopeRequestsJob == null) {
+            envelopeRequestsJob = linkModeJsonRpcInteractor.clientSyncJsonRpc
+                .filter { request -> request.params is SignParams }
+                .onEach { request ->
+                    when (val requestParams = request.params) {
+                        is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
+                        is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
+                    }
+                }.launchIn(scope)
+        }
+    }
+
     private fun collectJsonRpcRequests(): Job =
         jsonRpcInteractor.clientSyncJsonRpc
             .filter { request -> request.params is SignParams }

diff --git a/.../kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt b/.../kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt
@@ -162,7 +162,6 @@ internal class ApproveSessionAuthenticateUseCase(
             if (jsonRpcHistoryEntry.transportType == TransportType.LINK_MODE && receiverMetadata.redirect?.linkMode == true) {
                 if (receiverMetadata.redirect?.universal.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
                 try {
-                    onSuccess()
                     linkModeJsonRpcInteractor.triggerResponse(
                         responseTopic,
                         response,

diff --git a/...n/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt b/...n/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt
@@ -69,7 +69,6 @@ internal class RejectSessionAuthenticateUseCase(
                     Participants(senderPublicKey, receiverPublicKey),
                     EnvelopeType.ONE
                 )
-                onSuccess()
             } catch (e: Exception) {
                 onFailure(e)
             }

diff --git a/.../main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt b/.../main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt
@@ -73,7 +73,6 @@ internal class RespondSessionRequestUseCase(
             try {
                 removePendingSessionRequestAndEmit(jsonRpcResponse.id)
                 linkModeJsonRpcInteractor.triggerResponse(Topic(topic), jsonRpcResponse, session.peerAppLink)
-                onSuccess()
             } catch (e: Exception) {
                 onFailure(e)
             }

diff --git a/sample/modal/src/main/AndroidManifest.xml b/sample/modal/src/main/AndroidManifest.xml
@@ -73,7 +73,7 @@
                 <data
                     android:host="web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app"
                     android:scheme="https"
-                    android:pathPrefix="/dapp"/>
+                    android:pathPrefix="/lab"/>
             </intent-filter>
 
             <intent-filter>

diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleApp.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleApp.kt
@@ -28,7 +28,7 @@ class ModalSampleApp : Application() {
             icons = listOf("https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"),
             redirect = "kotlin-modal-wc://request",
             linkMode = true,
-            appLink = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/dapp"
+            appLink = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/lab"
         )
 
         CoreClient.initialize(

diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt
@@ -75,7 +75,6 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate {
 
     override val onSessionAuthenticate: (Wallet.Model.SessionAuthenticate, Wallet.Model.VerifyContext) -> Unit
         get() = { sessionAuthenticate, verifyContext ->
-
             sessionAuthenticateEvent = Pair(sessionAuthenticate, verifyContext)
 
             scope.launch {

diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt
@@ -13,6 +13,7 @@ data class PeerUI(
     val peerName: String,
     val peerUri: String,
     val peerDescription: String,
+    val linkMode: Boolean = false
 ) {
     companion object {
         val Empty = PeerUI("", "", "", "")

diff --git a/...ct/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt b/...ct/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt
@@ -139,6 +139,11 @@ private fun SessionAuthenticateDialog(
             onCancel = {
                 isCancelLoading = true
 
+                if (authenticateRequestUI.peerUI.linkMode) {
+                    navController.popBackStack(route = Route.Connections.path, inclusive = false)
+                    connectionsViewModel.refreshConnections()
+                }
+
                 try {
                     sessionAuthenticateViewModel.reject(
                         onSuccess = { redirect ->
@@ -165,6 +170,11 @@ private fun SessionAuthenticateDialog(
             }, onConfirm = {
                 isConfirmLoading = true
 
+                if (authenticateRequestUI.peerUI.linkMode) {
+                    navController.popBackStack(route = Route.Connections.path, inclusive = false)
+                    connectionsViewModel.refreshConnections()
+                }
+
                 try {
                     sessionAuthenticateViewModel.approve(
                         onSuccess = { redirect ->

diff --git a/...ample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/...ample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt
@@ -118,6 +118,7 @@ class SessionAuthenticateViewModel : ViewModel() {
                     peerName = "Kotlin Wallet",
                     peerUri = "https://walletconnect.com/",
                     peerDescription = "The communications protocol for web3.",
+                    linkMode = sessionAuthenticate.participant.metadata?.linkMode ?: false
                 ),
                 messages = messages,
                 peerContextUI = authContext.toPeerUI()

diff --git a/...alletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt b/...alletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt
@@ -85,6 +85,9 @@ fun SessionRequestRoute(navController: NavHostController, sessionRequestViewMode
                     allowButtonColor,
                     onConfirm = {
                         isConfirmLoading = true
+                        if (sessionRequestUI.peerUI.linkMode) {
+                            navController.popBackStack(route = Route.Connections.path, inclusive = false)
+                        }
                         try {
                             sessionRequestViewModel.approve(
                                 onSuccess = { uri ->
@@ -111,6 +114,9 @@ fun SessionRequestRoute(navController: NavHostController, sessionRequestViewMode
                     },
                     onCancel = {
                         isCancelLoading = true
+                        if (sessionRequestUI.peerUI.linkMode) {
+                            navController.popBackStack(route = Route.Connections.path, inclusive = false)
+                        }
                         try {
                             sessionRequestViewModel.reject(
                                 onSuccess = { uri ->

diff --git a/...tconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/...tconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt
@@ -139,6 +139,7 @@ class SessionRequestViewModel : ViewModel() {
                     peerIcon = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
                     peerUri = sessionRequest.peerMetaData?.url ?: "",
                     peerDescription = sessionRequest.peerMetaData?.description ?: "",
+                    linkMode = sessionRequest.peerMetaData?.linkMode ?: false
                 ),
                 topic = sessionRequest.topic,
                 requestId = sessionRequest.request.id,