diff options
Diffstat (limited to 'src/lib/login')
| -rw-r--r-- | src/lib/login/existing.rs | 8 | ||||
| -rw-r--r-- | src/lib/login/fresh.rs | 10 | ||||
| -rw-r--r-- | src/lib/login/mod.rs | 14 | ||||
| -rw-r--r-- | src/lib/login/user.rs | 4 |
4 files changed, 16 insertions, 20 deletions
diff --git a/src/lib/login/existing.rs b/src/lib/login/existing.rs index 4606c22..efe187e 100644 --- a/src/lib/login/existing.rs +++ b/src/lib/login/existing.rs | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | use std::{str::FromStr, sync::Arc, time::Duration}; | 1 | use std::{str::FromStr, sync::Arc, time::Duration}; |
| 2 | 2 | ||
| 3 | use anyhow::{bail, Context, Result}; | 3 | use anyhow::{Context, Result, bail}; |
| 4 | use nostr::nips::nip46::NostrConnectURI; | 4 | use nostr::nips::nip46::NostrConnectURI; |
| 5 | use nostr_connect::client::NostrConnect; | 5 | use nostr_connect::client::NostrConnect; |
| 6 | use nostr_sdk::{NostrSigner, PublicKey}; | 6 | use nostr_sdk::{NostrSigner, PublicKey}; |
| 7 | 7 | ||
| 8 | use super::{ | 8 | use super::{ |
| 9 | SignerInfo, SignerInfoSource, | ||
| 9 | key_encryption::decrypt_key, | 10 | key_encryption::decrypt_key, |
| 10 | print_logged_in_as, | 11 | print_logged_in_as, |
| 11 | user::{get_user_details, UserRef}, | 12 | user::{UserRef, get_user_details}, |
| 12 | SignerInfo, SignerInfoSource, | ||
| 13 | }; | 13 | }; |
| 14 | #[cfg(not(test))] | 14 | #[cfg(not(test))] |
| 15 | use crate::client::Client; | 15 | use crate::client::Client; |
| @@ -18,7 +18,7 @@ use crate::client::MockConnect; | |||
| 18 | use crate::{ | 18 | use crate::{ |
| 19 | cli_interactor::{Interactor, InteractorPrompt, PromptPasswordParms}, | 19 | cli_interactor::{Interactor, InteractorPrompt, PromptPasswordParms}, |
| 20 | client::fetch_public_key, | 20 | client::fetch_public_key, |
| 21 | git::{get_git_config_item, Repo, RepoActions}, | 21 | git::{Repo, RepoActions, get_git_config_item}, |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | /// load signer from git config and UserProfile from cache or relays | 24 | /// load signer from git config and UserProfile from cache or relays |
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs index 7cdbde8..635c0b3 100644 --- a/src/lib/login/fresh.rs +++ b/src/lib/login/fresh.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | use std::{str::FromStr, sync::Arc, time::Duration}; | 1 | use std::{str::FromStr, sync::Arc, time::Duration}; |
| 2 | 2 | ||
| 3 | use anyhow::{bail, Context, Result}; | 3 | use anyhow::{Context, Result, bail}; |
| 4 | use console::Style; | 4 | use console::Style; |
| 5 | use dialoguer::theme::{ColorfulTheme, Theme}; | 5 | use dialoguer::theme::{ColorfulTheme, Theme}; |
| 6 | use nostr::nips::{nip05, nip46::NostrConnectURI}; | 6 | use nostr::nips::{nip05, nip46::NostrConnectURI}; |
| @@ -10,11 +10,11 @@ use qrcode::QrCode; | |||
| 10 | use tokio::{signal, sync::Mutex}; | 10 | use tokio::{signal, sync::Mutex}; |
| 11 | 11 | ||
| 12 | use super::{ | 12 | use super::{ |
| 13 | SignerInfo, SignerInfoSource, | ||
| 13 | existing::load_existing_login, | 14 | existing::load_existing_login, |
| 14 | key_encryption::decrypt_key, | 15 | key_encryption::decrypt_key, |
| 15 | print_logged_in_as, | 16 | print_logged_in_as, |
| 16 | user::{get_user_details, UserRef}, | 17 | user::{UserRef, get_user_details}, |
| 17 | SignerInfo, SignerInfoSource, | ||
| 18 | }; | 18 | }; |
| 19 | #[cfg(not(test))] | 19 | #[cfg(not(test))] |
| 20 | use crate::client::Client; | 20 | use crate::client::Client; |
| @@ -25,8 +25,8 @@ use crate::{ | |||
| 25 | Interactor, InteractorPrompt, Printer, PromptChoiceParms, PromptConfirmParms, | 25 | Interactor, InteractorPrompt, Printer, PromptChoiceParms, PromptConfirmParms, |
| 26 | PromptInputParms, PromptPasswordParms, | 26 | PromptInputParms, PromptPasswordParms, |
| 27 | }, | 27 | }, |
| 28 | client::{send_events, Connect}, | 28 | client::{Connect, send_events}, |
| 29 | git::{remove_git_config_item, save_git_config_item, Repo, RepoActions}, | 29 | git::{Repo, RepoActions, remove_git_config_item, save_git_config_item}, |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | pub async fn fresh_login_or_signup( | 32 | pub async fn fresh_login_or_signup( |
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs index 0be1e5d..a1c45d5 100644 --- a/src/lib/login/mod.rs +++ b/src/lib/login/mod.rs | |||
| @@ -79,15 +79,11 @@ fn print_logged_in_as( | |||
| 79 | "failed to find your relay list. consider using another nostr client to create one to enhance your nostr experience." | 79 | "failed to find your relay list. consider using another nostr client to create one to enhance your nostr experience." |
| 80 | ); | 80 | ); |
| 81 | } | 81 | } |
| 82 | eprintln!( | 82 | eprintln!("logged in as {}{}", user_ref.metadata.name, match source { |
| 83 | "logged in as {}{}", | 83 | SignerInfoSource::CommandLineArguments => " via cli arguments", |
| 84 | user_ref.metadata.name, | 84 | SignerInfoSource::GitLocal => " to local repository", |
| 85 | match source { | 85 | SignerInfoSource::GitGlobal => "", |
| 86 | SignerInfoSource::CommandLineArguments => " via cli arguments", | 86 | }); |
| 87 | SignerInfoSource::GitLocal => " to local repository", | ||
| 88 | SignerInfoSource::GitGlobal => "", | ||
| 89 | } | ||
| 90 | ); | ||
| 91 | Ok(()) | 87 | Ok(()) |
| 92 | } | 88 | } |
| 93 | 89 | ||
diff --git a/src/lib/login/user.rs b/src/lib/login/user.rs index de4a2d9..107e765 100644 --- a/src/lib/login/user.rs +++ b/src/lib/login/user.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | use std::{collections::HashSet, path::Path}; | 1 | use std::{collections::HashSet, path::Path}; |
| 2 | 2 | ||
| 3 | use anyhow::{bail, Context, Result}; | 3 | use anyhow::{Context, Result, bail}; |
| 4 | use nostr::PublicKey; | 4 | use nostr::PublicKey; |
| 5 | use nostr_sdk::{Alphabet, JsonUtil, Kind, SingleLetterTag, Timestamp, ToBech32}; | 5 | use nostr_sdk::{Alphabet, JsonUtil, Kind, SingleLetterTag, Timestamp, ToBech32}; |
| 6 | use serde::{self, Deserialize, Serialize}; | 6 | use serde::{self, Deserialize, Serialize}; |
| @@ -9,7 +9,7 @@ use serde::{self, Deserialize, Serialize}; | |||
| 9 | use crate::client::Client; | 9 | use crate::client::Client; |
| 10 | #[cfg(test)] | 10 | #[cfg(test)] |
| 11 | use crate::client::MockConnect; | 11 | use crate::client::MockConnect; |
| 12 | use crate::client::{get_event_from_global_cache, Connect}; | 12 | use crate::client::{Connect, get_event_from_global_cache}; |
| 13 | 13 | ||
| 14 | #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)] | 14 | #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)] |
| 15 | pub struct UserRef { | 15 | pub struct UserRef { |