bump version to 0.6.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "creddy",
-  "version": "0.6.3",
+  "version": "0.6.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

src-tauri/Cargo.lock

@@ -218,6 +218,30 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
 [[package]]
 name = "async-io"
 version = "2.3.3"
@@ -1217,7 +1241,7 @@ dependencies = [
 
 [[package]]
 name = "creddy"
-version = "0.6.3"
+version = "0.6.0"
 dependencies = [
  "argon2",
  "auto-launch",
@@ -1251,6 +1275,7 @@ dependencies = [
  "tauri-plugin-dialog",
  "tauri-plugin-global-shortcut",
  "tauri-plugin-os",
+ "tauri-plugin-single-instance",
  "thiserror",
  "time",
  "tokio",
@@ -5622,6 +5647,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "tauri-plugin-single-instance"
+version = "2.0.0-beta.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ecafcc5214a5d3cd7a720c11e9c03cbd45ccaff721963485ec4ab481bdf4540"
+dependencies = [
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "thiserror",
+ "windows-sys 0.52.0",
+ "zbus",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.0.0-beta.18"
@@ -7002,9 +7042,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030"
 dependencies = [
  "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
  "async-process",
  "async-recursion",
+ "async-task",
  "async-trait",
+ "blocking",
  "derivative",
  "enumflags2",
  "event-listener 5.3.1",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "creddy"
-version = "0.6.3"
+version = "0.6.0"
 description = "A friendly AWS credentials manager"
 authors = ["Joseph Montanaro"]
 license = ""
@@ -30,7 +30,7 @@ tauri-build = { version = "2.0.0-beta", features = [] }
 
 [dependencies]
 creddy_cli = { path = "./creddy_cli" }
-tauri = { version = "2.0.0-beta", features = ["tray-icon", "test"] }
+tauri = { version = "2.0.0-beta", features = ["tray-icon"] }
 sodiumoxide = "0.2.7"
 sysinfo = "0.26.8"
 aws-config = "1.5.3"
@@ -49,6 +49,7 @@ chacha20poly1305 = { version = "0.10.1", features = ["std"] }
 which = "4.4.0"
 windows = { version = "0.51.1", features = ["Win32_Foundation", "Win32_System_Pipes"] }
 time = "0.3.31"
+tauri-plugin-single-instance = "2.0.0-beta.9"
 tauri-plugin-global-shortcut = "2.0.0-beta.6"
 tauri-plugin-os = "2.0.0-beta.6"
 tauri-plugin-dialog = "2.0.0-beta.9"

src-tauri/creddy_cli/src/cli/docker.rs

@@ -29,20 +29,11 @@ pub fn docker_get(global_args: GlobalArgs) -> anyhow::Result<()> {
        server_url: server_url.trim().to_owned()
     };
 
-    let server_resp = super::make_request(global_args.server_addr, &req)?;
-    match server_resp {
-        Ok(CliResponse::Credential(CliCredential::Docker(d))) => {
+    match super::make_request(global_args.server_addr, &req)?? {
+        CliResponse::Credential(CliCredential::Docker(d)) => {
             println!("{}", serde_json::to_string(&d)?);
         },
-        Err(e) if e.code == "NoCredentials" => {
-            // To indicate credentials are not found, a credential helper *must* print
-            // this message to stdout, then exit 1. Any other message/status will cause
-            // some builds to fail. This is, of course, not documented anywhere.
-            println!("credentials not found in native keychain");
-            std::process::exit(1);
-        },
-        Err(e) => Err(e)?,
-        Ok(r) => bail!("Unexpected response from server: {r}"),
+        r => bail!("Unexpected response from server: {r}"),
     }
     Ok(())
 }

src-tauri/creddy_cli/src/cli/mod.rs

@@ -65,7 +65,7 @@ pub struct GlobalArgs {
 #[derive(Debug, Subcommand)]
 pub enum Action {
     /// Launch Creddy
-    Run(RunArgs),
+    Run,
     /// Request credentials from Creddy and output to stdout
     Get(GetArgs),
     /// Inject credentials into the environment of another command
@@ -78,14 +78,6 @@ pub enum Action {
 }
 
 
-#[derive(Debug, Args)]
-pub struct RunArgs {
-    /// Minimize to system tray on launch
-    #[arg(long, default_value_t = false)]
-    pub minimized: bool,
-}
-
-
 #[derive(Debug, Args)]
 pub struct GetArgs {
     /// If unspecified, use default credentials
@@ -110,7 +102,7 @@ pub struct ExecArgs {
 #[derive(Debug, Args)]
 pub struct InvokeArgs {
     #[arg(value_name = "ACTION", value_enum)]
-    pub shortcut_action: ShortcutAction,
+    shortcut_action: ShortcutAction,
 }
 
 

src-tauri/creddy_cli/src/lib.rs

@@ -1,26 +1,19 @@
 mod cli;
 pub use cli::{
-    Action,
     Cli,
-    docker_credential_helper,
+    Action,
     exec,
     get,
-    GlobalArgs,
-    RunArgs,
     invoke_shortcut,
+    docker_credential_helper,
 };
 
-pub use platform::{connect, server_addr};
+pub(crate) use platform::connect;
+pub use platform::server_addr;
 
 pub mod proto;
 
 
-pub fn show_window(global_args: GlobalArgs) -> anyhow::Result<()> {
-    let invoke = cli::InvokeArgs { shortcut_action: proto::ShortcutAction::ShowWindow };
-    cli::invoke_shortcut(invoke, global_args)
-}
-
-
 #[cfg(unix)]
 mod platform {
     use std::path::PathBuf;
@@ -34,12 +27,7 @@ mod platform {
     pub fn server_addr(sock_name: &str) -> PathBuf {
         let mut path = dirs::runtime_dir()
             .unwrap_or_else(|| PathBuf::from("/tmp"));
-        if cfg!(debug_assertions) {
-            path.push(format!("{sock_name}.dev.sock"))
-        }
-        else {
-            path.push(format!("{sock_name}.sock"));
-        }
+        path.push(format!("{sock_name}.sock"));
         path
     }
 }
@@ -48,11 +36,6 @@ mod platform {
 #[cfg(windows)]
 mod platform {
     pub fn server_addr(sock_name: &str) -> String {
-        if cfg!(debug_assertions) {
-            format!(r"\\.\pipe\{sock_name}.dev")
-        }
-        else {
-            format!(r"\\.\pipe\{sock_name}")
-        }
+        format!(r"\\.\pipe\{sock_name}")
     }
 }

src-tauri/creddy_cli/src/main.rs

@@ -1,17 +1,13 @@
 use std::env;
 use std::process::{self, Command};
 
-use creddy_cli::{
-    Action,
-    Cli,
-    RunArgs,
-};
+use creddy_cli::{Action, Cli};
+
 
 fn main() {
     let cli = Cli::parse();
     let res = match cli.action {
-        None => launch_gui(RunArgs { minimized: false }),
-        Some(Action::Run(run_args)) => launch_gui(run_args),
+        None | Some(Action::Run)=> launch_gui(),
         Some(Action::Get(args)) => creddy_cli::get(args, cli.global_args),
         Some(Action::Exec(args)) => creddy_cli::exec(args, cli.global_args),
         Some(Action::Shortcut(args)) => creddy_cli::invoke_shortcut(args, cli.global_args),
@@ -25,7 +21,7 @@ fn main() {
 }
 
 
-fn launch_gui(run_args: RunArgs) -> anyhow::Result<()>  {
+fn launch_gui() -> anyhow::Result<()>  {
     let mut path = env::current_exe()?;
     path.pop(); // bin dir
 
@@ -35,10 +31,6 @@ fn launch_gui(run_args: RunArgs) -> anyhow::Result<()>  {
 
     path.push("creddy.exe"); // exe in main install dir (aka gui exe)
 
-    let mut cmd = Command::new(path);
-    if run_args.minimized {
-        cmd.arg("--minimized");
-    }
-    cmd.spawn()?;
+    Command::new(path).spawn()?;
     Ok(())
 }

src-tauri/creddy_cli/src/proto.rs

@@ -99,8 +99,8 @@ pub struct DockerCredential {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ServerError {
-    pub code: String,
-    pub msg: String,
+    code: String,
+    msg: String,
 }
 
 impl Display for ServerError {

src-tauri/src/app.rs

@@ -15,7 +15,7 @@ use tauri::{
     RunEvent,
     WindowEvent,
 };
-use creddy_cli::{GlobalArgs, RunArgs};
+use tauri::menu::MenuItem;
 
 use crate::{
     config::{self, AppConfig},
@@ -32,13 +32,12 @@ use crate::{
 pub static APP: OnceCell<AppHandle> = OnceCell::new();
 
 
-pub fn run(run_args: RunArgs, global_args: GlobalArgs) -> tauri::Result<()> {
-    if let Ok(_) = creddy_cli::show_window(global_args) {
-        // app is already running, so terminate
-        return Ok(());
-    }
-
+pub fn run() -> tauri::Result<()> {
     tauri::Builder::default()
+        .plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
+            show_main_window(app)
+                .error_popup("Failed to show main window")
+        }))
         .plugin(tauri_plugin_global_shortcut::Builder::default().build())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_dialog::init())
@@ -59,10 +58,9 @@ pub fn run(run_args: RunArgs, global_args: GlobalArgs) -> tauri::Result<()> {
             ipc::save_config,
             ipc::launch_terminal,
             ipc::get_setup_errors,
-            ipc::get_devmode,
             ipc::exit,
         ])
-        .setup(|app| rt::block_on(setup(app, run_args)))
+        .setup(|app| rt::block_on(setup(app)))
         .build(tauri::generate_context!())?
         .run(|app, run_event| {
             if let RunEvent::WindowEvent { event, .. } = run_event {
@@ -88,11 +86,11 @@ pub async fn connect_db() -> Result<SqlitePool, SetupError> {
 }
 
 
-async fn setup(app: &mut App, run_args: RunArgs) -> Result<(), Box<dyn Error>> {
+async fn setup(app: &mut App) -> Result<(), Box<dyn Error>> {
     APP.set(app.handle().clone()).unwrap();
     tray::setup(app)?;
     // get_or_create_db_path doesn't create the actual db file, just the directory
-    let is_first_launch = !config::get_or_create_db_path()?.try_exists()?;
+    let is_first_launch = !config::get_or_create_db_path()?.exists();
     let pool = connect_db().await?;
     let mut setup_errors: Vec<String> = vec![];
 
@@ -111,16 +109,10 @@ async fn setup(app: &mut App, run_args: RunArgs) -> Result<(), Box<dyn Error>> {
     creddy_server::serve(app.handle().clone())?;
     agent::serve(app.handle().clone())?;
 
-    // if this is the first launch, setup system with default auto-launch settings
-    if is_first_launch {
-        if let Err(e) = conf.set_auto_launch() {
-            setup_errors.push(format!("Failed to manage autolaunch: {e}"));
-        }
+    config::set_auto_launch(conf.start_on_login)?;
+    if let Err(_e) = config::set_auto_launch(conf.start_on_login) {
+        setup_errors.push("Error: Failed to manage autolaunch.".into());
     }
-    // otherwise, treat the system as the source of truth and ensure ours matches
-    else {
-        conf.match_auto_launch(&pool).await?;
-    };
 
     // if hotkeys fail to register, disable them so that this error doesn't have to keep showing up
     if let Err(_e) = shortcuts::register_hotkeys(&conf.hotkeys) {
@@ -133,7 +125,7 @@ async fn setup(app: &mut App, run_args: RunArgs) -> Result<(), Box<dyn Error>> {
         .map(|names| names.split(':').any(|n| n == "GNOME"))
         .unwrap_or(false);
 
-    if !run_args.minimized {
+    if !conf.start_minimized || is_first_launch {
         show_main_window(&app.handle())?;
     }
 
@@ -166,8 +158,8 @@ fn start_auto_locker(app: AppHandle) {
 pub fn show_main_window(app: &AppHandle) -> Result<(), WindowError> {
     let w = app.get_webview_window("main").ok_or(WindowError::NoMainWindow)?;
     w.show()?;
-    let menu = app.state::<tray::MenuItems>();
-    menu.after_show()?;
+    let show_hide = app.state::<MenuItem<tauri::Wry>>();
+    show_hide.set_text("Hide")?;
     Ok(())
 }
 
@@ -175,8 +167,8 @@ pub fn show_main_window(app: &AppHandle) -> Result<(), WindowError> {
 pub fn hide_main_window(app: &AppHandle) -> Result<(), WindowError> {
     let w = app.get_webview_window("main").ok_or(WindowError::NoMainWindow)?;
     w.hide()?;
-    let menu = app.state::<tray::MenuItems>();
-    menu.after_hide()?;
+    let show_hide = app.state::<MenuItem<tauri::Wry>>();
+    show_hide.set_text("Show")?;
     Ok(())
 }
 

src-tauri/src/config.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::time::Duration;
 
-use auto_launch::{AutoLaunch, AutoLaunchBuilder};
+use auto_launch::AutoLaunchBuilder;
 use is_terminal::IsTerminal;
 use serde::{Serialize, Deserialize};
 use sqlx::SqlitePool;
@@ -89,49 +89,29 @@ impl AppConfig {
     pub async fn save(&self, pool: &SqlitePool) -> Result<(), sqlx::error::Error> {
         kv::save(pool, "config", self).await
     }
+}
 
-    /// Configure system with auto-launch settings
-    pub fn set_auto_launch(&self) -> Result<(), SetupError> {
-        let mgr = self.auto_launch_manager()?;
 
-        // if enabled, disabled regardless of desired end state because either:
-        // a) we are just going to leave it disabled, or
-        // b) we need to disable-and-reenable in case args are different
-        if mgr.is_enabled()? {
-            mgr.disable()?;
-        }
-        if self.start_on_login {
-            mgr.enable()?;
-        }
+pub fn set_auto_launch(is_configured: bool) -> Result<(), SetupError> {
+    let path_buf = std::env::current_exe()
+        .map_err(|e| auto_launch::Error::Io(e))?;
+    let path = path_buf
+        .to_string_lossy();
 
-        Ok(())
+    let auto = AutoLaunchBuilder::new()
+        .set_app_name("Creddy")
+        .set_app_path(&path)
+        .build()?;
+
+    let is_enabled = auto.is_enabled()?;
+    if is_configured && !is_enabled {
+        auto.enable()?;
+    }
+    else if !is_configured && is_enabled {
+        auto.disable()?;
     }
 
-    /// Match own auto-launch settings to system
-    pub async fn match_auto_launch(&mut self, pool: &SqlitePool) -> Result<(), SetupError> {
-        let mgr = self.auto_launch_manager()?;
-        let is_enabled = mgr.is_enabled()?;
-        if is_enabled != self.start_on_login {
-            self.start_on_login = is_enabled;
-            self.save(pool).await?;
-        }
-        Ok(())
-    }
-
-    fn auto_launch_manager(&self) -> Result<AutoLaunch, SetupError> {
-        let path_buf = std::env::current_exe()
-            .map_err(|e| auto_launch::Error::Io(e))?;
-
-        let name = if cfg!(debug_assertions) { "Creddy" } else { "Creddy (dev)" };
-        let mut builder = AutoLaunchBuilder::new();
-        builder.set_app_name(name);
-        builder.set_app_path(&path_buf.to_string_lossy());
-        if self.start_minimized {
-            builder.set_args(&["run", "--minimized"]);
-        }
-
-        Ok(builder.build()?)
-    }
+    Ok(())
 }
 
 

src-tauri/src/ipc.rs

@@ -204,12 +204,6 @@ pub async fn get_setup_errors(app_state: State<'_, AppState>) -> Result<Vec<Stri
 }
 
 
-#[tauri::command]
-pub fn get_devmode() -> bool {
-    cfg!(debug_assertions)
-}
-
-
 #[tauri::command]
 pub fn exit(app_handle: AppHandle) {
     app_handle.exit(0)

src-tauri/src/main.rs

@@ -8,23 +8,14 @@ use creddy::{
     app,
     errors::ShowError,
 };
-use creddy_cli::{
-    Action,
-    Cli,
-    RunArgs,
-};
+use creddy_cli::{Action, Cli};
 
 
 fn main() {
     let cli = Cli::parse();
     let res = match cli.action {
-        None => {
-            let run_args = RunArgs { minimized: false };
-            app::run(run_args, cli.global_args).error_popup("Creddy encountered an error");
-            Ok(())
-        }
-        Some(Action::Run(run_args)) => {
-            app::run(run_args, cli.global_args).error_popup("Creddy encountered an error");
+        None | Some(Action::Run) => {
+            app::run().error_popup("Creddy encountered an error");
             Ok(())
         },
         Some(Action::Get(args)) => creddy_cli::get(args, cli.global_args),

src-tauri/src/srv/mod.rs

@@ -4,7 +4,6 @@ use tauri::{
     AppHandle,
     async_runtime as rt,
     Manager,
-    Runtime,
 };
 use tokio::io::AsyncReadExt;
 use tokio::sync::oneshot;
@@ -81,11 +80,9 @@ impl<'s> CloseWaiter<'s> {
 }
 
 
-// note: AppHandle is generic over `Runtime` for testing
-fn serve<H, F, R>(sock_name: &str, app_handle: AppHandle<R>, handler: H) -> std::io::Result<()>
-    where H: Copy + Send + Fn(Stream, AppHandle<R>, u32) -> F + 'static,
+fn serve<H, F>(sock_name: &str, app_handle: AppHandle, handler: H) -> std::io::Result<()>
+    where H: Copy + Send + Fn(Stream, AppHandle, u32) -> F + 'static,
           F: Send + Future<Output = Result<(), HandlerError>>,
-          R: Runtime
 {
     let (mut listener, addr) = platform::bind(sock_name)?;
     rt::spawn(async move {
@@ -226,31 +223,3 @@ mod platform {
         Ok((stream, pid))
     }
 }
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use tokio::io::AsyncWriteExt;
-
-    #[tokio::test]
-    async fn test_server_connect() {
-        let app = tauri::test::mock_app();
-        serve("creddy_server_test", app.app_handle().clone(), |mut stream, _handle, _pid| {
-            async move {
-                let buf = serde_json::to_vec(&CliResponse::Empty).unwrap();
-                stream.write_all(&buf).await.unwrap();
-                Ok(())
-            }
-        }).unwrap();
-
-        let addr = creddy_cli::server_addr("creddy_server_test");
-        let mut stream = creddy_cli::connect(Some(addr)).await.unwrap();
-
-        let mut buf = Vec::new();
-        stream.read_to_end(&mut buf).await.unwrap();
-        let resp: CliResponse = serde_json::from_slice(&buf).unwrap();
-
-        assert!(matches!(resp, CliResponse::Empty))
-    }
-}

src-tauri/src/state.rs

@@ -22,7 +22,7 @@ use crate::credentials::{
     DockerCredential,
     SshKey,
 };
-use crate::config::AppConfig;
+use crate::{config, config::AppConfig};
 use crate::credentials::{
     AwsBaseCredential,
     Credential,
@@ -32,7 +32,6 @@ use crate::credentials::{
 use crate::ipc::{self, RequestResponse};
 use crate::errors::*;
 use crate::shortcuts;
-use crate::tray;
 
 
 #[derive(Debug)]
@@ -204,9 +203,8 @@ impl AppState {
         let mut live_config = self.config.write().await;
 
         // update autostart if necessary
-        if new_config.start_on_login != live_config.start_on_login
-            || new_config.start_minimized != live_config.start_minimized {
-            new_config.set_auto_launch()?;
+        if new_config.start_on_login != live_config.start_on_login {
+            config::set_auto_launch(new_config.start_on_login)?;
         }
 
         // re-register hotkeys if necessary
@@ -254,11 +252,7 @@ impl AppState {
 
     pub async fn unlock(&self, passphrase: &str) -> Result<(), UnlockError> {
         let mut session = self.app_session.write().await;
-        session.unlock(passphrase)?;
-        let app_handle = app::APP.get().unwrap();
-        let menu = app_handle.state::<tray::MenuItems>();
-        let _ = menu.after_unlock(); // we don't care if this fails, it's non-essential
-        Ok(())
+        session.unlock(passphrase)
     }
 
     pub async fn lock(&self) -> Result<(), LockError> {
@@ -272,9 +266,6 @@ impl AppState {
                 let app_handle = app::APP.get().unwrap();
                 app_handle.emit("locked", None::<usize>)?;
 
-                let menu = app_handle.state::<tray::MenuItems>();
-                let _ = menu.after_lock();
-
                 Ok(())
             }
         }

src-tauri/src/tray.rs

@@ -7,74 +7,27 @@ use tauri::{
 use tauri::menu::{
     MenuBuilder,
     MenuEvent,
-    MenuItem,
     MenuItemBuilder,
-    PredefinedMenuItem,
 };
 
 use crate::app;
 use crate::state::AppState;
 
 
-pub struct MenuItems {
-    pub status: MenuItem<tauri::Wry>,
-    pub show_hide: MenuItem<tauri::Wry>,
-}
-
-impl MenuItems {
-    pub fn after_show(&self) -> tauri::Result<()> {
-        self.show_hide.set_text("Hide")
-    }
-
-    pub fn after_hide(&self) -> tauri::Result<()> {
-        self.show_hide.set_text("Show")
-    }
-
-    pub fn after_lock(&self) -> tauri::Result<()> {
-        if cfg!(debug_assertions) {
-            self.status.set_text("Creddy (dev): Locked")
-        }
-        else {
-            self.status.set_text("Creddy: Locked")
-        }
-    }
-
-    pub fn after_unlock(&self) -> tauri::Result<()> {
-        if cfg!(debug_assertions) {
-            self.status.set_text("Creddy (dev): Unlocked")
-        }
-        else {
-            self.status.set_text("Creddy: Unlocked")
-        }
-    }
-}
-
-
 pub fn setup(app: &App) -> tauri::Result<()> {
-    let status_text =
-        if cfg!(debug_assertions) {
-            "Creddy (dev): Locked"
-        }
-        else {
-            "Creddy: Locked"
-        };
-
-    let status = MenuItemBuilder::with_id("status", status_text)
-        .enabled(false)
-        .build(app)?;
-    let sep = PredefinedMenuItem::separator(app)?;
     let show_hide = MenuItemBuilder::with_id("show_hide", "Show").build(app)?;
     let exit = MenuItemBuilder::with_id("exit", "Exit").build(app)?;
 
     let menu = MenuBuilder::new(app)
-        .items(&[&status, &sep, &show_hide, &exit]);
+        .items(&[&show_hide, &exit])
+        .build()?;
 
     let tray = app.tray_by_id("main").unwrap();
-    tray.set_menu(Some(menu.build()?))?;
+    tray.set_menu(Some(menu))?;
     tray.on_menu_event(handle_event);
 
-    // stash these so we can find them later to change the text
-    app.manage(MenuItems { status, show_hide });
+    // stash this so we can find it later to change the text
+    app.manage(show_hide);
 
     Ok(())
 }

src-tauri/tauri.conf.json

@@ -50,7 +50,7 @@
     }
   },
   "productName": "creddy",
-  "version": "0.6.3",
+  "version": "0.6.0",
   "identifier": "creddy",
   "plugins": {},
   "app": {

src/App.svelte

@@ -14,7 +14,6 @@ import Unlock from './views/Unlock.svelte';
 // set up app state
 invoke('get_config').then(config => $appState.config = config);
 invoke('get_session_status').then(status => $appState.sessionStatus = status);
-invoke('get_devmode').then(dm => $appState.devmode = dm)
 getVersion().then(version => $appState.appVersion = version);
 invoke('get_setup_errors')
     .then(errs => {
@@ -52,7 +51,7 @@ acceptRequest();
 </script>
 
 
-<svelte:window
+<svelte:window 
     on:click={() => invoke('signal_activity')}
     on:keydown={() => invoke('signal_activity')}
 />
@@ -71,9 +70,3 @@ acceptRequest();
     <!-- normal operation -->
     <svelte:component this="{$currentView}" />
 {/if}
-
-{#if $appState.devmode }
-    <div class="fixed left-0 bottom-0 right-0 py-1 bg-warning text-xs text-center text-warning-content">
-        This is a development build of Creddy.
-    </div>
-{/if}

src/views/ManageCredentials.svelte

@@ -144,7 +144,7 @@
         {:else if records !== null}
             <div class="flex flex-col gap-6 items-center rounded-box border-2 border-dashed border-neutral-content/30 p-6">
                 <div>You have no saved Docker credentials.</div>
-                <button class="btn btn-primary btn-wide mx-auto" on:click={newDocker}>
+                <button class="btn btn-primary btn-wide mx-auto" on:click={newSsh}>
                     <Icon name="plus-circle-mini" class="size-5" />
                     Add
                 </button>

src/views/Settings.svelte

@@ -20,6 +20,7 @@
     let error = null;
     async function save() {
         try {
+            throw('wtf');
             await invoke('save_config', {config});
             $appState.config = await invoke('get_config');
         }
@@ -40,20 +41,18 @@
 
 <form on:submit|preventDefault={save}>
     <div class="max-w-lg mx-auto my-1.5 p-4 space-y-16">
-        <SettingsGroup name="General">
+        <SettingsGroup name="General">            
             <ToggleSetting title="Start on login" bind:value={config.start_on_login}>
                 <svelte:fragment slot="description">
                     Start Creddy when you log in to your computer.
                 </svelte:fragment>
             </ToggleSetting>
 
-            {#if config.start_on_login}
-                <ToggleSetting title="Start minimized" bind:value={config.start_minimized}>
-                    <svelte:fragment slot="description">
-                        Minimize to the system tray when starting on login.
-                    </svelte:fragment>
-                </ToggleSetting>
-            {/if}
+            <ToggleSetting title="Start minimized" bind:value={config.start_minimized}>
+                <svelte:fragment slot="description">
+                    Minimize to the system tray at startup.
+                </svelte:fragment>
+            </ToggleSetting>
 
             <NumericSetting title="Re-hide delay" bind:value={config.rehide_ms} min={0} unit="Milliseconds">
                 <svelte:fragment slot="description">