server: Session::path return ObjectPath

Author: A6GibKm

server/src/item.rs

@@ -90,14 +90,14 @@ impl Item {
                 })?;
 
                 Ok((DBusSecretInner(
-                    session.path().clone(),
+                    session.path().clone().into(),
                     iv,
                     encrypted,
                     content_type,
                 ),))
             }
             None => Ok((DBusSecretInner(
-                session.path().clone(),
+                session.path().clone().into(),
                 Vec::new(),
                 secret.to_vec(),
                 content_type,

server/src/service.rs

@@ -87,7 +87,7 @@ impl Service {
         tracing::info!("Client {} connected", sender);
 
         let session = Session::new(aes_key.map(Arc::new), self.clone(), sender.to_owned()).await;
-        let path = session.path().clone();
+        let path = OwnedObjectPath::from(session.path().clone());
 
         self.sessions
             .lock()

server/src/session.rs

@@ -3,7 +3,11 @@
 use std::sync::Arc;
 
 use oo7::{Key, dbus::ServiceError};
-use zbus::{interface, names::UniqueName, zvariant::OwnedObjectPath};
+use zbus::{
+    interface,
+    names::UniqueName,
+    zvariant::{ObjectPath, OwnedObjectPath},
+};
 
 use crate::Service;
 
@@ -48,7 +52,7 @@ impl Session {
         &self.sender
     }
 
-    pub fn path(&self) -> &OwnedObjectPath {
+    pub fn path(&self) -> &ObjectPath<'_> {
         &self.path
     }