Add PortableDid, use existing UniFFI interfaces

TBD54566975 · Jul 30, 2024 · 73ec374 · 73ec374
1 parent 3a95df4
commit 73ec374
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 57 deletions.
diff --git a/bound/kt/src/main/kotlin/web5/sdk/crypto/keys/InMemoryKeyManager.kt b/bound/kt/src/main/kotlin/web5/sdk/crypto/keys/InMemoryKeyManager.kt
@@ -1,10 +1,8 @@
 package web5.sdk.crypto.keys
 
-import web5.sdk.crypto.signers.OuterSigner
 import web5.sdk.crypto.signers.Signer
 import web5.sdk.rust.SystemTarget
 import web5.sdk.rust.InMemoryKeyManager as RustCoreInMemoryKeyManager
-import web5.sdk.rust.KeyManager as RustCoreKeyManager
 
 /**
  * A class for managing cryptographic keys in-memory.
@@ -34,17 +32,7 @@ class InMemoryKeyManager : KeyManager {
      * @return Signer The signer for the given public key.
      */
     override fun getSigner(publicJwk: Jwk): Signer {
-        val innerSigner = this.rustCoreInMemoryKeyManager.getSigner(publicJwk)
-        return OuterSigner(innerSigner)
-    }
-
-    /**
-     * Returns the RustCoreKeyManager.
-     *
-     * @return RustCoreKeyManager The rust core key manager.
-     */
-    override fun getRustCoreKeyManager(): RustCoreKeyManager {
-        return this.rustCoreInMemoryKeyManager.getAsKeyManager()
+        return this.rustCoreInMemoryKeyManager.getSigner(publicJwk)
     }
 
     /**

diff --git a/bound/kt/src/main/kotlin/web5/sdk/crypto/keys/KeyManager.kt b/bound/kt/src/main/kotlin/web5/sdk/crypto/keys/KeyManager.kt
@@ -1,25 +1,6 @@
 package web5.sdk.crypto.keys
 
-import web5.sdk.crypto.signers.Signer
 import web5.sdk.rust.KeyManager as RustCoreKeyManager
 
-/**
- * An interface representing a key manager for cryptographic operations.
- */
-interface KeyManager {
+typealias KeyManager = RustCoreKeyManager
 
-    /**
-     * Returns the signer for the given public key.
-     *
-     * @param publicKey The public key represented as a Jwk.
-     * @return Signer The signer for the given public key.
-     */
-    fun getSigner(publicJwk: Jwk): Signer
-
-    /**
-     * Returns the RustCoreKeyManager
-     *
-     * @return RustCoreKeyManager The rust core key manager
-     */
-    fun getRustCoreKeyManager(): RustCoreKeyManager
-}
diff --git a/bound/kt/src/main/kotlin/web5/sdk/crypto/signers/Signer.kt b/bound/kt/src/main/kotlin/web5/sdk/crypto/signers/Signer.kt
@@ -1,24 +1,5 @@
 package web5.sdk.crypto.signers
 
-import web5.sdk.rust.SystemTarget
 import web5.sdk.rust.Signer as RustCoreSigner
 
-interface Signer {
-    fun sign(payload: ByteArray): ByteArray
-}
-
-class OuterSigner: Signer {
-    init {
-        SystemTarget.set() // ensure the sys arch is set for first-time loading
-    }
-
-    private val rustCoreSigner: RustCoreSigner
-
-    constructor(rustCoreSigner: RustCoreSigner) {
-        this.rustCoreSigner = rustCoreSigner
-    }
-
-    override fun sign(payload: ByteArray): ByteArray {
-        return this.rustCoreSigner.sign(payload)
-    }
-}
+typealias Signer = RustCoreSigner
diff --git a/bound/kt/src/main/kotlin/web5/sdk/dids/BearerDid.kt b/bound/kt/src/main/kotlin/web5/sdk/dids/BearerDid.kt
@@ -2,7 +2,6 @@ package web5.sdk.dids
 
 import web5.sdk.crypto.signers.Signer
 import web5.sdk.crypto.keys.KeyManager
-import web5.sdk.crypto.signers.OuterSigner
 import web5.sdk.rust.SystemTarget
 
 import web5.sdk.rust.BearerDid as RustCoreBearerDid
@@ -32,21 +31,34 @@ class BearerDid {
      * @param keyManager The key manager to handle keys.
      */
     constructor(uri: String, keyManager: KeyManager) {
-        this.rustCoreBearerDid = RustCoreBearerDid(uri, keyManager.getRustCoreKeyManager())
+        this.rustCoreBearerDid = RustCoreBearerDid(uri, keyManager)
 
         this.did = this.rustCoreBearerDid.getData().did
         this.document = this.rustCoreBearerDid.getData().document
         this.keyManager = keyManager
     }
 
+    /**
+     * Constructs a BearerDid instance from a PortableDid.
+     *
+     * @param portableDid The PortableDid.
+     */
+    constructor(portableDid: PortableDid) {
+        this.rustCoreBearerDid = RustCoreBearerDid.fromPortableDid(portableDid.rustCorePortableDid)
+
+        val data = this.rustCoreBearerDid.getData()
+        this.did = data.did
+        this.document = data.document
+        this.keyManager = data.keyManager
+    }
+
     /**
      * Returns a signer for the DID.
      *
      * @return Signer The signer for the DID.
      */
     fun getSigner(): Signer {
         val keyId = this.document.verificationMethod.first().id
-        val innerSigner = this.rustCoreBearerDid.getSigner(keyId)
-        return OuterSigner(innerSigner)
+        return this.rustCoreBearerDid.getSigner(keyId)
     }
 }
diff --git a/bound/kt/src/main/kotlin/web5/sdk/dids/PortableDid.kt b/bound/kt/src/main/kotlin/web5/sdk/dids/PortableDid.kt
@@ -0,0 +1,25 @@
+package web5.sdk.dids
+
+import web5.sdk.crypto.keys.Jwk
+import web5.sdk.rust.SystemTarget
+import web5.sdk.rust.PortableDid as RustCorePortableDid
+
+class PortableDid {
+    init {
+        SystemTarget.set() // ensure the sys arch is set for first-time loading
+    }
+
+    val didUri: String
+    val document: Document
+    val privateKeys: List<Jwk>
+
+    internal val rustCorePortableDid: RustCorePortableDid
+
+    constructor(json: String) {
+        this.rustCorePortableDid = RustCorePortableDid(json)
+
+        this.didUri = rustCorePortableDid.getData().didUri
+        this.document = rustCorePortableDid.getData().document
+        this.privateKeys = rustCorePortableDid.getData().privateJwks
+    }
+}