Fully notarize universal dmg instead of stapling

ts/scripts/after-all-artifact-build.ts

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import type { BuildResult } from 'electron-builder';
-import { afterAllArtifactBuild as stapleNotarization } from './staple-notarization';
+import { afterAllArtifactBuild as notarizeUniversalDMG } from './notarize-universal-dmg';
 
 export async function afterAllArtifactBuild(
   result: BuildResult
 ): Promise<Array<string>> {
-  await stapleNotarization(result);
+  await notarizeUniversalDMG(result);
   return [];
 }

ts/scripts/notarize-universal-dmg.ts

@@ -3,7 +3,7 @@
 
 import type { BuildResult } from 'electron-builder';
 
-import { stapleApp } from 'electron-notarize';
+import { notarize } from 'electron-notarize';
 
 import * as packageJson from '../../package.json';
 
@@ -50,14 +50,19 @@ export async function afterAllArtifactBuild({
   }
 
   const artifactsToStaple = artifactPaths.filter(artifactPath =>
-    /\.(zip|dmg)$/.test(artifactPath)
+    /^.*mac-universal.*\.dmg$/.test(artifactPath)
   );
-
+  if (artifactsToStaple.length !== 1) {
-  for (const artifactPath of artifactsToStaple) {
+    console.log(`notarize: Skipping, too many dmgs ${artifactsToStaple}`);
-    console.log(`Stapling notariation for: ${artifactPath}`);
+    return;
-    // eslint-disable-next-line no-await-in-loop
-    await stapleApp({
-      appPath: artifactPath,
-    });
   }
+
+  const [dmgPath] = artifactsToStaple;
+  console.log(`Notarizing dmg: ${dmgPath}`);
+  await notarize({
+    appBundleId,
+    appPath: dmgPath,
+    appleId,
+    appleIdPassword,
+  });
 }