Merge pull request #8 from input-output-hk/fix/mediator_did_multiserivce

cristianIOHK · web-flow · commit 8f7636c618b9 · 2023-11-24T16:19:37.000-05:00
fix: current regex does not supports multiple services within a DID
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
 }
 
 allprojects {
-    version = "1.0.4-alpha"
+    version = "1.0.5-alpha"
     group = "io.iohk.atala.prism.didcomm"
 
     repositories {
diff --git a/didpeer/src/commonMain/kotlin/io/iohk/atala/prism/didcomm/didpeer/PeerDIDCreator.kt b/didpeer/src/commonMain/kotlin/io/iohk/atala/prism/didcomm/didpeer/PeerDIDCreator.kt
@@ -20,7 +20,7 @@ fun isPeerDID(peerDID: String): Boolean {
     val regex =
         (
             "^did:peer:(([0](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))" +
-                "|(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))+(.(S)[0-9a-zA-Z=]*)?)))$"
+                "|(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))+(.(S)[0-9a-zA-Z=]*)*)))$"
         ).toRegex()
     return regex.matches(peerDID)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`allprojects {`
`22`		`- version = "1.0.4-alpha"`
	`22`	`+ version = "1.0.5-alpha"`
`23`	`23`	`group = "io.iohk.atala.prism.didcomm"`
`24`	`24`
`25`	`25`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ fun isPeerDID(peerDID: String): Boolean {`
`20`	`20`	`val regex =`
`21`	`21`	`(`
`22`	`22`	`"^did:peer:(([0](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))" +`
`23`		`- "\|(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))+(.(S)[0-9a-zA-Z=]*)?)))$"`
	`23`	`+ "\|(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{46,47}))+(.(S)[0-9a-zA-Z=]))))$"`
`24`	`24`	`).toRegex()`
`25`	`25`	`return regex.matches(peerDID)`
`26`	`26`	`}`