refactor: did doc default context list to did utils object

walt-id · Sep 16, 2024 · 8cc9956 · 8cc9956
1 parent 29612da
commit 8cc9956
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 27 deletions.
diff --git a/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/DidUtils.kt b/waltid-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/DidUtils.kt
@@ -6,7 +6,12 @@ import kotlin.js.JsExport
 @OptIn(ExperimentalJsExport::class)
 @JsExport
 object DidUtils {
+
+    val DEFAULT_CONTEXT =
+        listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
+
     private const val PATTERN = "^did:([^:]+):(.+)"
+
     fun methodFromDid(did: String) = did.removePrefix("did:").substringBefore(":")
 
     fun identifierFromDid(did: String): String? = pathFromDid(did)?.substringBefore('#')

diff --git a/...-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt b/...-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidCheqdDocument.kt
@@ -1,5 +1,6 @@
 package id.walt.did.dids.document
 
+import id.walt.did.dids.DidUtils
 import id.walt.did.dids.registrar.local.cheqd.models.job.didstates.finished.DidDocument
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -17,7 +18,7 @@ import kotlin.js.JsName
 @OptIn(ExperimentalSerializationApi::class, ExperimentalJsExport::class)
 @Serializable
 data class DidCheqdDocument(
-    @EncodeDefault @SerialName("@context") val context: List<String> = DEFAULT_CONTEXT,
+    @EncodeDefault @SerialName("@context") val context: List<String> = DidUtils.DEFAULT_CONTEXT,
     val id: String, // did:cheqd:
 
     val verificationMethod: List<VerificationMethod>?,
@@ -27,10 +28,6 @@ data class DidCheqdDocument(
     val capabilityDelegation: List<String>?,
     val keyAgreement: List<String>?,
 ) {
-    companion object {
-        private val DEFAULT_CONTEXT =
-            listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
-    }
 
     @Serializable
     data class VerificationMethod(
@@ -44,7 +41,7 @@ data class DidCheqdDocument(
 
     @JsName("secondaryConstructor")
     constructor(didDoc: DidDocument, jwk: JsonObject? = null) : this(
-        context = DEFAULT_CONTEXT,
+        context = DidUtils.DEFAULT_CONTEXT,
         id = didDoc.id,
         //TODO: publicKeyMultibase
         verificationMethod = jwk?.let { key ->

diff --git a/...d-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidEbsiDocument.kt b/...d-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidEbsiDocument.kt
@@ -1,5 +1,6 @@
 package id.walt.did.dids.document
 
+import id.walt.did.dids.DidUtils
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import kotlin.js.ExperimentalJsExport
@@ -10,7 +11,7 @@ import kotlin.js.JsName
 @OptIn(ExperimentalSerializationApi::class, ExperimentalJsExport::class)
 @Serializable
 data class DidEbsiDocument(
-    @EncodeDefault @SerialName("@context") val context: List<String> = DEFAULT_CONTEXT,
+    @EncodeDefault @SerialName("@context") val context: List<String> = DidUtils.DEFAULT_CONTEXT,
     val id: String, // did:ebsi:
     val controller: List<String>?,
     val verificationMethod: List<VerificationMethod>?,
@@ -21,8 +22,6 @@ data class DidEbsiDocument(
     val keyAgreement: List<String>?,
 ) {
     companion object {
-        private val DEFAULT_CONTEXT =
-            listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
         private val json = Json {
             explicitNulls = false
         }
@@ -40,7 +39,7 @@ data class DidEbsiDocument(
 
     @JsName("secondaryConstructor")
     constructor(didDoc: DidDocument) : this(
-        context = DEFAULT_CONTEXT,
+        context = DidUtils.DEFAULT_CONTEXT,
         id = didDoc["id"]!!.jsonPrimitive.content,
         controller = didDoc["controller"]?.jsonArray?.map {
             it.jsonPrimitive.content

diff --git a/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidJwkDocument.kt b/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidJwkDocument.kt
@@ -1,6 +1,7 @@
 package id.walt.did.dids.document
 
 
+import id.walt.did.dids.DidUtils
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
@@ -28,7 +29,7 @@ import kotlin.js.JsName
 @Serializable
 data class DidJwkDocument(
     @EncodeDefault @SerialName("@context")
-    val context: List<String> = DEFAULT_CONTEXT,
+    val context: List<String> = DidUtils.DEFAULT_CONTEXT,
     val id: String, // did:jwk:${base64url-value}
 
     val verificationMethod: List<VerificationMethod>?,
@@ -38,9 +39,6 @@ data class DidJwkDocument(
     val capabilityDelegation: List<String>?,
     val keyAgreement: List<String>?,
 ) {
-    companion object {
-        private val DEFAULT_CONTEXT = listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
-    }
 
     @Serializable
     data class VerificationMethod(
@@ -54,7 +52,7 @@ data class DidJwkDocument(
 
     @JsName("secondaryConstructor")
     constructor(did: String, didJwk: JsonObject) : this(
-        context = DEFAULT_CONTEXT,
+        context = DidUtils.DEFAULT_CONTEXT,
         id = did,
         verificationMethod = listOf(VerificationMethod("$did#0", "JsonWebKey2020", did, didJwk)),
 

diff --git a/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidKeyDocument.kt b/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidKeyDocument.kt
@@ -1,5 +1,6 @@
 package id.walt.did.dids.document
 
+import id.walt.did.dids.DidUtils
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
@@ -16,7 +17,7 @@ import kotlin.js.JsName
 @OptIn(ExperimentalSerializationApi::class, ExperimentalJsExport::class)
 @Serializable
 data class DidKeyDocument(
-    @EncodeDefault @SerialName("@context") val context: List<String> = DEFAULT_CONTEXT,
+    @EncodeDefault @SerialName("@context") val context: List<String> = DidUtils.DEFAULT_CONTEXT,
     val id: String, // did:key:
 
     val verificationMethod: List<VerificationMethod>?,
@@ -26,10 +27,6 @@ data class DidKeyDocument(
     val capabilityDelegation: List<String>?,
     val keyAgreement: List<String>?,
 ) {
-    companion object {
-        private val DEFAULT_CONTEXT =
-            listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
-    }
 
     @Serializable
     data class VerificationMethod(
@@ -43,7 +40,7 @@ data class DidKeyDocument(
 
     @JsName("secondaryConstructor")
     constructor(did: String, identifier: String, didKey: JsonObject) : this(
-        context = DEFAULT_CONTEXT,
+        context = DidUtils.DEFAULT_CONTEXT,
         id = did,
         verificationMethod = listOf(VerificationMethod("$did#$identifier", "JsonWebKey2020", did, didKey)),
 

diff --git a/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidWebDocument.kt b/...id-libraries/waltid-did/src/commonMain/kotlin/id/walt/did/dids/document/DidWebDocument.kt
@@ -1,5 +1,6 @@
 package id.walt.did.dids.document
 
+import id.walt.did.dids.DidUtils
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
@@ -16,7 +17,7 @@ import kotlin.js.JsName
 @OptIn(ExperimentalSerializationApi::class, ExperimentalJsExport::class)
 @Serializable
 data class DidWebDocument(
-    @EncodeDefault @SerialName("@context") val context: List<String> = DEFAULT_CONTEXT,
+    @EncodeDefault @SerialName("@context") val context: List<String> = DidUtils.DEFAULT_CONTEXT,
     val id: String, // did:web:
 
     val verificationMethod: List<VerificationMethod>?,
@@ -26,10 +27,6 @@ data class DidWebDocument(
     val capabilityDelegation: List<String>?,
     val keyAgreement: List<String>?,
 ) {
-    companion object {
-        private val DEFAULT_CONTEXT =
-            listOf("https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1")
-    }
 
     @Serializable
     data class VerificationMethod(
@@ -43,7 +40,7 @@ data class DidWebDocument(
 
     @JsName("secondaryConstructor")
     constructor(did: String, keyId: String, didKey: JsonObject) : this(
-        context = DEFAULT_CONTEXT,
+        context = DidUtils.DEFAULT_CONTEXT,
         id = did,
         verificationMethod = listOf(VerificationMethod("$did#$keyId", "JsonWebKey2020", did, didKey)),