From 8473f3eec83e89f350195b5b819914f407505803 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 8 Nov 2022 10:00:01 +0000
Subject: [PATCH] [Backport staging] Switch to notarytool (#443)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 scripts/electron_afterSign.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/electron_afterSign.js b/scripts/electron_afterSign.js
index 4a3238b12b..691996fec8 100644
--- a/scripts/electron_afterSign.js
+++ b/scripts/electron_afterSign.js
@@ -7,16 +7,14 @@ exports.default = async function(context) {
 
     if (electronPlatformName === 'darwin') {
         const appName = context.packager.appInfo.productFilename;
-        // We get the password from keychain. The keychain stores
-        // user IDs too, but apparently altool can't get the user ID
-        // from the keychain, so we need to get it from the environment.
-        const userId = process.env.NOTARIZE_APPLE_ID;
-        if (userId === undefined) {
+
+        const keychainProfile = process.env.NOTARIZE_KEYCHAIN_PROFILE;
+        if (keychainProfile === undefined) {
             if (!warned) {
-                console.log("*************************************");
-                console.log("*   NOTARIZE_APPLE_ID is not set.   *");
-                console.log("* This build will NOT be notarised. *");
-                console.log("*************************************");
+                console.log("*****************************************");
+                console.log("* NOTARIZE_KEYCHAIN_PROFILE is not set. *");
+                console.log("*   This build will NOT be notarised.   *");
+                console.log("*****************************************");
                 warned = true;
             }
             return;
@@ -24,10 +22,11 @@ exports.default = async function(context) {
 
         console.log("Notarising macOS app. This may be some time.");
         return await notarize({
+            tool: "notarytool",
             appBundleId: appId,
             appPath: `${appOutDir}/${appName}.app`,
-            appleId: userId,
-            appleIdPassword: '@keychain:NOTARIZE_CREDS',
+            keychainProfile,
+            keychain: process.env.NOTARIZE_KEYCHAIN,
         });
     }
 };