From fc4dfe4fffce05c91f6766024891bdb39b2a3299 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@elliehuxtable.com>
Date: Tue, 28 May 2024 14:54:05 +0100
Subject: feat(ui): use correct username on welcome screen (#2050)

* wip

* fetch and use username
---
 ui/backend/src/main.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ui/backend/src/main.rs')

diff --git a/ui/backend/src/main.rs b/ui/backend/src/main.rs
index ce248d61..1616bff6 100644
--- a/ui/backend/src/main.rs
+++ b/ui/backend/src/main.rs
@@ -75,6 +75,11 @@ async fn config() -> Result<Settings, String> {
     Settings::new().map_err(|e| e.to_string())
 }
 
+#[tauri::command]
+async fn session() -> Result<String, String> {
+    Settings::new().map_err(|e|e.to_string())?.session_token().map_err(|e|e.to_string())
+}
+
 #[tauri::command]
 async fn home_info() -> Result<HomeInfo, String> {
     let settings = Settings::new().map_err(|e| e.to_string())?;
@@ -85,7 +90,7 @@ async fn home_info() -> Result<HomeInfo, String> {
 
     let client = atuin_client::api_client::Client::new(
         &settings.sync_address,
-        &settings.session_token,
+        settings.session_token().map_err(|e|e.to_string())?.as_str(),
         settings.network_connect_timeout,
         settings.network_timeout,
     )
@@ -132,6 +137,7 @@ fn main() {
             aliases,
             home_info,
             config,
+            session,
             dotfiles::aliases::import_aliases,
             dotfiles::aliases::delete_alias,
             dotfiles::aliases::set_alias,
@@ -140,6 +146,7 @@ fn main() {
             dotfiles::vars::set_var,
         ])
         .plugin(tauri_plugin_sql::Builder::default().build())
+        .plugin(tauri_plugin_http::init())
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
-- 
cgit v1.3.1