fix: backup recovery was linking incorrectly dids with private keys

Signed-off-by: Cristian G <[email protected]>
hyperledger · Jul 30, 2024 · b6f79a2 · b6f79a2
1 parent 6b1e7b9
commit b6f79a2
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/...gent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoBackupTask.kt b/...gent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoBackupTask.kt
@@ -42,7 +42,7 @@ open class PlutoBackupTask(private val pluto: Pluto) {
                     dids = dids.await(),
                     didPairs = didPairs.await(),
                     keys = privateKeys.await(),
-                    linkSecret = linkSecret.await()!!,
+                    linkSecret = linkSecret.await(),
                     messages = messages.await(),
                     mediators = mediator.await()
                 )

diff --git a/...ent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoRestoreTask.kt b/...ent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoRestoreTask.kt
@@ -181,9 +181,10 @@ open class PlutoRestoreTask(
                     val did = (it.third as DID)
                     val keyId = did.toString()
                     if (keyId.contains("#")) {
+                        val simpleDid = keyId.split("#").first()
                         pluto.storePrivateKeys(
                             it.first as StorableKey,
-                            did,
+                            DID(simpleDid),
                             (it.first.keySpecification[IndexKey().property])?.toInt(),
                             keyId
                         )
@@ -242,7 +243,9 @@ open class PlutoRestoreTask(
      * If the backup object has a link secret, it is decoded from base64 URL encoding and stored using the pluto.storeLinkSecret method.
      */
     private fun restoreLinkSecret() {
-        pluto.storeLinkSecret(this.backup.linkSecret)
+        if (this.backup.linkSecret != null) {
+            pluto.storeLinkSecret(this.backup.linkSecret)
+        }
     }
 
     /**

diff --git a/...c/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/backup/models/BackupV0_0_1.kt b/...c/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/backup/models/BackupV0_0_1.kt
@@ -32,7 +32,7 @@ constructor(
     val keys: List<Key>,
     val messages: List<String>,
     @SerialName("link_secret")
-    val linkSecret: String,
+    val linkSecret: String?,
     val mediators: List<Mediator>
 ) {
 

diff --git a/...k/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/pluto/BackupRestorationTests.kt b/...k/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/pluto/BackupRestorationTests.kt
diff --git a/sampleapp/src/main/java/org/hyperledger/identus/walletsdk/sampleapp/ui/main/MainActivity.kt b/sampleapp/src/main/java/org/hyperledger/identus/walletsdk/sampleapp/ui/main/MainActivity.kt