6 files changed, 40 insertions, 62 deletions

diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index aa43106..146a29c 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -6,7 +6,7 @@ use nostr::{nips::nip01::Coordinate, FromBech32, PublicKey, ToBech32};
 use nostr_sdk::Kind;
 
 use crate::{
-    cli::Cli,
+    cli::{extract_signer_cli_arguments, Cli},
     cli_interactor::{Interactor, InteractorPrompt, PromptInputParms},
     client::{fetching_with_report, get_repo_ref_from_cache, send_events, Client, Connect},
     git::{nostr_url::convert_clone_url_to_https, Repo, RepoActions},
@@ -69,7 +69,8 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     let repo_ref = if let Some(repo_coordinates) = repo_coordinates.clone() {
         fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
-        if let Ok(repo_ref) = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await {
+        if let Ok(repo_ref) = get_repo_ref_from_cache(Some(git_repo_path), &repo_coordinates).await
+        {
             Some(repo_ref)
         } else {
             None
@@ -78,15 +79,11 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         None
     };
 
-    let (signer, user_ref) = login::launch(
-        &git_repo,
-        &cli_args.bunker_uri,
-        &cli_args.bunker_app_key,
-        &cli_args.nsec,
+    let (signer, user_ref, _) = login::login_or_signup(
+        &Some(&git_repo),
+        &extract_signer_cli_arguments(cli_args).unwrap_or(None),
         &cli_args.password,
         Some(&client),
-        false,
-        false,
     )
     .await?;
 
@@ -381,7 +378,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     send_events(
         &client,
-        git_repo_path,
+        Some(git_repo_path),
         vec![repo_event],
         user_ref.relays.write(),
         relays.clone(),
diff --git a/src/bin/ngit/sub_commands/list.rs b/src/bin/ngit/sub_commands/list.rs
index 351896a..7717dce 100644
--- a/src/bin/ngit/sub_commands/list.rs
+++ b/src/bin/ngit/sub_commands/list.rs
@@ -12,7 +12,7 @@ use nostr_sdk::Kind;
 use crate::{
     cli_interactor::{Interactor, InteractorPrompt, PromptChoiceParms, PromptConfirmParms},
     client::{
-        fetching_with_report, get_events_from_cache, get_repo_ref_from_cache, Client, Connect,
+        fetching_with_report, get_events_from_local_cache, get_repo_ref_from_cache, Client, Connect,
     },
     git::{str_to_sha1, Repo, RepoActions},
     git_events::{
@@ -37,7 +37,7 @@ pub async fn launch() -> Result<()> {
 
     fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
 
-    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
+    let repo_ref = get_repo_ref_from_cache(Some(git_repo_path), &repo_coordinates).await?;
 
     let proposals_and_revisions: Vec<nostr::Event> =
         get_proposals_and_revisions_from_cache(git_repo_path, repo_ref.coordinates()).await?;
@@ -47,7 +47,7 @@ pub async fn launch() -> Result<()> {
     }
 
     let statuses: Vec<nostr::Event> = {
-        let mut statuses = get_events_from_cache(
+        let mut statuses = get_events_from_local_cache(
             git_repo_path,
             vec![
                 nostr::Filter::default()
diff --git a/src/bin/ngit/sub_commands/login.rs b/src/bin/ngit/sub_commands/login.rs
index df7efa5..ae5efb1 100644
--- a/src/bin/ngit/sub_commands/login.rs
+++ b/src/bin/ngit/sub_commands/login.rs
@@ -5,45 +5,31 @@ use crate::{
     cli::Cli,
     client::{Client, Connect},
     git::Repo,
-    login,
+    login::fresh::fresh_login_or_signup,
 };
 
 #[derive(clap::Args)]
 pub struct SubCommandArgs {
+    /// login to the local git repository only
+    #[arg(long, action)]
+    local: bool,
+
     /// don't fetch user metadata and relay list from relays
     #[arg(long, action)]
     offline: bool,
 }
 
-pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
+pub async fn launch(_args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
     let git_repo = Repo::discover().context("cannot find a git repository")?;
+    // TODO show existing login on record, prompt to logout
+    // TODO use cli arguments to login
     if command_args.offline {
-        login::launch(
-            &git_repo,
-            &args.bunker_uri,
-            &args.bunker_app_key,
-            &args.nsec,
-            &args.password,
-            None,
-            true,
-            false,
-        )
-        .await?;
+        fresh_login_or_signup(&Some(&git_repo), None, command_args.local).await?;
         Ok(())
     } else {
         let client = Client::default();
+        fresh_login_or_signup(&Some(&git_repo), Some(&client), command_args.local).await?;
 
-        login::launch(
-            &git_repo,
-            &args.bunker_uri,
-            &args.bunker_app_key,
-            &args.nsec,
-            &args.password,
-            Some(&client),
-            true,
-            false,
-        )
-        .await?;
         client.disconnect().await?;
         Ok(())
     }
diff --git a/src/bin/ngit/sub_commands/pull.rs b/src/bin/ngit/sub_commands/pull.rs
index d79b7b1..77a65e9 100644
--- a/src/bin/ngit/sub_commands/pull.rs
+++ b/src/bin/ngit/sub_commands/pull.rs
@@ -33,7 +33,7 @@ pub async fn launch() -> Result<()> {
     let repo_coordinates = get_repo_coordinates(&git_repo, &client).await?;
     fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
 
-    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
+    let repo_ref = get_repo_ref_from_cache(Some(git_repo_path), &repo_coordinates).await?;
 
     let logged_in_public_key =
         if let Ok(Some(npub)) = git_repo.get_git_config_item("nostr.npub", None) {
diff --git a/src/bin/ngit/sub_commands/push.rs b/src/bin/ngit/sub_commands/push.rs
index a77f356..aaf1009 100644
--- a/src/bin/ngit/sub_commands/push.rs
+++ b/src/bin/ngit/sub_commands/push.rs
@@ -6,7 +6,7 @@ use ngit::{
 use nostr_sdk::PublicKey;
 
 use crate::{
-    cli::Cli,
+    cli::{extract_signer_cli_arguments, Cli},
     client::{
         fetching_with_report, get_all_proposal_patch_events_from_cache,
         get_proposals_and_revisions_from_cache, get_repo_ref_from_cache, Client, Connect,
@@ -53,7 +53,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
 
-    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
+    let repo_ref = get_repo_ref_from_cache(Some(git_repo_path), &repo_coordinates).await?;
 
     let logged_in_public_key =
         if let Ok(Some(npub)) = git_repo.get_git_config_item("nostr.npub", None) {
@@ -166,15 +166,11 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         ahead.len()
     );
 
-    let (signer, user_ref) = login::launch(
-        &git_repo,
-        &cli_args.bunker_uri,
-        &cli_args.bunker_app_key,
-        &cli_args.nsec,
+    let (signer, user_ref, _) = login::login_or_signup(
+        &Some(&git_repo),
+        &extract_signer_cli_arguments(cli_args).unwrap_or(None),
         &cli_args.password,
         Some(&client),
-        false,
-        false,
     )
     .await?;
 
@@ -204,7 +200,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     send_events(
         &client,
-        git_repo_path,
+        Some(git_repo_path),
         patch_events,
         user_ref.relays.write(),
         repo_ref.relays.clone(),
diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs
index fe2952f..114a021 100644
--- a/src/bin/ngit/sub_commands/send.rs
+++ b/src/bin/ngit/sub_commands/send.rs
@@ -10,12 +10,12 @@ use nostr::{
 use nostr_sdk::hashes::sha1::Hash as Sha1Hash;
 
 use crate::{
-    cli::Cli,
+    cli::{extract_signer_cli_arguments, Cli},
     cli_interactor::{
         Interactor, InteractorPrompt, PromptConfirmParms, PromptInputParms, PromptMultiChoiceParms,
     },
     client::{
-        fetching_with_report, get_events_from_cache, get_repo_ref_from_cache, Client, Connect,
+        fetching_with_report, get_events_from_local_cache, get_repo_ref_from_cache, Client, Connect,
     },
     git::{identify_ahead_behind, Repo, RepoActions},
     git_events::{event_is_patch_set_root, event_tag_from_nip19_or_hex},
@@ -175,21 +175,18 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
     } else {
         None
     };
-    let (signer, user_ref) = login::launch(
-        &git_repo,
-        &cli_args.bunker_uri,
-        &cli_args.bunker_app_key,
-        &cli_args.nsec,
+
+    let (signer, user_ref, _) = login::login_or_signup(
+        &Some(&git_repo),
+        &extract_signer_cli_arguments(cli_args).unwrap_or(None),
         &cli_args.password,
         Some(&client),
-        false,
-        false,
     )
     .await?;
 
     client.set_signer(signer.clone()).await;
 
-    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
+    let repo_ref = get_repo_ref_from_cache(Some(git_repo_path), &repo_coordinates).await?;
 
     // oldest first
     commits.reverse();
@@ -228,7 +225,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
 
     send_events(
         &client,
-        git_repo_path,
+        Some(git_repo_path),
         events.clone(),
         user_ref.relays.write(),
         repo_ref.relays.clone(),
@@ -370,9 +367,11 @@ async fn get_root_proposal_id_and_mentions_from_in_reply_to(
                 marker: _,
                 public_key: _,
             }) => {
-                let events =
-                    get_events_from_cache(git_repo_path, vec![nostr::Filter::new().id(*event_id)])
-                        .await?;
+                let events = get_events_from_local_cache(
+                    git_repo_path,
+                    vec![nostr::Filter::new().id(*event_id)],
+                )
+                .await?;
 
                 if let Some(first) = events.iter().find(|e| e.id.eq(event_id)) {
                     if event_is_patch_set_root(first) {