Enable updated Mac notarization

Author: pimterry

.github/workflows/ci.yml

@@ -30,13 +30,23 @@ jobs:
 
       - run: npm ci
 
+      # The API key in APPLE_API_KEY is a PEM cert that must be read from disk:
+      - run: echo "$APPLE_API_KEY" > ./apple-api-key.p8
+        if: matrix.os == 'macos-11'
+        env:
+          APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
+
       - run: npm run build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          # For Mac notarization:
+          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
+          APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+          APPLE_API_KEY: ./apple-api-key.p8
+          # For Mac signing:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          # For Windows signing:
           WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
           WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
 

package-lock.json

@@ -61,8 +61,8 @@
       "icon": "src/icons/icon.icns",
       "entitlements": "src/entitlements.plist",
       "entitlementsInherit": "src/entitlements.plist",
-      "forceCodeSigning": false,
-      "notarize": false
+      "forceCodeSigning": true,
+      "notarize": true
     },
     "dmg": {
       "artifactName": "HttpToolkit-${version}.dmg"
@@ -119,7 +119,6 @@
     "appImage": {
       "artifactName": "HttpToolkit-${version}.AppImage"
     },
-    "afterSign": "./src/hooks/after-sign.js",
     "publish": null
   },
   "dependencies": {
@@ -148,7 +147,6 @@
     "cross-env": "^7.0.3",
     "electron": "^22.3.26",
     "electron-builder": "^24.13.3",
-    "electron-notarize": "^1.0.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "targz": "^1.0.1",