upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/lib/login
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/login')
-rw-r--r--src/lib/login/existing.rs2
-rw-r--r--src/lib/login/fresh.rs2
-rw-r--r--src/lib/login/key_encryption.rs2
-rw-r--r--src/lib/login/mod.rs4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/login/existing.rs b/src/lib/login/existing.rs
index efe187e..e60621d 100644
--- a/src/lib/login/existing.rs
+++ b/src/lib/login/existing.rs
@@ -208,7 +208,7 @@ async fn get_signer(
208 Duration::from_secs(10 * 60), 208 Duration::from_secs(10 * 60),
209 None, 209 None,
210 )?; 210 )?;
211 if let Some(public_key) = npub.clone().and_then(|npub| PublicKey::parse(npub).ok()) { 211 if let Some(public_key) = npub.clone().and_then(|npub| PublicKey::parse(&npub).ok()) {
212 s.non_secure_set_user_public_key(public_key)?; 212 s.non_secure_set_user_public_key(public_key)?;
213 let signer: Arc<dyn NostrSigner> = Arc::new(s); 213 let signer: Arc<dyn NostrSigner> = Arc::new(s);
214 Ok((signer, public_key)) 214 Ok((signer, public_key))
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 635c0b3..76998ff 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -372,7 +372,7 @@ pub fn generate_nostr_connect_app(
372 client 372 client
373 .get_fallback_signer_relays() 373 .get_fallback_signer_relays()
374 .iter() 374 .iter()
375 .flat_map(RelayUrl::parse) 375 .flat_map(|s| RelayUrl::parse(s))
376 .collect::<Vec<RelayUrl>>() 376 .collect::<Vec<RelayUrl>>()
377 } else { 377 } else {
378 vec![] 378 vec![]
diff --git a/src/lib/login/key_encryption.rs b/src/lib/login/key_encryption.rs
index efb38d1..d57b3b5 100644
--- a/src/lib/login/key_encryption.rs
+++ b/src/lib/login/key_encryption.rs
@@ -7,7 +7,7 @@ pub fn decrypt_key(encrypted_key: &str, password: &str) -> Result<nostr::Keys> {
7 if encrypted_key.log_n() > 14 { 7 if encrypted_key.log_n() > 14 {
8 println!("this may take a few seconds..."); 8 println!("this may take a few seconds...");
9 } 9 }
10 Ok(nostr::Keys::new(encrypted_key.to_secret_key(password)?)) 10 Ok(nostr::Keys::new(encrypted_key.decrypt(password)?))
11} 11}
12 12
13#[cfg(test)] 13#[cfg(test)]
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index a1c45d5..c37375f 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -93,7 +93,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
93 let git_repo = Repo::from_path(&git_repo_path.to_path_buf())?; 93 let git_repo = Repo::from_path(&git_repo_path.to_path_buf())?;
94 Ok( 94 Ok(
95 if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? { 95 if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
96 if let Ok(pubic_key) = PublicKey::parse(npub) { 96 if let Ok(pubic_key) = PublicKey::parse(&npub) {
97 Some(pubic_key) 97 Some(pubic_key)
98 } else { 98 } else {
99 None 99 None
@@ -107,7 +107,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
107pub fn get_curent_user(git_repo: &Repo) -> Result<Option<PublicKey>> { 107pub fn get_curent_user(git_repo: &Repo) -> Result<Option<PublicKey>> {
108 Ok( 108 Ok(
109 if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? { 109 if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
110 if let Ok(public_key) = PublicKey::parse(npub) { 110 if let Ok(public_key) = PublicKey::parse(&npub) {
111 Some(public_key) 111 Some(public_key)
112 } else { 112 } else {
113 None 113 None