From 70f115c8f5929defb77b800393a8e7404d9a296a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ch=C4=99ci=C5=84ski?=
 <mchecinski@bitwarden.com>
Date: Thu, 17 Aug 2023 10:33:07 +0200
Subject: [PATCH] [DEVOPS-1438] Migrate our mac os desktop notary tool (#5741)

* Change altool to notarytool for desktop app notarizing

* Comment for testing

* Add team id

* Try to notarize with old method

* TEst vaslues

* Change after-sign notarization option

* CHange notarization in package

* Fix

* fix

* Maybe fix

* Use altool to upload

* Re enable if after testing
---
 apps/desktop/electron-builder.json | 1 +
 apps/desktop/scripts/after-sign.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index e92a80c497..8e6d300218 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -97,6 +97,7 @@
   },
   "dmg": {
     "icon": "dmg.icns",
+    "sign": false,
     "contents": [
       {
         "x": 150,
diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
index 4ef3023946..0b181f90f6 100644
--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
@@ -53,8 +53,9 @@ async function run(context) {
     const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
     const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
     return await notarize({
-      appBundleId: "com.bitwarden.desktop",
+      tool: "notarytool",
       appPath: appPath,
+      teamId: "LTZ2PFU5D6",
       appleId: appleId,
       appleIdPassword: appleIdPassword,
     });