Merge branch 'fix-disclosed-attributes-url' into 'main'

Fix relative disclosed attributes url

See merge request wallet/nl-wallet!568

Author: Arjen

wallet_core/mock_relying_party/src/app.rs

@@ -131,8 +131,10 @@ async fn engage(State(state): State<Arc<ApplicationState>>, Form(selected): Form
         .await?;
 
     // the mrp disclosed attributes url matches the wallet server disclosed attributes url
-    let mut mrp_disclosed_attributes_url: Url = state.public_url.clone();
-    mrp_disclosed_attributes_url.set_path(disclosed_attributes_url.path());
+    let mrp_disclosed_attributes_url: Url = state
+        .public_url
+        .join(disclosed_attributes_url.path())
+        .expect("should always be a valid url");
 
     Ok(askama_axum::into_response(&DisclosureTemplate {
         engagement: Some((

wallet_core/mock_relying_party/templates/disclosure.html

@@ -43,7 +43,8 @@
         let disclosedAttributesUrl;
         if (window.location.hash) {
             let sessionId = window.location.hash.substring(1)
-            disclosedAttributesUrl = `/sessions/${sessionId}/disclosed_attributes`
+            let publicUrl = [window.location.protocol, '//', window.location.host, window.location.pathname].join('');
+            disclosedAttributesUrl = `${publicUrl}/sessions/${sessionId}/disclosed_attributes`
             if (window.location.search.startsWith("?transcript_hash=")) {
                 let end = window.location.search.search("&")
                 end = end == -1 ? window.location.search.length : end