fix clippy
This commit is contained in:
@@ -270,60 +270,19 @@ impl NostrRegistry {
|
||||
let key_path = self.key_dir.join(format!("{}.npub", npub));
|
||||
let app_keys = self.app_keys.clone();
|
||||
|
||||
if let Ok(payload) = std::fs::read_to_string(key_path) {
|
||||
if !payload.is_empty() {
|
||||
cx.background_spawn(async move {
|
||||
let decrypted = app_keys.nip44_decrypt(&public_key, &payload).await?;
|
||||
let secret = SecretKey::parse(&decrypted)?;
|
||||
let keys = Keys::new(secret);
|
||||
if let Ok(payload) = std::fs::read_to_string(key_path)
|
||||
&& !payload.is_empty()
|
||||
{
|
||||
return cx.background_spawn(async move {
|
||||
let decrypted = app_keys.nip44_decrypt(&public_key, &payload).await?;
|
||||
let secret = SecretKey::parse(&decrypted)?;
|
||||
let keys = Keys::new(secret);
|
||||
|
||||
Ok(keys.into_nostr_signer())
|
||||
})
|
||||
} else {
|
||||
self.get_secret_keyring(&npub, cx)
|
||||
}
|
||||
} else {
|
||||
self.get_secret_keyring(&npub, cx)
|
||||
Ok(keys.into_nostr_signer())
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the secret for a given npub in the OS credentials store.
|
||||
#[deprecated = "Use get_secret instead"]
|
||||
fn get_secret_keyring(
|
||||
&self,
|
||||
user: &str,
|
||||
cx: &App,
|
||||
) -> Task<Result<Arc<dyn NostrSigner>, Error>> {
|
||||
let read = cx.read_credentials(user);
|
||||
let app_keys = self.app_keys.clone();
|
||||
|
||||
cx.background_spawn(async move {
|
||||
let (_, secret) = read
|
||||
.await
|
||||
.map_err(|_| anyhow!("Failed to get signer. Please re-import the secret key"))?
|
||||
.ok_or_else(|| anyhow!("Failed to get signer. Please re-import the secret key"))?;
|
||||
|
||||
// Try to parse as a direct secret key first
|
||||
if let Ok(secret_key) = SecretKey::from_slice(&secret) {
|
||||
return Ok(Keys::new(secret_key).into_nostr_signer());
|
||||
}
|
||||
|
||||
// Convert the secret into string
|
||||
let sec = String::from_utf8(secret)
|
||||
.map_err(|_| anyhow!("Failed to parse secret as UTF-8"))?;
|
||||
|
||||
// Try to parse as a NIP-46 URI
|
||||
let uri =
|
||||
NostrConnectUri::parse(&sec).map_err(|_| anyhow!("Failed to parse NIP-46 URI"))?;
|
||||
|
||||
let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
|
||||
let mut nip46 = NostrConnect::new(uri, app_keys, timeout, None)?;
|
||||
|
||||
// Set the auth URL handler
|
||||
nip46.auth_url_handler(CoopAuthUrlHandler);
|
||||
|
||||
Ok(nip46.into_nostr_signer())
|
||||
})
|
||||
Task::ready(Err(anyhow::anyhow!("No secret found")))
|
||||
}
|
||||
|
||||
/// Add a new npub to the keys directory
|
||||
|
||||
Reference in New Issue
Block a user