Merge pull request #880 from vanhoanHoang/fix/mdoc-request-path-proce…

…ssing Fix path processing logic in addToMdocRequest Closes #915
walt-id · Jan 30, 2025 · 15d4211 · 15d4211
2 parents b01593d + 16d59ed
commit 15d4211
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...ls/waltid-openid4vc/src/commonMain/kotlin/id/walt/oid4vc/data/dif/InputDescriptorField.kt b/...ls/waltid-openid4vc/src/commonMain/kotlin/id/walt/oid4vc/data/dif/InputDescriptorField.kt
@@ -28,10 +28,11 @@ data class InputDescriptorField(
     }
 
     fun addToMdocRequest(mDocRequestBuilder: MDocRequestBuilder, intentToRetain: Boolean = false): MDocRequestBuilder {
-        path.firstOrNull()?.trimStart('$')?.replace("['", "")?.replace("']", ".")?.trimEnd('.')?.split('.')
-            ?.also { pathSegments ->
-            mDocRequestBuilder.addDataElementRequest(pathSegments.first(), pathSegments.last(), intentToRetain)
-        }
+        path.firstOrNull()?.trimStart('$')?.replace("['", "")?.replace("']", ".")?.trimEnd('.')
+            ?.let { it.substringBeforeLast('.') to it.substringAfterLast('.') }
+            ?.also { (namespace, lastSegment) ->
+                mDocRequestBuilder.addDataElementRequest(namespace, lastSegment, intentToRetain)
+            }
         return mDocRequestBuilder
     }
 }