daemon: append portal handler-specific parameters to request

Author: iinuwa

credentialsd/src/gateway/dbus.rs

@@ -197,11 +197,11 @@ impl CredentialPortalGateway {
         #[zbus(connection)] connection: &Connection,
         #[zbus(header)] header: Header<'_>,
         parent_window: Optional<WindowHandle>,
-        claimed_app_id: String,
-        claimed_app_display_name: Optional<String>,
         origin: String,
         cred_type: CredentialType,
         options: CreateCredentialPortalOptions,
+        claimed_app_id: String,
+        claimed_app_display_name: Optional<String>,
     ) -> PortalResult<CreateCredentialResponse, Error> {
         let CreateCredentialPortalOptions {
             top_origin,
@@ -261,10 +261,10 @@ impl CredentialPortalGateway {
         #[zbus(connection)] connection: &Connection,
         #[zbus(header)] header: Header<'_>,
         parent_window: Optional<WindowHandle>,
-        claimed_app_id: String,
-        claimed_app_display_name: Optional<String>,
         origin: String,
         options: GetCredentialPortalOptions,
+        claimed_app_id: String,
+        claimed_app_display_name: Optional<String>,
     ) -> PortalResult<GetCredentialResponse, Error> {
         let GetCredentialPortalOptions {
             top_origin,

doc/api.md

@@ -109,7 +109,7 @@ this API takes:
 ```
 [a{sv}] {
     IN origin s = "https://example.com",
-    IN type = "password"
+    IN type = "password",
     options a{sv} = {
         top_origin: Variant("https://example.com"), // topOrigin is changed to top_origin
         password: Variant(true),
@@ -199,15 +199,15 @@ for what kind of credential the client would like to create.
 ```
 CreateCredentialRequest(
     IN parent_window s,
-    IN app_id s,
-    IN app_display_name s,
     IN origin s,
     IN type CredentialType,
     IN options a{sv} {
         handle_token: s
         top_origin: s
         <type_specific_fields>
-    }
+    },
+    IN app_id s,
+    IN app_display_name s
 )
 ```
 
@@ -253,15 +253,15 @@ WebAuthn
 type.
 
     CreatePublicKeyCredentialRequest: CreateCredentialRequest (
-        IN parent_window s
-        IN app_id s,
-        IN app_display_name s,
-        IN origin s
-        IN type s = "publicKey"
+        IN parent_window s,
+        IN origin s,
+        IN type s = "publicKey",
         options a{sv} {
             <other optional fields>,
             public_key: s  // WebAuthn credential attestation JSON
-        }
+        },
+        IN app_id s,
+        IN app_display_name s
     )
 
 ### Response
@@ -319,15 +319,15 @@ credentials the client will accept.
 
 ```
 GetCredentialRequest (
-    IN parent_window s
-    IN app_id s,
-    IN app_display_name s,
-    IN origin s
+    IN parent_window s,
+    IN origin s,
     IN options a{sv} {
         top_origin: s
         <type_specific_fields>
         public_key: s
-    }
+    },
+    IN app_id s,
+    IN app_display_name s
 )
 ```
 

doc/xyz.iinuwa.credentialsd.Credentials.xml

@@ -23,20 +23,20 @@
   <interface name="org.freedesktop.handler.portal.experimental.Credential">
     <method name="CreateCredential">
       <arg name="parent_window" type="s" direction="in"/>
-      <arg name="claimed_app_id" type="s" direction="in"/>
-      <arg name="claimed_app_display_name" type="s" direction="in"/>
       <arg name="origin" type="a{sv}" direction="in"/>
       <arg name="type" type="a{sv}" direction="in"/>
       <arg name="options" type="a{sv}" direction="in"/>
+      <arg name="claimed_app_id" type="s" direction="in"/>
+      <arg name="claimed_app_display_name" type="s" direction="in"/>
       <arg name="response" type="u" direction="out"/>
       <arg name="results" type="a{sv}" direction="out"/>
     </method>
     <method name="GetCredential">
       <arg name="parent_window" type="s" direction="in"/>
-      <arg name="claimed_app_id" type="s" direction="in"/>
-      <arg name="claimed_app_display_name" type="s" direction="in"/>
       <arg name="origin" type="a{sv}" direction="in"/>
       <arg name="options" type="a{sv}" direction="in"/>
+      <arg name="claimed_app_id" type="s" direction="in"/>
+      <arg name="claimed_app_display_name" type="s" direction="in"/>
       <arg name="response" type="u" direction="out"/>
       <arg name="results" type="a{sv}" direction="out"/>
     </method>