reorder sanity checks to properly throw invalidPersona when request s…

…pecifies persona unknown to the dApp
radixdlt · Aug 6, 2024 · 359ff4a · 359ff4a
1 parent 7a5a81f
commit 359ff4a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/.../main/java/com/babylon/wallet/android/domain/usecases/AuthorizeSpecifiedPersonaUseCase.kt b/.../main/java/com/babylon/wallet/android/domain/usecases/AuthorizeSpecifiedPersonaUseCase.kt
@@ -47,13 +47,7 @@ class AuthorizeSpecifiedPersonaUseCase @Inject constructor(
         var operationResult: Result<DAppData> = Result.failure(
             RadixWalletException.DappRequestException.NotPossibleToAuthenticateAutomatically
         )
-        if (incomingRequest.isMobileConnectRequest) {
-            return operationResult
-        }
         (incomingRequest as? AuthorizedRequest)?.let { request ->
-            if (incomingRequest.needSignatures()) {
-                return@let
-            }
             (request.authRequest as? AuthorizedRequest.AuthRequest.UsePersonaRequest)?.let {
                 val authorizedDapp = dAppConnectionRepository.getAuthorizedDApp(
                     dAppDefinitionAddress = AccountAddress.init(request.metadata.dAppDefinitionAddress)
@@ -62,11 +56,14 @@ class AuthorizeSpecifiedPersonaUseCase @Inject constructor(
                     respondWithInvalidPersona(incomingRequest)
                     return Result.failure(RadixWalletException.DappRequestException.InvalidPersona)
                 }
+                if (incomingRequest.needSignatures() || incomingRequest.isMobileConnectRequest) {
+                    return operationResult
+                }
                 val authorizedPersonaSimple = authorizedDapp
                     .referencesToAuthorizedPersonas
                     .firstOrNull { authorizedPersonaSimple ->
                         authorizedPersonaSimple.identityAddress.string ==
-                            (request.authRequest as? AuthorizedRequest.AuthRequest.UsePersonaRequest)?.identityAddress?.string
+                                (request.authRequest as? AuthorizedRequest.AuthRequest.UsePersonaRequest)?.identityAddress?.string
                     }
                 if (authorizedPersonaSimple == null) {
                     respondWithInvalidPersona(incomingRequest)