Move the GetSecret, SetSecret and GetSecrets methods.

Move to more relevant interfaces, and add secret parameter
to CreateItem.

1 files changed, 37 insertions, 34 deletions

diff --git a/secret-service/org.freedesktop.Secrets.xml b/secret-service/org.freedesktop.Secrets.xml
index b645022..cce5ddf 100644
--- a/secret-service/org.freedesktop.Secrets.xml
+++ b/secret-service/org.freedesktop.Secrets.xml
@@ -49,14 +49,14 @@
     <!--
      * ======================================================================================
      * SECRET STRUCT
-     * Signature: (sayay)
+     * Signature: (oayay)
      *
     -->
 
     <tp:struct name="Secret">
         <tp:docstring>The Secret type holds a (possibly encoded) secret.</tp:docstring>
-        <tp:member type="s" name="algorithm">
-            <tp:docstring>Algorithm used to encode the secrets value.</tp:docstring>
+        <tp:member type="o" name="session">
+            <tp:docstring>The session that was used to encode the secret.</tp:docstring>
         </tp:member>
         <tp:member type="ay" name="parameters">
             <tp:docstring>Algorithm dependent parameters for secret value encoding.</tp:docstring>
@@ -71,7 +71,7 @@
         <tp:member type="o" name="Key">
             <tp:docstring>D-Bus object-path</tp:docstring>
         </tp:member>
-        <tp:member type="(sayay)" name="Value" tp:type="Secret">
+        <tp:member type="(oayay)" name="Value" tp:type="Secret">
             <tp:docstring>A secret</tp:docstring>
         </tp:member>
     </tp:mapping>
@@ -159,6 +159,19 @@
                 </arg>
             </method>
 
+            <method name="GetSecrets">
+                <tp:docstring>Retrieve multiple secrets from different items.</tp:docstring>
+                <arg name="items" type="ao" direction="in">
+                    <tp:docstring>Items to get secrets for.</tp:docstring>
+                </arg>
+                <arg name="session" type="o" direction="in">
+                    <tp:docstring>The session to use to encode the secrets.</tp:docstring>
+                </arg>
+                <arg name="secrets" type="a{o(oayay)}" direction="out" tp:type="ObjectPath_Secret_Map">
+                    <tp:docstring>Secrets for the items.</tp:docstring>
+                </arg>
+            </method>
+
             <signal name="CollectionCreated">
                 <tp:docstring>A collection was created.</tp:docstring>
                 <arg name="collection" type="o">
@@ -240,6 +253,9 @@
                 <arg name="properties" type="a{sv}" direction="in">
                     <tp:docstring>The properties for the new item.</tp:docstring>
                 </arg>
+		<arg name="secret" type="(oayay)" tp:type="Secret" direction="in">
+                    <tp:docstring>The secret to store in the item, encoded with the included session.</tp:docstring>
+                </arg>
                 <arg name="replace" type="b" direction="in">
                     <tp:docstring>Whether to replace an item with the same attributes or not.</tp:docstring>
                 </arg>
@@ -317,6 +333,23 @@
                 </arg>
             </method>
 
+            <method name="GetSecret">
+                <tp:docstring>Retrieve the secret for this item.</tp:docstring>
+                <arg name="session" type="o" direction="in">
+                    <tp:docstring>The session to use to encode the secret.</tp:docstring>
+                </arg>
+                <arg name="secret" type="(oayay)" tp:type="Secret" direction="out">
+                    <tp:docstring>The secret retrieved.</tp:docstring>
+                </arg>
+            </method>
+
+            <method name="SetSecret">
+                <tp:docstring>Set the secret for this item.</tp:docstring>
+                <arg name="secret" type="(oayay)" tp:type="Secret" direction="in">
+                    <tp:docstring>The secret to set, encoded for the included session.</tp:docstring>
+                </arg>
+            </method>
+
         </interface>
 
     </node>
@@ -357,36 +390,6 @@
                 </arg>
             </method>
 
-            <method name="GetSecret">
-                <tp:docstring>Retrieve the secret for this item.</tp:docstring>
-                <arg name="item" type="o" direction="in">
-                    <tp:docstring>The path to the secret we want to retrieve.</tp:docstring>
-                </arg>
-                <arg name="secret" type="(sayay)" tp:type="Secret" direction="out">
-                    <tp:docstring>The secret retrieved.</tp:docstring>
-                </arg>
-            </method>
-
-            <method name="SetSecret">
-                <tp:docstring>Set the secret for this item.</tp:docstring>
-                <arg name="item" type="o" direction="in">
-                    <tp:docstring>The path to the secret we want to retrieve.</tp:docstring>
-                </arg>
-                <arg name="secret" type="(sayay)" tp:type="Secret" direction="in">
-                    <tp:docstring>The secret retrieved.</tp:docstring>
-                </arg>
-            </method>
-
-            <method name="GetSecrets">
-                <tp:docstring>Retrieve multiple secrets from different items.</tp:docstring>
-                <arg name="items" type="ao" direction="in">
-                    <tp:docstring>Items to get secrets for.</tp:docstring>
-                </arg>
-                <arg name="secrets" type="a{o(sayay)}" direction="out" tp:type="ObjectPath_Secret_Map">
-                    <tp:docstring>Secrets for the items.</tp:docstring>
-                </arg>
-            </method>
-
         </interface>
 
     </node>