fix: Fix macOS Notarization

Author: marc2332

.github/workflows/build-and-release-desktop.yml

@@ -143,8 +143,8 @@ jobs:
               env:
                   CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
                   CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-                  FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-                  FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
               if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop-test.v1.yml

@@ -128,8 +128,8 @@ jobs:
         env:
           CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-          FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-          FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
         if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop-test.v2.yml

@@ -97,8 +97,8 @@ jobs:
         env:
           CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-          FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-          FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
         if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop.yml

@@ -112,8 +112,8 @@ jobs:
               env:
                   CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
                   CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-                  FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-                  FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
               if: matrix.os == 'macos-11'
 

packages/desktop/scripts/notarize.macos.js

@@ -1,30 +1,9 @@
-const path = require('path')
-
-/**
- *
- * @param {string} appName
- * @returns void
- */
-module.exports = async (appName) => {
+module.exports = async () => {
     if (process.platform !== 'darwin' || process.env.MACOS_SKIP_NOTARIZATION) {
         return undefined
     }
 
-    const APPLE_ID = process.env.FIREFLY_APPLE_ID
-    const APPLE_ID_PASSWORD = process.env.FIREFLY_APPLE_ID_PASSWORD
-
-    if (!APPLE_ID) {
-        throw Error('Notarization failed: Environment variable "FIREFLY_APPLE_ID" is not defined')
-    }
-
-    if (!APPLE_ID_PASSWORD) {
-        throw Error('Notarization failed: Environment variable "FIREFLY_APPLE_ID_PASSWORD" is not defined')
-    }
-
     return {
-        appPath: path.resolve(__dirname, `../out/mac/${appName}.app`),
-        appleId: APPLE_ID,
-        appleIdPassword: APPLE_ID_PASSWORD,
         teamId: 'UG77RJKZHH',
     }
 }