Merge branch 'add-same-device-no-return' into 'main'

Add same_device without return_url flow

See merge request wallet/nl-wallet!672

Author: Arjen

wallet_core/mock_relying_party/src/app.rs

@@ -76,8 +76,9 @@ struct SelectForm {
 #[strum(serialize_all = "snake_case")]
 enum MrpSessionType {
     SameDevice,
+    SameDeviceNoReturn,
     CrossDevice,
-    Hybrid,
+    CrossDeviceWithReturn,
 }
 
 #[derive(Template)]
@@ -105,7 +106,7 @@ struct EngageUrlparams {
 async fn engage(State(state): State<Arc<ApplicationState>>, Form(selected): Form<SelectForm>) -> Result<Response> {
     // return URL is just http://public.url/#{session_id}
     let return_url_template = match selected.session_type {
-        MrpSessionType::Hybrid | MrpSessionType::SameDevice => Some(
+        MrpSessionType::CrossDeviceWithReturn | MrpSessionType::SameDevice => Some(
             format!("{}#{{session_id}}", state.public_url)
                 .parse()
                 .expect("should always be a valid ReturnUrlTemplate"),
@@ -123,7 +124,7 @@ async fn engage(State(state): State<Arc<ApplicationState>>, Form(selected): Form
                 .ok_or(anyhow::Error::msg("usecase not found"))?
                 .clone(),
             match selected.session_type {
-                MrpSessionType::SameDevice => SessionType::SameDevice,
+                MrpSessionType::SameDevice | MrpSessionType::SameDeviceNoReturn => SessionType::SameDevice,
                 _ => SessionType::CrossDevice,
             },
             return_url_template,

wallet_core/mock_relying_party/templates/disclosure.html

@@ -90,8 +90,9 @@ <h3><span id="attributes"></span></h3>
             <dd>{{ selected.as_ref().unwrap().usecase }}</dd>
 
             <dt>Type</dt>
-            {% if selected.as_ref().unwrap().session_type == MrpSessionType::SameDevice %}
-            <dd>same_device</dd>
+            {% if (selected.as_ref().unwrap().session_type == MrpSessionType::SameDevice) ||
+            (selected.as_ref().unwrap().session_type == MrpSessionType::SameDeviceNoReturn) %}
+            <dd>{{ selected.as_ref().unwrap().session_type }}</dd>
         </dl>
         <a href="{{ urls.0 }}" target="_blank" style="font-size: 2rem;" rel="noopener">
             Open NL Wallet