From 92515b58b038c04991fda9e09f76ab7ffd65bb4f Mon Sep 17 00:00:00 2001
From: Neal <groessler24@gmail.com>
Date: Tue, 30 Jul 2024 11:15:45 -0700
Subject: [PATCH] update

---
 .../web5/sdk/dids/methods/web/DidWebTests.kt  | 79 +++++++------------
 .../src/dids/resolution/resolution_result.rs  | 12 ++-
 2 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/bound/kt/src/test/kotlin/web5/sdk/dids/methods/web/DidWebTests.kt b/bound/kt/src/test/kotlin/web5/sdk/dids/methods/web/DidWebTests.kt
index 738573f3..e63e4ac8 100644
--- a/bound/kt/src/test/kotlin/web5/sdk/dids/methods/web/DidWebTests.kt
+++ b/bound/kt/src/test/kotlin/web5/sdk/dids/methods/web/DidWebTests.kt
@@ -1,56 +1,37 @@
 package web5.sdk.dids.methods.web
 
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.*
-import web5.sdk.dids.Document
-import web5.sdk.rust.DidJwk
-import web5.sdk.rust.RustCoreException
 
 class DidWebTests {
-
-    // TODO: Did web resolution errors - https://github.com/TBD54566975/web5-rs/issues/272
-//    @Test
-//    fun `can create did web from uri`() = runBlocking {
-//        val didUri = "did:web:localhost:1234"
-//        val resolvedDid = DidWeb(didUri)
-//
-//        assertEquals("did:web:localhost:1234", resolvedDid.document!!.id)
-//    }
-
-//    @Test
-//    fun `can create did web from url`() {
-//        val didDocument = Document(
-//            id = "did:web:localhost:1234",
-//            context = listOf("https://www.w3.org/ns/did/v1"),
-//            verificationMethod = listOf(
-//                VerificationMethod(
-//                    id = "did:web:www.tbd.website#key-0",
-//                    type = "JsonWebKey",
-//                    controller = "did:web:www.tbd.website",
-//                    publicKeyJwk = PublicKeyJwk(
-//                        alg = "Ed25519",
-//                        kty = "OKP",
-//                        crv = "Ed25519",
-//                        x = "gNFtgCZhOYv00p48FHQYt4edkoBPOyw0oGAB20LrT0c"
-//                    )
-//                )
-//            )
-//        )
-//
-//        // TODO: Construct a resolution result the correct way
-//        val resolutionResult = web5.sdk.dids.methods.jwk.DidJwk.resolve("did:jwk:eyJhbGciOiJFZDI1NTE5Iiwia3R5IjoiT0tQIiwiY3J2IjoiRWQyNTUxOSIsImQiOiJwR0tScHBWczlqYkhWYkZjNm5MTmZQZEN0RG9lOHV1VVNaNVMzX3VOWXpvIiwieCI6IjV5V0FBMkZBM25pMnJaSjh3NVVKMkxMdFZHN2lsYU0wRkc1ZVYwXzZ4U3cifQ")
+    
+    @Test
+    fun `can resolve did web uri`() {
+//        Works if you host a local did web document You must host this json at http://localhost:1234/.well-known/did.json
+//        val didDocumentJson = """
+//            {
+//               "id":"did:web.tbd.website",
+//               "@context":[
+//                  "https://www.w3.org/ns/did/v1"
+//               ],
+//               "verificationMethod":[
+//                  {
+//                     "id":"did:web:www.tbd.website#key-0",
+//                     "type":"JsonWebKey",
+//                     "controller":"did:web:www.tbd.website",
+//                     "publicKeyJwk":{
+//                        "alg":"Ed25519",
+//                        "kty":"OKP",
+//                        "crv":"Ed25519",
+//                        "x":"gNFtgCZhOYv00p48FHQYt4edkoBPOyw0oGAB20LrT0c"
+//                     }
+//                  }
+//               ]
+//            }
+//        """.trimIndent()
 //
-//        mockkStatic("web5.sdk.dids.methods.web.DidWeb")
-//        coEvery { DidWeb.resolve("did:web:localhost:1234") } returns resolutionResult
+//        val didUri = "did:web:localhost%3A1234"
+//        val resolvedDid = DidWeb.resolve(didUri)
 //
-//        val didWebResolutionResult = DidWeb.resolve("did:web:localhost:1234")
-//        assertEquals("did:web:localhost:1234", didWebResolutionResult.document!!.id)
-//    }
-}
+//        assertEquals(resolvedDid.document!!.id, "did:web:www.tbd.website")
+    }
+}
\ No newline at end of file
diff --git a/crates/web5/src/dids/resolution/resolution_result.rs b/crates/web5/src/dids/resolution/resolution_result.rs
index e3261a85..81542bc4 100644
--- a/crates/web5/src/dids/resolution/resolution_result.rs
+++ b/crates/web5/src/dids/resolution/resolution_result.rs
@@ -56,7 +56,7 @@ mod tests {
     }
 
     #[test]
-    fn can_resolve_did_web() {
+    fn can_resolve_invalid_did_web() {
         let did_uri = "did:web:tbd.website";
         let resolution_result = ResolutionResult::new(did_uri);
 
@@ -67,6 +67,16 @@ mod tests {
         );
     }
 
+    // This works if you host a did web document json at http://localhost:1234/.well-known/did.json
+    // #[test]
+    // fn can_resolve_valid_did_web() {
+    //     let did_uri = "did:web:localhost%3A1234";
+    //     let resolution_result = ResolutionResult::new(did_uri);
+    //
+    //     assert_eq!(None, resolution_result.resolution_metadata.error);
+    //     assert_eq!(resolution_result.document.unwrap().id, "did:web:tbd.website");
+    // }
+
     #[test]
     fn can_resolve_did_dht() {
         let did_uri = "did:dht:swit41ctrddy1s38c5j46yfgbxmwo1emau71zo5hn1tws1g63hiy";