3 files changed, 42 insertions, 17 deletions

diff --git a/src/bin/ngit/sub_commands/login.rs b/src/bin/ngit/sub_commands/login.rs
index bdd215f..390f431 100644
--- a/src/bin/ngit/sub_commands/login.rs
+++ b/src/bin/ngit/sub_commands/login.rs
@@ -2,7 +2,7 @@ use anyhow::{Context, Result};
 use clap;
 
 use crate::{
-    cli::Cli,
+    cli::{extract_signer_cli_arguments, Cli},
     client::{Client, Connect},
     git::Repo,
     login::fresh::fresh_login_or_signup,
@@ -19,24 +19,33 @@ pub struct SubCommandArgs {
     offline: bool,
 }
 
-pub async fn launch(_args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
+pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
     // TODO show existing login on record, prompt to logout
-    // TODO use cli arguments to login
-    let git_repo_result = Repo::discover().context("cannot find a git repository");
 
-    if command_args.offline {
-        if let Ok(git_repo) = git_repo_result {
-            fresh_login_or_signup(&Some(&git_repo), None, command_args.local).await?;
-        } else {
-            fresh_login_or_signup(&None, None, command_args.local).await?;
-        }
+    let client = if command_args.offline {
+        None
     } else {
-        let client = Client::default();
-        if let Ok(git_repo) = git_repo_result {
-            fresh_login_or_signup(&Some(&git_repo), Some(&client), command_args.local).await?;
-        } else {
-            fresh_login_or_signup(&None, Some(&client), command_args.local).await?;
+        Some(Client::default())
+    };
+
+    let git_repo_result = Repo::discover().context("cannot find a git repository");
+    let git_repo_option = {
+        match git_repo_result {
+            Ok(git_repo) => Some(git_repo),
+            Err(_) => None,
         }
+    };
+
+    fresh_login_or_signup(
+        &git_repo_option.as_ref(),
+        client.as_ref(),
+        extract_signer_cli_arguments(args)?,
+        command_args.local,
+    )
+    .await?;
+
+    // If not offline, disconnect the client
+    if let Some(client) = client {
         client.disconnect().await?;
     }
     Ok(())
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 524f419..2190844 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -10,6 +10,7 @@ use qrcode::QrCode;
 use tokio::{signal, sync::Mutex};
 
 use super::{
+    existing::load_existing_login,
     key_encryption::decrypt_key,
     print_logged_in_as,
     user::{get_user_details, UserRef},
@@ -24,7 +25,7 @@ use crate::{
         Interactor, InteractorPrompt, Printer, PromptChoiceParms, PromptConfirmParms,
         PromptInputParms, PromptPasswordParms,
     },
-    client::{send_events, Connect},
+    client::{fetch_public_key, send_events, Connect},
     git::{remove_git_config_item, save_git_config_item, Repo, RepoActions},
 };
 
@@ -32,9 +33,24 @@ pub async fn fresh_login_or_signup(
     git_repo: &Option<&Repo>,
     #[cfg(test)] client: Option<&MockConnect>,
     #[cfg(not(test))] client: Option<&Client>,
+    signer_info: Option<SignerInfo>,
     save_local: bool,
 ) -> Result<(Arc<dyn NostrSigner>, UserRef, SignerInfoSource)> {
     let (signer, public_key, signer_info, source) = loop {
+        if let Some(signer_info) = signer_info {
+            let (signer, _user_ref, source) = load_existing_login(
+                git_repo,
+                &Some(signer_info.clone()),
+                &None,
+                &Some(SignerInfoSource::CommandLineArguments),
+                client,
+                true,
+                true,
+            )
+            .await?;
+            let public_key = fetch_public_key(&signer).await?;
+            break (signer, public_key, signer_info, source);
+        }
         match Interactor::default().choice(
             PromptChoiceParms::default()
                 .with_prompt("login to nostr")
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index b45bc1d..cf62d85 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -30,7 +30,7 @@ pub async fn login_or_signup(
     if res.is_ok() {
         res
     } else {
-        fresh_login_or_signup(git_repo, client, false).await
+        fresh_login_or_signup(git_repo, client, None, false).await
     }
 }