methanium/mtp
Watch
3
0
Fork
You've already forked mtp
 0
Code Issues Pull requests 3 Projects Releases 22 Packages Wiki Activity Actions

[Fix] Swapped from User to client
Some checks failed
CI / checks (push) Failing after 2m18s
Details

Browse source
This commit is contained in:
Alex Emmet 2026-07-03 17:00:13 +02:00
commit 099073dc27
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
host/src/lib.rs
View file

@ -16,7 +16,7 @@ pub use MTPHost as Host;
/* ---- async callback type aliases ---- */ /* ---- async callback type aliases ---- */
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
pub type GetExistingUser = Box< pub type GetExistingClient = Box<
dyn Fn( dyn Fn(
u64, u64,
Option<String>, Option<String>,
@ -58,7 +58,7 @@ pub struct HostConfig {
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
pub host_keyring: mtp_crypto::Keyring, pub host_keyring: mtp_crypto::Keyring,
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
pub get_existing_user: GetExistingUser, pub get_existing_client: GetExistingClient,
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
pub complete_register: CompleteRegister, pub complete_register: CompleteRegister,
} }
@ -84,7 +84,7 @@ impl HostConfig {
mtp_crypto::SignaturePrivateKey::new(Vec::new()), mtp_crypto::SignaturePrivateKey::new(Vec::new()),
), ),
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
get_existing_user: Box::new(|_| Box::pin(async { None })), get_existing_client: Box::new(|_| Box::pin(async { None })),
#[cfg(feature = "crypto")] #[cfg(feature = "crypto")]
complete_register: Box::new(|_| Box::pin(async { 0 })), complete_register: Box::new(|_| Box::pin(async { 0 })),
} }
@ -94,12 +94,12 @@ impl HostConfig {
pub fn with_authentication( pub fn with_authentication(
mut self, mut self,
host_keyring: mtp_crypto::Keyring, host_keyring: mtp_crypto::Keyring,
get_existing_user: GetExistingUser, get_existing_client: GetExistingClient,
complete_register: CompleteRegister, complete_register: CompleteRegister,
) -> Self { ) -> Self {
self.authentication_policy = AuthenticationPolicy::ForceAuthentication; self.authentication_policy = AuthenticationPolicy::ForceAuthentication;
self.host_keyring = host_keyring; self.host_keyring = host_keyring;
self.get_existing_user = Box::new(get_existing_user); self.get_existing_client = Box::new(get_existing_client);
self.complete_register = Box::new(complete_register); self.complete_register = Box::new(complete_register);
self self
} }
@ -393,7 +393,7 @@ impl MTPHost {
)); ));
} }
}; };
let bundle = match (self.config.get_existing_user)(cid).await { let bundle = match (self.config.get_existing_client)(cid).await {
Some(b) => b, Some(b) => b,
None => { None => {
let rejection = CommunicationValue::new( let rejection = CommunicationValue::new(
@ -724,7 +724,7 @@ impl MTPHost {
}; };
if cid > 0 if cid > 0
&& let Some(bundle) = (self.config.get_existing_user)(cid).await && let Some(bundle) = (self.config.get_existing_client)(cid).await
{ {
return self return self
.complete_auth_handshake( .complete_auth_handshake(