add Docker credentials to app and CLI

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

@@ -1,27 +1,10 @@
 use std::io;
 
-use anyhow::bail;
+use crate::proto::DockerCredential;
-
-use crate::proto::{CliResponse, DockerCredential};
-use super::{
-    CliCredential,
-    CliRequest,
-    GlobalArgs
-};
 
 
-pub fn docker_store(global_args: GlobalArgs) -> anyhow::Result<()> {
+pub fn docker_store() -> anyhow::Result<()> {
     let input: DockerCredential = serde_json::from_reader(io::stdin())?;
-    dbg!(&input);
+    dbg!(input);
-
+    Ok(())
-    let req = CliRequest::SaveCredential {
-        name: input.username.clone(),
-        is_default: false, // is_default doesn't really mean anything for Docker credentials
-        credential: CliCredential::Docker(input),
-    };
-
-    match super::make_request(global_args.server_addr, &req)?? {
-        CliResponse::Empty => Ok(()),
-        r => bail!("Unexpected response from server: {r}"),
-    }
 }

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

@@ -201,10 +201,10 @@ pub fn invoke_shortcut(args: InvokeArgs, global: GlobalArgs) -> anyhow::Result<(
 }
 
 
-pub fn docker_credential_helper(cmd: DockerCmd, global_args: GlobalArgs) -> anyhow::Result<()> {
+pub fn docker_credential_helper(cmd: DockerCmd) -> anyhow::Result<()> {
     match cmd {
         DockerCmd::Get => todo!(),
-        DockerCmd::Store => docker::docker_store(global_args),
+        DockerCmd::Store => docker::docker_store(),
         DockerCmd::Erase => todo!(),
     }
 }
@@ -214,7 +214,6 @@ pub fn docker_credential_helper(cmd: DockerCmd, global_args: GlobalArgs) -> anyh
 // to indicate when the operation succeeded or failed, which we deserialize.
 // However, the operation may fail to even communicate with the server, in
 // which case we return the outer Result
-// (probably this should be modeled differently)
 #[tokio::main]
 async fn make_request(
     addr: Option<PathBuf>,

src-tauri/creddy_cli/src/main.rs

@@ -11,7 +11,7 @@ fn main() {
         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),
-        Some(Action::Docker(cmd)) => creddy_cli::docker_credential_helper(cmd, cli.global_args),
+        Some(Action::Docker(cmd)) => creddy_cli::docker_credential_helper(cmd),
     };
 
     if let Err(e) = res {

src-tauri/src/main.rs

@@ -21,7 +21,7 @@ fn main() {
         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),
-        Some(Action::Docker(cmd)) => creddy_cli::docker_credential_helper(cmd, cli.global_args),
+        Some(Action::Docker(cmd)) => creddy_cli::docker_credential_helper(cmd),
     };
 
     if let Err(e) = res {

src/views/Unlock.svelte

@@ -19,7 +19,7 @@
 
     let alert;
     let passphrase = '';
-
+    
     let saving = false;
     async function unlock() {
         saving = true;
@@ -40,8 +40,6 @@
 </script>
 
 
-<svelte:window on:focus={input.focus} />
-
 <div class="fixed top-0 w-full p-2 text-center">
     <h1 class="text-3xl font-bold">Creddy is locked</h1>
 </div>