refactor everything to use UnlockedKey

Author: alexng353

src/commands/auth.rs

@@ -1,36 +1,29 @@
 use super::*;
-use crate::{
-    sdk::api_url,
-    utils::{auth::get_token, config::Config},
-};
+use crate::{sdk::api_url, utils::config::Config};
 use anyhow::bail;
 use reqwest::header;
 
 /// Test authentication with the server
 #[derive(Parser)]
 pub struct Args {
-    /// Key to sign with
-    #[clap(short, long)]
-    key: Option<String>,
-
     /// Debug output
     #[clap(short, long)]
     debug: bool,
 }
 
 pub async fn command(args: Args) -> anyhow::Result<()> {
     let config = Config::get()?;
-    let key = config.get_key_or_default(args.key)?;
+    let key = config.primary_key()?;
+    let password = config.primary_key_password()?;
 
-    let client = reqwest::Client::new();
+    if key.uuid.is_none() {
+        bail!("Key does not have a UUID, try `envx upload`");
+    }
+
+    let key = key.unlock(&password);
 
-    let uuid = key
-        .uuid
-        .clone()
-        .context("Key does not have a UUID, try `envx upload`")?;
-    let auth_token = get_token(&key.fingerprint, &uuid)
-        .await
-        .context("Failed to get token")?;
+    let client = reqwest::Client::new();
+    let auth_token = key.auth_token()?;
 
     println!("auth token:\n{}", auth_token.signature);
 

src/commands/delete/key.rs

@@ -7,16 +7,14 @@ pub(super) use colored::Colorize;
 use crate::commands_enum;
 use clap::Subcommand;
 
-pub mod key;
-
 /// Delete a resource. (project, key)
 #[derive(Parser)]
 pub struct Args {
     #[clap(subcommand)]
     command: Commands,
 }
 
-commands_enum!(key);
+commands_enum!();
 
 pub async fn command(args: Args) -> Result<()> {
     Commands::exec(args).await?;

src/commands/delete/mod.rs

@@ -22,10 +22,10 @@ pub struct Args {
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get()?;
     let key = config.get_key_or_default(args.key)?;
-    let project_id =
-        Choice::try_project(args.project_id, &key.fingerprint).await?;
-    let project_info =
-        SDK::get_project_info(&project_id, &key.fingerprint).await?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
+    let project_id = Choice::try_project(args.project_id, &key).await?;
+    let project_info = SDK::get_project_info(&project_id, &key).await?;
     println!("{:?}", project_info);
     Ok(())
 }

src/commands/get/project.rs

@@ -11,9 +11,11 @@ pub struct Args {
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get()?;
     let key = config.get_key_or_default(None)?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
 
     let local_projects = config.projects.clone();
-    let remote_projects = SDK::list_projects(&key.fingerprint)
+    let remote_projects = SDK::list_projects(&key)
         .await
         .context("Failed to get projects from server".red())?;
 

src/commands/get/projects.rs

@@ -41,10 +41,12 @@ pub async fn command(args: Args) -> Result<()> {
     }
 
     let key = config.primary_key()?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
 
     let project_id = match args.project_id {
         Some(p) => p,
-        None => Choice::choose_project(&key.fingerprint).await?,
+        None => Choice::choose_project(&config.projects, &key).await?,
     };
 
     config.link_project(&project_id)?;

src/commands/link.rs

@@ -2,7 +2,6 @@ use super::*;
 use crate::{
     sdk::{api_url, SDK},
     utils::{
-        auth::get_token,
         choice::Choice,
         config::Config,
         prompt::prompt_text,
@@ -41,41 +40,27 @@ pub async fn command(args: Args) -> Result<()> {
 
     let config = Config::get()?;
     let key = config.get_key_or_default(args.key)?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
 
-    let uuid = key
-        .uuid
-        .context("Key does not have a UUID, try `envx upload`")?;
-    let (_, public_key) = SDK::get_user(&key.fingerprint, &user_id)
-        .await
-        .context("Failed to get user, is the user ID correct?")?;
+    let project_id = Choice::try_project(args.project_id, &key).await?;
 
-    let project_id =
-        Choice::try_project(args.project_id, &key.fingerprint).await?;
+    let project_info = SDK::get_project_info(&project_id, &key).await?;
 
-    let project_info =
-        SDK::get_project_info(&project_id, &key.fingerprint).await?;
-
-    let variables = SDK::get_variables(&project_id, &key.fingerprint).await?;
+    let variables = SDK::get_variables(&project_id, &key).await?;
     let kvpairs = variables.to_kvpair();
 
-    let mut recipients = project_info
+    let recipients = project_info
         .users
         .iter()
         .map(|e| e.public_key.clone())
-        .collect::<Vec<String>>();
-
-    recipients.push(public_key);
-
-    let recipients = recipients
-        .into_iter()
-        .collect::<HashSet<String>>()
-        .into_iter()
-        .collect::<Vec<String>>();
+        .collect::<HashSet<String>>();
 
-    let pubkeys = recipients
+    let mut pubkeys = recipients
         .iter()
         .map(|k| Ok(SignedPublicKey::from_string(k)?.0))
         .collect::<Result<Vec<SignedPublicKey>>>()?;
+    pubkeys.push(pgp::SignedPublicKey::try_from(&key.key)?);
 
     let messages = kvpairs
         .par_iter()
@@ -98,7 +83,7 @@ pub async fn command(args: Args) -> Result<()> {
     });
 
     let client = reqwest::Client::new();
-    let auth_token = get_token(&key.fingerprint, &uuid).await?;
+    let auth_token = key.auth_token()?.bearer();
 
     let url = api_url().join("/variables/update-many")?;
 
@@ -114,7 +99,7 @@ pub async fn command(args: Args) -> Result<()> {
     println!("Updated {} variables", res.len());
     println!("IDs: {:?}", res);
 
-    SDK::add_user_to_project(&key.fingerprint, &user_id, &project_id).await?;
+    SDK::add_user_to_project(&key, &user_id, &project_id).await?;
 
     Ok(())
 }

src/commands/project/add_user.rs

@@ -14,11 +14,13 @@ pub struct Args {
 pub async fn command(args: Args) -> Result<()> {
     let mut config = Config::get()?;
     let key = config.primary_key()?;
+    let password = config.primary_key_password()?;
 
-    let project_id =
-        Choice::try_project(args.project, &key.fingerprint).await?;
+    let key = key.unlock(&password);
 
-    SDK::delete_project(&project_id, &key.fingerprint).await?;
+    let project_id = Choice::try_project(args.project, &key).await?;
+
+    SDK::delete_project(&key, &project_id).await?;
     config.delete_project(&project_id)?;
     println!("Project {} deleted", &project_id);
 

src/commands/project/delete.rs

@@ -27,10 +27,10 @@ pub struct Args {
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get()?;
     let key = config.get_key_or_default(args.key)?;
-    let project_id =
-        Choice::try_project(args.project_id, &key.fingerprint).await?;
-    let project_info =
-        SDK::get_project_info(&project_id, &key.fingerprint).await?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
+    let project_id = Choice::try_project(args.project_id, &key).await?;
+    let project_info = SDK::get_project_info(&project_id, &key).await?;
 
     if args.json && args.all {
         println!("{}", serde_json::to_string(&project_info.users)?);

src/commands/project/list_users.rs

@@ -22,6 +22,8 @@ pub struct Args {
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get()?;
     let key = config.primary_key()?;
+    let password = config.primary_key_password()?;
+    let key = key.unlock(&password);
 
     let name = if args.noname {
         "".to_string()
@@ -31,7 +33,7 @@ pub async fn command(args: Args) -> Result<()> {
         })
     };
 
-    let new_project_id = SDK::new_project(&key.fingerprint, &name).await?;
+    let new_project_id = SDK::new_project(&key, &name).await?;
     println!("Created new project with ID: {}", new_project_id);
 
     // early return if nolink flag is set, we are done already