prompt user for node manger url

- saves node manager to local storage - remove hard coded url from components
thesimplekid · Jul 14, 2023 · 5afd4fa · 5afd4fa
1 parent 7614ef2
commit 5afd4fa
Show file tree

Hide file tree

Showing 12 changed files with 325 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mint-manager/Cargo.toml b/mint-manager/Cargo.toml
@@ -24,3 +24,4 @@ nostr = { workspace = true }
 gloo-storage = "0.2.2"
 anyhow = "1.0.71"
 jwt-compact = { workspace = true }
+url = "2.4.0"
diff --git a/mint-manager/src/app.rs b/mint-manager/src/app.rs
@@ -1,18 +1,34 @@
+use std::str::FromStr;
+
 use anyhow::Result;
 use cashu_crab::Amount;
 use gloo::storage::LocalStorage;
 use gloo_net::http::Request;
 use gloo_storage::Storage;
+use log::debug;
 use node_manager_types::responses::BalanceResponse;
+use url::Url;
 use yew::platform::spawn_local;
 use yew::prelude::*;
 
+use crate::components::manager_url::SetManagerUrl;
+
 use crate::components::{
     balance::Balance, cashu::Cashu, channels::Channels, ln::Ln, login::Login, on_chain::OnChain,
 };
 
-async fn get_balances(jwt: &str, fetech_callback: Callback<BalanceResponse>) -> Result<()> {
-    let fetched_balance: BalanceResponse = Request::get("http://127.0.0.1:8086/balance")
+pub const NODE_URL_KEY: &str = "node_url";
+
+pub const JWT_KEY: &str = "auth_token";
+
+async fn get_balances(
+    url: &Url,
+    jwt: &str,
+    fetech_callback: Callback<BalanceResponse>,
+) -> Result<()> {
+    let url = url.join("/balance")?;
+
+    let fetched_balance: BalanceResponse = Request::get(url.as_str())
         .header("Authorization", &format!("Bearer {}", jwt))
         .send()
         .await?
@@ -23,8 +39,9 @@ async fn get_balances(jwt: &str, fetech_callback: Callback<BalanceResponse>) ->
     Ok(())
 }
 
-async fn get_cashu(jwt: &str, fetech_callback: Callback<Amount>) -> Result<()> {
-    let fetched_balance: Amount = Request::get("http://127.0.0.1:8086/outstanding")
+async fn get_cashu(url: &Url, jwt: &str, fetech_callback: Callback<Amount>) -> Result<()> {
+    let url = url.join("/outstanding")?;
+    let fetched_balance: Amount = Request::get(url.as_str())
         .header("Authorization", &format!("Bearer {}", jwt))
         .send()
         .await?
@@ -35,8 +52,9 @@ async fn get_cashu(jwt: &str, fetech_callback: Callback<Amount>) -> Result<()> {
     Ok(())
 }
 
-async fn check_login(jwt: &str, callback: Callback<bool>) -> Result<()> {
-    let response = Request::post("http://127.0.0.1:8086/auth")
+async fn check_login(url: &Url, jwt: &str, callback: Callback<bool>) -> Result<()> {
+    let url = url.join("/auth")?;
+    let response = Request::post(url.as_str())
         .header("Authorization", &format!("Bearer {}", jwt))
         .send()
         .await?;
@@ -50,16 +68,27 @@ async fn check_login(jwt: &str, callback: Callback<bool>) -> Result<()> {
     Ok(())
 }
 
+#[derive(Debug, Default)]
+pub enum View {
+    #[default]
+    Dashboard,
+    SetUrl,
+    Login,
+}
+
 pub enum Msg {
     LoggedIn(String),
     FetechedBalances(BalanceResponse),
     FetechedCashu(Amount),
     CheckedAuth(bool),
+    UrlSet(Url),
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Default)]
 pub struct App {
+    view: View,
     jwt: Option<String>,
+    node_url: Option<Url>,
     on_chain_confimed: Amount,
     on_chain_pending: Amount,
     ln: Amount,
@@ -71,26 +100,50 @@ impl Component for App {
     type Properties = ();
 
     fn create(ctx: &Context<Self>) -> Self {
-        let jwt = if let Ok(jwt) = LocalStorage::get::<String>("auth_token") {
-            let balance_callback = ctx.link().callback(Msg::FetechedBalances);
-            let cashu_callback = ctx.link().callback(Msg::FetechedCashu);
-            let jwt_clone = jwt.clone();
-            let check_auth = ctx.link().callback(Msg::CheckedAuth);
-            spawn_local(async move {
-                if check_login(&jwt_clone, check_auth).await.is_ok() {
-                    get_balances(&jwt_clone, balance_callback).await.ok();
-                    get_cashu(&jwt_clone, cashu_callback).await.ok();
-                }
-            });
+        let node_url: Option<Url> = LocalStorage::get::<String>(NODE_URL_KEY)
+            .ok()
+            .map(|u| Url::from_str(&u).ok())
+            .flatten();
+        let jwt = LocalStorage::get::<String>(JWT_KEY);
+
+        debug!("node: {:?}", node_url);
+
+        debug!("Jwt: {:?}", jwt);
+
+        match (node_url, jwt) {
+            (Some(url), Ok(jwt)) => {
+                let balance_callback = ctx.link().callback(Msg::FetechedBalances);
+                let cashu_callback = ctx.link().callback(Msg::FetechedCashu);
+                let jwt_clone = jwt.clone();
+                let check_auth = ctx.link().callback(Msg::CheckedAuth);
+                let node_url = url.clone();
 
-            Some(jwt)
-        } else {
-            None
-        };
+                spawn_local(async move {
+                    if check_login(&node_url, &jwt_clone, check_auth).await.is_ok() {
+                        get_balances(&node_url, &jwt_clone, balance_callback)
+                            .await
+                            .ok();
+                        get_cashu(&node_url, &jwt_clone, cashu_callback).await.ok();
+                    }
+                });
 
-        Self {
-            jwt,
-            ..Default::default()
+                Self {
+                    jwt: Some(jwt),
+                    node_url: Some(url),
+                    ..Default::default()
+                }
+            }
+            // Mint Url is not set
+            (None, _) => Self {
+                view: View::SetUrl,
+                ..Default::default()
+            },
+            // Mint url is set but user not logged in
+            (Some(url), Err(_)) => Self {
+                node_url: Some(url),
+                view: View::Login,
+                ..Default::default()
+            },
         }
     }
 
@@ -99,9 +152,10 @@ impl Component for App {
             Msg::LoggedIn(jwt) => {
                 let jwt_clone = jwt.clone();
                 let balance_callback = ctx.link().callback(Msg::FetechedBalances);
+                let url = self.node_url.clone().unwrap();
 
                 spawn_local(async move {
-                    get_balances(&jwt_clone, balance_callback).await.ok();
+                    get_balances(&url, &jwt_clone, balance_callback).await.ok();
                 });
 
                 self.jwt = Some(jwt);
@@ -123,45 +177,78 @@ impl Component for App {
             }
             Msg::CheckedAuth(status) => {
                 if !status {
-                    LocalStorage::delete("auth_token");
+                    LocalStorage::delete(JWT_KEY);
                     true
                 } else {
                     false
                 }
             }
+            Msg::UrlSet(url) => {
+                self.node_url = Some(url);
+                self.view = View::Login;
+                true
+            }
         }
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        let logged_in_callback = ctx.link().callback(Msg::LoggedIn);
-
+        log::debug!("{:?}", self.view);
         html! {
-                <main>
-            if self.jwt.is_some() {
-          <div class="flex flex-row mb-4">
-            <div class="p-2 w-1/3">
-              <Balance on_chain_confimed={self.on_chain_confimed} on_chain_pending={self.on_chain_pending} ln={self.ln}/>
-            </div>
-            <div class="p-2 w-1/3">
-              <Cashu balance={self.cashu_in_circulation}/>
-            </div>
-          </div>
-          <div class="flex flex-row">
-            <div class="p-2 w-full">
-              <OnChain jwt={self.jwt.clone().unwrap()}/>
-            </div>
-            <div class="p-2 w-full">
-              <Ln jwt={self.jwt.clone().unwrap()}/>
-            </div>
-            <div class="p-2 w-full">
-              <Channels jwt={self.jwt.clone().unwrap()} />
-            </div>
-          </div>}
-            else {
-
-            <Login {logged_in_callback} />}
-        </main>
+                        <main>
+
+                    {
+
+                         match &self.view {
+                    View::Dashboard => {
+                        html!{
+                            <>
+                  <div class="flex flex-row mb-4">
+                    <div class="p-2 w-1/3">
+                      <Balance on_chain_confimed={self.on_chain_confimed} on_chain_pending={self.on_chain_pending} ln={self.ln}/>
+                    </div>
+                    <div class="p-2 w-1/3">
+                      <Cashu balance={self.cashu_in_circulation}/>
+                    </div>
+                  </div>
+                  <div class="flex flex-row">
+                    <div class="p-2 w-full">
+                      <OnChain jwt={self.jwt.clone().unwrap()} url={self.node_url.clone().unwrap()}/>
+                    </div>
+                    <div class="p-2 w-full">
+                      <Ln jwt={self.jwt.clone().unwrap()} url={self.node_url.clone().unwrap()}/>
+                    </div>
+                    <div class="p-2 w-full">
+                      <Channels jwt={self.jwt.clone().unwrap()} url={self.node_url.clone().unwrap()} />
+                    </div>
+                            </div>
+
+                            </>
+                        }
+
+                    }
+                    View::Login => {
+                let logged_in_callback = ctx.link().callback(Msg::LoggedIn);
+                        html! {
+                            <>
+                    <Login {logged_in_callback} node_url={self.node_url.clone().unwrap()} />
+
+                            </>
+                        }
+                    }
+                    View::SetUrl => {
+
+                        let url_set_cb = ctx.link().callback(Msg::UrlSet);
+                        html!{
+
+                        <>
+                        <SetManagerUrl {url_set_cb} />
+                        </>
+                        }
+                    }
+                }
+        }
 
-            }
+                </main>
+        }
     }
 }
diff --git a/mint-manager/src/components/channel.rs b/mint-manager/src/components/channel.rs
@@ -5,32 +5,34 @@ use gloo_net::http::Request;
 use node_manager_types::requests;
 use node_manager_types::ChannelStatus;
 use serde_json::Value;
+use url::Url;
 use yew::platform::spawn_local;
 use yew::prelude::*;
 
 async fn post_close_channel(
+    url: &Url,
     jwt: &str,
     close_channel_request: requests::CloseChannel,
     channel_close_cb: Callback<String>,
 ) -> Result<()> {
-    let _fetched_channels: Value = Request::post("http://127.0.0.1:8086/close")
+    let url = url.join("close")?;
+
+    let _: Value = Request::post(url.as_str())
         .header("Authorization", &format!("Bearer {}", jwt))
         .json(&close_channel_request)
         .unwrap()
         .send()
-        .await
-        .unwrap()
+        .await?
         .json()
-        .await
-        .unwrap();
-    log::debug!("{:?}", _fetched_channels);
+        .await?;
 
     channel_close_cb.emit("OK".to_string());
     Ok(())
 }
 
 #[derive(PartialEq, Properties, Clone)]
 pub struct Props {
+    pub url: Url,
     pub jwt: String,
     // pub onedit: Callback<(usize, String)>,
     pub channel_id: String,
@@ -59,6 +61,7 @@ impl Component for Channel {
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             Msg::Delete => {
+                let url = ctx.props().url.clone();
                 let jwt = ctx.props().jwt.clone();
                 let channel_close = requests::CloseChannel {
                     channel_id: ctx.props().channel_id.clone(),
@@ -68,7 +71,7 @@ impl Component for Channel {
                 let callback = ctx.link().callback(|_| Msg::ChannelClosed);
 
                 spawn_local(async move {
-                    let _ = post_close_channel(&jwt, channel_close, callback).await;
+                    let _ = post_close_channel(&url, &jwt, channel_close, callback).await;
                 });
 
                 true
@@ -79,6 +82,7 @@ impl Component for Channel {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let Props {
+            url: _,
             jwt: _,
             channel_id: _,
             peer_id,