Modify client cert path

Author: balugeorge

.github/workflows/release-build.yml

@@ -38,8 +38,8 @@ jobs:
     env:
       INSO_PACKAGE_NAME: insomnia-inso
       INSO_DOCKER_TAR: inso-docker-image.tar
-      DIGICERT_SM_CLIENT_CERT_FILE: sm_client_cert.p12
-      DIGICERT_WIN_SM_CLIENT_CERT_FILE: /d/a/insomnia-ee/insomnia-ee/sm_client_cert.p12
+      # DIGICERT_SM_CLIENT_CERT_FILE: sm_client_cert.p12
+      # DIGICERT_WIN_SM_CLIENT_CERT_FILE: /d/a/insomnia-ee/insomnia-ee/sm_client_cert.p12
     strategy:
       fail-fast: false
       matrix:
@@ -111,7 +111,13 @@ jobs:
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          echo "${{ secrets.DIGICERT_SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > ${{ env.DIGICERT_SM_CLIENT_CERT_FILE }}
+          echo "${{ secrets.DIGICERT_SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
+
+      - name: Set variables
+        id: variables
+        run: |
+          echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
+        shell: bash
 
       # This will install smctl
       # smctl will be used in the next step for signing
@@ -123,19 +129,18 @@ jobs:
         env:
           SM_HOST: ${{ vars.DIGICERT_SM_HOST }}
           SM_API_KEY: ${{ secrets.DIGICERT_SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: ${{ env.DIGICERT_SM_CLIENT_CERT_FILE }}
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.DIGICERT_SM_CLIENT_CERT_PASSWORD }}
 
       # creates unpacked electron-builder contents that can be signed afterwards
       - name: Package unpacked app (Windows only)
         if: runner.os == 'Windows'
         shell: bash
         run: |
+          smctl credentials save ${SM_API_KEY} ${SM_CLIENT_CERT_PASSWORD}
           NODE_OPTIONS='--max_old_space_size=6144' npm run package:windows:unpacked -w insomnia
         env:
           SM_HOST: ${{ vars.DIGICERT_SM_HOST }}
           SM_API_KEY: ${{ secrets.DIGICERT_SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: ${{ env.DIGICERT_WIN_SM_CLIENT_CERT_FILE }}
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.DIGICERT_SM_CLIENT_CERT_PASSWORD }}
           SM_KEYPAIR_ALIAS: ${{ secrets.DIGICERT_KEYPAIR_ALIAS }}
 
@@ -167,7 +172,6 @@ jobs:
         env:
           SM_HOST: ${{ vars.DIGICERT_SM_HOST }}
           SM_API_KEY: ${{ secrets.DIGICERT_SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: ${{ env.DIGICERT_SM_CLIENT_CERT_FILE }}
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.DIGICERT_SM_CLIENT_CERT_PASSWORD }}
 
       - name: Move .dll and .exe files back to win-unpacked and delete /tosign
@@ -187,7 +191,6 @@ jobs:
         env:
           SM_HOST: ${{ vars.DIGICERT_SM_HOST }}
           SM_API_KEY: ${{ secrets.DIGICERT_SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: ${{ env.DIGICERT_WIN_SM_CLIENT_CERT_FILE }}
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.DIGICERT_SM_CLIENT_CERT_PASSWORD }}
           SM_KEYPAIR_ALIAS: ${{ secrets.DIGICERT_KEYPAIR_ALIAS }}
 
@@ -247,7 +250,6 @@ jobs:
         env:
           SM_HOST: ${{ vars.DIGICERT_SM_HOST }}
           SM_API_KEY: ${{ secrets.DIGICERT_SM_API_KEY }}
-          SM_CLIENT_CERT_FILE: ${{ env.DIGICERT_SM_CLIENT_CERT_FILE }}
           SM_CLIENT_CERT_PASSWORD: ${{ secrets.DIGICERT_SM_CLIENT_CERT_PASSWORD }}
 
       - name: Remove DigiCert client certificate after signing

packages/insomnia/customSign.js

@@ -25,8 +25,7 @@ exports.default = async function (configuration) {
   console.log('[customSign] File to sign before final packaging:', rawPath);
   const absolutePath = path.resolve(rawPath); // C:\Users\...\Update.exe
   const fixedAbsolutePath = absolutePath.replace(/\\/g, '/'); // C:/Users/.../Update.exe
-  const smctlSignCommand = `smctl credentials save ${SM_API_KEY} ${SM_CLIENT_CERT_PASSWORD} && \
-      smctl healthcheck`;
+  const smctlSignCommand = `smctl sign --simple --keypair-alias ${SM_KEYPAIR_ALIAS} --input ${fixedAbsolutePath}`;
 
   try {
     console.log('[customSign] Starting to run smctl sign cmd...');