fix pgp exports

pimalaya · Aug 4, 2023 · 183c027 · 183c027
1 parent 1ecceca
commit 183c027
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/config/prelude.rs b/src/config/prelude.rs
@@ -6,7 +6,8 @@ use pimalaya_email::backend::{ImapAuthConfig, ImapConfig};
 use pimalaya_email::sender::{SmtpAuthConfig, SmtpConfig};
 use pimalaya_email::{
     account::{
-        OAuth2Config, OAuth2Method, OAuth2Scopes, PasswdConfig, PgpConfig, PgpKey, PgpNativeConfig,
+        OAuth2Config, OAuth2Method, OAuth2Scopes, PasswdConfig, PgpConfig, PgpNativeConfig,
+        PgpNativeSecretKey, SignedSecretKey,
     },
     backend::{BackendConfig, MaildirConfig},
     email::{EmailHooks, EmailTextPlainFormat},
@@ -402,23 +403,23 @@ pub enum PgpConfigDef {
 #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(remote = "PgpNativeConfig", rename_all = "kebab-case")]
 pub struct PgpNativeConfigDef {
-    #[serde(default, with = "PgpKeyDef")]
-    secret_key: PgpKey,
+    #[serde(default, with = "PgpNativeSecretKeyDef")]
+    secret_key: PgpNativeSecretKey,
     #[serde(default, with = "SecretDef")]
-    secret_key_passwd: Secret,
-    #[serde(default, with = "PgpKeyDef")]
-    public_key: PgpKey,
+    secret_key_passphrase: Secret,
     #[serde(default = "PgpNativeConfig::default_wkd")]
     wkd: bool,
     #[serde(default = "PgpNativeConfig::default_key_servers")]
     key_servers: Vec<String>,
 }
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(remote = "PgpKey", rename_all = "kebab-case")]
-pub enum PgpKeyDef {
+#[serde(remote = "PgpNativeSecretKey", rename_all = "kebab-case")]
+pub enum PgpNativeSecretKeyDef {
     #[default]
     None,
+    #[serde(skip)]
+    Raw(SignedSecretKey),
     Path(PathBuf),
     #[serde(with = "EntryDef")]
     Keyring(Entry),

diff --git a/src/domain/tpl/handlers.rs b/src/domain/tpl/handlers.rs
@@ -86,8 +86,7 @@ pub async fn save<P: Printer>(
             .collect::<Vec<String>>()
             .join("\n")
     })
-    .with_pgp_encrypt(config.pgp.clone())
-    .with_pgp_sign(config.pgp.clone())
+    .with_pgp(config.pgp.clone())
     .compile()
     .await?
     .write_to_vec()?;
@@ -116,8 +115,7 @@ pub async fn send<P: Printer>(
             .collect::<Vec<String>>()
             .join("\n")
     })
-    .with_pgp_encrypt(config.pgp.clone())
-    .with_pgp_sign(config.pgp.clone())
+    .with_pgp(config.pgp.clone())
     .compile()
     .await?
     .write_to_vec()?;

diff --git a/src/ui/editor.rs b/src/ui/editor.rs
@@ -76,8 +76,7 @@ pub async fn edit_tpl_with_editor<P: Printer>(
             Ok(PostEditChoice::Send) => {
                 printer.print_log("Sending email…")?;
                 let email = tpl
-                    .with_pgp_encrypt(config.pgp.clone())
-                    .with_pgp_sign(config.pgp.clone())
+                    .with_pgp(config.pgp.clone())
                     .compile()
                     .await?
                     .write_to_vec()?;
@@ -103,8 +102,7 @@ pub async fn edit_tpl_with_editor<P: Printer>(
             }
             Ok(PostEditChoice::RemoteDraft) => {
                 let email = tpl
-                    .with_pgp_encrypt(config.pgp.clone())
-                    .with_pgp_sign(config.pgp.clone())
+                    .with_pgp(config.pgp.clone())
                     .compile()
                     .await?
                     .write_to_vec()?;