Fix fromString on DID

Signed-off-by: Shota Jolbordi <[email protected]>

Author: Shota Jolbordi

node/src/main/scala/io/iohk/atala/prism/node/identity/Did.scala

@@ -9,11 +9,12 @@ object Did {
   val DID_SCHEME: String = "did"
 
   def fromString(didStr: String): Did = {
-    // https://www.w3.org/TR/did-core/#did-syntax
-    val didPattern = "did:([A-Za-z0-9]+):((?:[a-zA-Z0-9._-]|%[0-9A-Fa-f]{2})+)".r
+    // https://www.w3.org/TR/did-core/#did-syntax plus encoded state that is prism specific
+    val didPattern = "did:([A-Za-z0-9]+):((?:[a-zA-Z0-9._-]|%[0-9A-Fa-f]{2})+)(?::([a-zA-Z0-9_-]+))?".r
     didStr match {
-      case didPattern(methodName, methodSpecificId) =>
-        Did(DidMethod.fromString(methodName), DidMethodSpecificId.fromString(methodSpecificId))
+      case didPattern(methodName, methodSpecificId, encodedState) =>
+        val methodSpecificIdWithState = Option(encodedState).fold(methodSpecificId)(encodedState => s"$methodSpecificId:$encodedState")
+        Did(DidMethod.fromString(methodName), DidMethodSpecificId.fromString(methodSpecificIdWithState))
       case _ => throw new IllegalArgumentException(s"Invalid DID format: $didStr")
     }
   }

node/src/main/scala/io/iohk/atala/prism/node/identity/PrismDid.scala

@@ -125,7 +125,7 @@ object PrismDid {
         longFormMatchGroups match {
           case Some(groups) =>
             val List(stateHashHex, encodedStateBase64, _*) = groups
-            require(longFormMatchGroups.size == 2, "Invalid long form Prism DID")
+            require(groups.size == 2, "Invalid long form Prism DID")
             val stateHash = Sha256Hash.fromHex(stateHashHex)
             val encodedState = Base64Utils.decodeURL(encodedStateBase64)
             val atalaOperation = decodeState(stateHash, encodedState)