4 files changed, 20 insertions, 48 deletions

diff --git a/src/bin/git_remote_nostr/list.rs b/src/bin/git_remote_nostr/list.rs
index 92faa6b..daff1b6 100644
--- a/src/bin/git_remote_nostr/list.rs
+++ b/src/bin/git_remote_nostr/list.rs
@@ -35,7 +35,7 @@ pub async fn run_list(
     for_push: bool,
 ) -> Result<HashMap<String, HashMap<String, String>>> {
     let nostr_state =
-        if let Ok(nostr_state) = get_state_from_cache(git_repo.get_path()?, repo_ref).await {
+        if let Ok(nostr_state) = get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await {
             Some(nostr_state)
         } else {
             None
diff --git a/src/bin/git_remote_nostr/main.rs b/src/bin/git_remote_nostr/main.rs
index ed9fe9d..e4f97c7 100644
--- a/src/bin/git_remote_nostr/main.rs
+++ b/src/bin/git_remote_nostr/main.rs
@@ -15,7 +15,7 @@ use std::{
 use anyhow::{bail, Context, Result};
 use client::{consolidate_fetch_reports, get_repo_ref_from_cache, Connect};
 use git::{nostr_url::NostrUrlDecoded, RepoActions};
-use ngit::{client, git, login};
+use ngit::{client, git, login::existing::load_existing_login};
 use nostr::nips::nip01::Coordinate;
 use utils::read_line;
 
@@ -36,38 +36,17 @@ async fn main() -> Result<()> {
 
     let mut client = Client::default();
 
-    if git_repo
-        .get_git_config_item("nostr.npub", None)
-        .is_ok_and(|x| x.is_some())
-        && (git_repo
-            .get_git_config_item("nostr.nsec", None)
-            .is_ok_and(|x| x.is_some())
-            || (git_repo
-                .get_git_config_item("nostr.bunker-uri", None)
-                .is_ok_and(|x| x.is_some())
-                && git_repo
-                    .get_git_config_item("nostr.bunker-app-key", None)
-                    .is_ok_and(|x| x.is_some())))
+    if let Ok((signer, _, _)) =
+        load_existing_login(&Some(&git_repo), &None, &None, &None, None, true, false).await
     {
-        if let Ok((signer, _)) = login::launch(
-            &git_repo,
-            &None,
-            &None,
-            &None,
-            &None,
-            Some(&client),
-            false,
-            true,
-        )
-        .await
-        {
-            client.set_signer(signer).await;
-        };
+        // signer for to respond to relay auth request
+        client.set_signer(signer).await;
     }
 
     fetching_with_report_for_helper(git_repo_path, &client, &decoded_nostr_url.coordinates).await?;
 
-    let repo_ref = get_repo_ref_from_cache(git_repo_path, &decoded_nostr_url.coordinates).await?;
+    let repo_ref =
+        get_repo_ref_from_cache(Some(git_repo_path), &decoded_nostr_url.coordinates).await?;
 
     let stdin = io::stdin();
     let mut line = String::new();
@@ -170,7 +149,7 @@ async fn fetching_with_report_for_helper(
     let term = console::Term::stderr();
     term.write_line("nostr: fetching...")?;
     let (relay_reports, progress_reporter) = client
-        .fetch_all(git_repo_path, repo_coordinates, &HashSet::new())
+        .fetch_all(Some(git_repo_path), repo_coordinates, &HashSet::new())
         .await?;
     if !relay_reports.iter().any(std::result::Result::is_err) {
         let _ = progress_reporter.clear();
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 91c901a..7161c5d 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -8,7 +8,9 @@ use std::{
 
 use anyhow::{anyhow, bail, Context, Result};
 use auth_git2::GitAuthenticator;
-use client::{get_events_from_cache, get_state_from_cache, send_events, sign_event, STATE_KIND};
+use client::{
+    get_events_from_local_cache, get_state_from_cache, send_events, sign_event, STATE_KIND,
+};
 use console::Term;
 use git::{sha1_to_oid, RepoActions};
 use git2::{Oid, Repository};
@@ -76,7 +78,7 @@ pub async fn run_push(
         _ => list_from_remotes(&term, git_repo, &repo_ref.git_server, decoded_nostr_url),
     };
 
-    let nostr_state = get_state_from_cache(git_repo.get_path()?, repo_ref).await;
+    let nostr_state = get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await;
 
     let existing_state = {
         // if no state events - create from first git server listed
@@ -122,17 +124,8 @@ pub async fn run_push(
         return Ok(());
     }
 
-    let (signer, user_ref) = login::launch(
-        git_repo,
-        &None,
-        &None,
-        &None,
-        &None,
-        Some(client),
-        false,
-        false,
-    )
-    .await?;
+    let (signer, user_ref, _) =
+        login::login_or_signup(&Some(git_repo), &None, &None, Some(client)).await?;
 
     if !repo_ref.maintainers.contains(&user_ref.public_key) {
         for refspec in &git_server_refspecs {
@@ -306,7 +299,7 @@ pub async fn run_push(
         term.write_line("broadcast to nostr relays:")?;
         send_events(
             client,
-            git_repo.get_path()?,
+            Some(git_repo.get_path()?),
             events,
             user_ref.relays.write(),
             repo_ref.relays.clone(),
@@ -897,7 +890,7 @@ async fn get_merged_status_events(
                     // merge commit
                     for parent in commit.parents() {
                         // lookup parent id
-                        let commit_events = get_events_from_cache(
+                        let commit_events = get_events_from_local_cache(
                             git_repo.get_path()?,
                             vec![
                                 nostr::Filter::default()
@@ -1045,7 +1038,7 @@ async fn get_proposal_and_revision_root_from_patch(
                 .clone(),
         )?;
 
-        get_events_from_cache(
+        get_events_from_local_cache(
             git_repo.get_path()?,
             vec![nostr::Filter::default().id(proposal_or_revision_id)],
         )
diff --git a/src/bin/git_remote_nostr/utils.rs b/src/bin/git_remote_nostr/utils.rs
index a8bbd6f..b54ce6b 100644
--- a/src/bin/git_remote_nostr/utils.rs
+++ b/src/bin/git_remote_nostr/utils.rs
@@ -10,7 +10,7 @@ use anyhow::{bail, Context, Result};
 use git2::Repository;
 use ngit::{
     client::{
-        get_all_proposal_patch_events_from_cache, get_events_from_cache,
+        get_all_proposal_patch_events_from_cache, get_events_from_local_cache,
         get_proposals_and_revisions_from_cache,
     },
     git::{
@@ -108,7 +108,7 @@ pub async fn get_open_proposals(
             .collect();
 
     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()