Remove PairTargetUrl.

Author: tmpfs

crates/net/src/pairing/mod.rs

@@ -6,7 +6,7 @@ mod websocket;
 
 pub use enrollment::DeviceEnrollment;
 pub use error::Error;
-pub use share_url::{PairTargetUrl, ServerPairUrl};
+pub use share_url::ServerPairUrl;
 pub use websocket::{AcceptPairing, OfferPairing};
 
 /// Result type for the pairing module.

crates/net/src/pairing/share_url.rs

@@ -5,72 +5,6 @@ use sos_core::{csprng, AccountId};
 use std::str::FromStr;
 use url::Url;
 
-/// Pair target URL encapsulates a server and account ID.
-///
-/// It is used to transfer a server and account identifier
-/// from a mobile device to a desktop for the inverted pairing flow.
-///
-/// The URL format is `<server-url>?aid=<account-id>`.
-#[derive(Debug, PartialEq, Eq)]
-pub struct PairTargetUrl {
-    /// Server used to transfer the account data.
-    server: Url,
-    /// Account identifier.
-    account_id: AccountId,
-}
-
-impl PairTargetUrl {
-    /// Create a new pair target URL.
-    pub fn new(server: Url, account_id: AccountId) -> Self {
-        Self { server, account_id }
-    }
-
-    /// Server URL.
-    pub fn server(&self) -> &Url {
-        &self.server
-    }
-
-    /// Account identifier.
-    pub fn account_id(&self) -> &AccountId {
-        &self.account_id
-    }
-}
-
-impl From<PairTargetUrl> for Url {
-    fn from(value: PairTargetUrl) -> Self {
-        let mut url = value.server;
-        url.query_pairs_mut()
-            .append_pair(AID, &value.account_id.to_string());
-        url
-    }
-}
-
-impl TryFrom<Url> for PairTargetUrl {
-    type Error = Error;
-
-    fn try_from(mut url: Url) -> Result<Self> {
-        let mut pairs = url.query_pairs();
-
-        let account_id = pairs.find_map(|q| {
-            if q.0.as_ref() == AID {
-                Some(q.1)
-            } else {
-                None
-            }
-        });
-        let account_id = account_id.ok_or(Error::InvalidShareUrl)?;
-        let account_id: AccountId = account_id.as_ref().parse()?;
-
-        url.set_query(None);
-        url.set_path("");
-
-        Ok(PairTargetUrl {
-            server: url,
-            account_id,
-        })
-    }
-}
-
 /// Account identifier.
 const AID: &str = "aid";
 /// Server URL.

tests/unit/src/tests/pairing_url.rs

@@ -1,35 +1,10 @@
 use anyhow::Result;
 use sos_core::AccountId;
-use sos_net::pairing::{PairTargetUrl, ServerPairUrl};
+use sos_net::pairing::ServerPairUrl;
 use url::Url;
 
 const SERVER: &str = "http://192.168.1.8:5053";
 
-#[test]
-fn pair_target_url() -> Result<()> {
-    let mock_server: Url = SERVER.parse()?;
-    let mock_account_id = AccountId::random();
-    let mock_url =
-        Url::parse(&format!("{}/?aid={}", mock_server, mock_account_id))?;
-    let pairing_target =
-        PairTargetUrl::new(mock_server.clone(), mock_account_id.clone());
-
-    assert_eq!(&mock_server, pairing_target.server());
-    assert_eq!(&mock_account_id, pairing_target.account_id());
-
-    let parsed_target: PairTargetUrl = mock_url.try_into()?;
-    assert_eq!(pairing_target, parsed_target);
-
-    Ok(())
-}
-
-#[test]
-fn pair_target_url_errors() -> Result<()> {
-    // No account identifier in query string
-    assert!(PairTargetUrl::try_from(Url::parse(SERVER).unwrap()).is_err());
-    Ok(())
-}
-
 #[test]
 fn pair_server_url() -> Result<()> {
     let mock_account_id = AccountId::random();