From f836afa699b2da8a55432ce9de1cbccbffb705fb Mon Sep 17 00:00:00 2001
From: Lucas Nogueira
 <118899497+lucasfernog-crabnebula@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:14:15 -0300
Subject: [PATCH] feat(packager): enhance Apple notarization error message
 (#267)

* feat(packager): enhance Apple notarization error message

Ref https://github.com/tauri-apps/tauri/pull/7974/

* fix change file
---
 .changes/enhance-notarize-error.md    |  5 +++++
 crates/packager/src/codesign/macos.rs | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 .changes/enhance-notarize-error.md

diff --git a/.changes/enhance-notarize-error.md b/.changes/enhance-notarize-error.md
new file mode 100644
index 00000000..6b6bdb45
--- /dev/null
+++ b/.changes/enhance-notarize-error.md
@@ -0,0 +1,5 @@
+---
+"cargo-packager": patch
+---
+
+Include notarytool log output on error message in case notarization fails.
diff --git a/crates/packager/src/codesign/macos.rs b/crates/packager/src/codesign/macos.rs
index 105ae835..65054f1d 100644
--- a/crates/packager/src/codesign/macos.rs
+++ b/crates/packager/src/codesign/macos.rs
@@ -340,6 +340,16 @@ pub fn notarize(
             tracing::info!("Notarizing {}", log_message);
             staple_app(app_bundle_path)?;
             Ok(())
+        } else if let Ok(output) = Command::new("xcrun")
+            .args(["notarytool", "log"])
+            .arg(&submit_output.id)
+            .notarytool_args(&auth)
+            .output_ok()
+        {
+            Err(Error::NotarizeRejected(format!(
+                "{log_message}\nLog:\n{}",
+                String::from_utf8_lossy(&output.stdout),
+            )))
         } else {
             Err(Error::NotarizeRejected(log_message))
         }