Bump patch version to denote no major features released (#145 )

(cherry picked from commit bb1cdebaf4)
Version bump to 2.10.0 (#143 )
2025-12-15 15:53:41 +00:00 · 2021-08-18 16:40:50 -04:00 · 2021-08-17 15:09:49 -04:00
7 changed files with 265 additions and 128 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,3 @@
---
 name: Build

 on:
@@ -11,8 +10,7 @@ on:

 jobs:
  cloc:
-    name: CLOC
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -26,8 +24,7 @@ jobs:


  setup:
-    name: Setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    outputs:
      package_version: ${{ steps.get_version.outputs.package_version }}
    steps:
@@ -39,17 +36,14 @@ jobs:
        shell: pwsh
        run: |
          $env:pkgVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).version
-          echo "::set-output name=package_version::$env:pkgVersion"
+          echo "::set-output name=PACKAGE_VERSION::$env:pkgVersion" 


  cli:
-    name: CLI
-    runs-on: windows-2019
+    runs-on: windows-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
-      _WIN_PKG_FETCH_VERSION: 14.17.0
-      _WIN_PKG_VERSION: 3.1
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -70,15 +64,24 @@ jobs:
          npm install -g node-gyp
          node-gyp install $(node -v)

-      - name: Get pkg-fetch
+      - name: Setting WIN_PKG
+        run: |
+          echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "version: $env:pkgVersion"
+        env:
+          WIN_PKG: C:\Users\runneradmin\.pkg-cache\v3.0\fetched-v14.16.1-win-x64
+
+      - name: get pkg-fetch
        shell: pwsh
        run: |
          cd $HOME
-          $fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v$env:_WIN_PKG_VERSION/node-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
+          $fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v3.0/node-v14.16.1-win-x64"

          New-Item -ItemType directory -Path ./.pkg-cache
-          New-Item -ItemType directory -Path ./.pkg-cache/v$env:_WIN_PKG_VERSION
-          Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v$env:_WIN_PKG_VERSION/fetched-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
+          New-Item -ItemType directory -Path ./.pkg-cache/v3.0
+          Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v3.0/fetched-v14.16.1-win-x64"
+        env:
+          WIN_PKG: C:\Users\runneradmin\.pkg-cache\v3.0\fetched-v14.16.1-win-x64

      - name: Keytar
        shell: pwsh
@@ -113,9 +116,6 @@ jobs:
        shell: cmd
        run: |
          set PATH=%PATH%;C:\Program Files (x86)\Resource Hacker
-          set WIN_PKG=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\fetched-v%_WIN_PKG_FETCH_VERSION%-win-x64
-          set WIN_PKG_BUILT=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\built-v%_WIN_PKG_FETCH_VERSION%-win-x64
-
          ResourceHacker -open %WIN_PKG% -save %WIN_PKG% -action delete -mask ICONGROUP,1,
          ResourceHacker -open version-info.rc -save version-info.res -action compile
          ResourceHacker -open %WIN_PKG% -save %WIN_PKG% -action addoverwrite -resource version-info.res
@@ -129,73 +129,83 @@ jobs:
      - name: Zip
        shell: cmd
        run: |
-          7z a ./dist-cli/bwdc-windows-%_PACKAGE_VERSION%.zip ./dist-cli/windows/bwdc.exe ./keytar/windows/keytar.node
-          7z a ./dist-cli/bwdc-macos-%_PACKAGE_VERSION%.zip ./dist-cli/macos/bwdc ./keytar/macos/keytar.node
-          7z a ./dist-cli/bwdc-linux-%_PACKAGE_VERSION%.zip ./dist-cli/linux/bwdc ./keytar/linux/keytar.node
+          7z a ./dist-cli/bwdc-windows-%PACKAGE_VERSION%.zip ./dist-cli/windows/bwdc.exe ./keytar/windows/keytar.node
+          7z a ./dist-cli/bwdc-macos-%PACKAGE_VERSION%.zip ./dist-cli/macos/bwdc ./keytar/macos/keytar.node
+          7z a ./dist-cli/bwdc-linux-%PACKAGE_VERSION%.zip ./dist-cli/linux/bwdc ./keytar/linux/keytar.node

      - name: Version Test
        run: |
-          Expand-Archive -Path "./dist-cli/bwdc-windows-${env:_PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
+          Expand-Archive -Path "./dist-cli/bwdc-windows-${env:PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
          $testVersion = Invoke-Expression '& ./test/windows/bwdc.exe -v'
-          echo "version: $env:_PACKAGE_VERSION"
+          echo "version: $env:PACKAGE_VERSION"
          echo "testVersion: $testVersion"
-          if($testVersion -ne $env:_PACKAGE_VERSION) {
+          if($testVersion -ne $env:PACKAGE_VERSION) {
            Throw "Version test failed."
          }

      - name: Create checksums
        run: |
-          checksum -f="./dist-cli/bwdc-windows-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File ./dist-cli/bwdc-windows-sha256-${env:_PACKAGE_VERSION}.txt
-          checksum -f="./dist-cli/bwdc-macos-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File ./dist-cli/bwdc-macos-sha256-${env:_PACKAGE_VERSION}.txt
-          checksum -f="./dist-cli/bwdc-linux-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File ./dist-cli/bwdc-linux-sha256-${env:_PACKAGE_VERSION}.txt
+          checksum -f="./dist-cli/bwdc-windows-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-windows-sha256-${env:PACKAGE_VERSION}.txt
+          checksum -f="./dist-cli/bwdc-macos-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-macos-sha256-${env:PACKAGE_VERSION}.txt
+          checksum -f="./dist-cli/bwdc-linux-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-linux-sha256-${env:PACKAGE_VERSION}.txt

      - name: Upload windows zip to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-windows-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist-cli/bwdc-windows-${{ env._PACKAGE_VERSION }}.zip
+          name: bwdc-windows-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist-cli/bwdc-windows-${{ env.PACKAGE_VERSION }}.zip

      - name: Upload mac zip to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-macos-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist-cli/bwdc-macos-${{ env._PACKAGE_VERSION }}.zip
+          name: bwdc-macos-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist-cli/bwdc-macos-${{ env.PACKAGE_VERSION }}.zip

      - name: Upload linux zip to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-linux-${{ env._PACKAGE_VERSION }}.zip
-          path: ./dist-cli/bwdc-linux-${{ env._PACKAGE_VERSION }}.zip
+          name: bwdc-linux-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist-cli/bwdc-linux-${{ env.PACKAGE_VERSION }}.zip

      - name: Upload windows checksum to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist-cli/bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
+          name: bwdc-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-windows-sha256-${{ env.PACKAGE_VERSION }}.txt

      - name: Upload mac checksum to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist-cli/bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
+          name: bwdc-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-macos-sha256-${{ env.PACKAGE_VERSION }}.txt

      - name: Upload linux checksum to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: ./dist-cli/bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
+          name: bwdc-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist-cli/bwdc-linux-sha256-${{ env.PACKAGE_VERSION }}.txt


  windows_gui:
-    name: Windows GUI
-    runs-on: windows-2019
+    runs-on: windows-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
+      - name: Set up dotnet
+        uses: actions/setup-dotnet@a71d1eb2c86af85faa8c772c03fb365e377e45ea
+        with:
+          dotnet-version: "3.1.x"
+
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
        with:
@@ -218,7 +228,24 @@ jobs:
          dotnet --version

      - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@f135c42c8596cb535c5bcb7523c0b2eef89709ac
+        shell: pwsh
+        run: |
+          cd $HOME
+
+          git clone https://github.com/vcsjones/AzureSignTool.git
+          cd AzureSignTool
+          $latest_head = $(git rev-parse HEAD)[0..9] -join ""
+          $latest_version = "0.0.0-g$latest_head"
+
+          Write-Host "--------"
+          Write-Host "git commit - $(git rev-parse HEAD)"
+          Write-Host "latest_head - $latest_head"
+          Write-Host "PACKAGE VERSION TO BUILD - $latest_version"
+          Write-Host "--------"
+
+          dotnet restore
+          dotnet pack --output ./nupkg
+          dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool

      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -243,24 +270,25 @@ jobs:
        run: dir ./dist

      - name: Publish Portable Exe to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: Bitwarden-Connector-Portable-${{ env._PACKAGE_VERSION }}.exe
-          path: ./dist/Bitwarden-Connector-Portable-${{ env._PACKAGE_VERSION }}.exe
+          name: Bitwarden-Connector-Portable-${{ env.PACKAGE_VERSION }}.exe
+          path: ./dist/Bitwarden-Connector-Portable-${{ env.PACKAGE_VERSION }}.exe

      - name: Publish Installer Exe to GitHub
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: Bitwarden-Connector-Installer-${{ env._PACKAGE_VERSION }}.exe
-          path: ./dist/Bitwarden-Connector-Installer-${{ env._PACKAGE_VERSION }}.exe
+          name: Bitwarden-Connector-Installer-${{ env.PACKAGE_VERSION }}.exe
+          path: ./dist/Bitwarden-Connector-Installer-${{ env.PACKAGE_VERSION }}.exe


  linux:
-    name: Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -279,34 +307,34 @@ jobs:
      - name: Set up environment
        run: |
          sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev
+          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev 
          sudo apt-get -y install rpm

      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

-      - name: NPM install
+      - name: npm install
        run: npm install

-      - name: NPM rebuild
+      - name: npm rebuild
        run: npm run rebuild

-      - name: NPM package
+      - name: npm package
        run: npm run dist:lin

      - name: Publish AppImage
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: Bitwarden-Connector-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
-          path: ./dist/Bitwarden-Connector-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
+          name: Bitwarden-Connector-${{ env.PACKAGE_VERSION }}-x86_64.AppImage
+          path: ./dist/Bitwarden-Connector-${{ env.PACKAGE_VERSION }}-x86_64.AppImage


  macos:
-    name: MacOS
-    runs-on: macos-11
+    runs-on: macos-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -375,12 +403,12 @@ jobs:
        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: Bitwarden-Connector-${{ env._PACKAGE_VERSION }}-mac.zip
-          path: ./dist/Bitwarden-Connector-${{ env._PACKAGE_VERSION }}-mac.zip
+          name: Bitwarden-Connector-${{ env.PACKAGE_VERSION }}-mac.zip
+          path: ./dist/Bitwarden-Connector-${{ env.PACKAGE_VERSION }}-mac.zip

      - name: Upload .dmg artifact
        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
        with:
-          name: Bitwarden-Connector-${{ env._PACKAGE_VERSION }}.dmg
-          path: ./dist/Bitwarden-Connector-${{ env._PACKAGE_VERSION }}.dmg
+          name: Bitwarden-Connector-${{ env.PACKAGE_VERSION }}.dmg
+          path: ./dist/Bitwarden-Connector-${{ env.PACKAGE_VERSION }}.dmg
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,3 @@
---
 name: Release

 on:
@@ -11,8 +10,7 @@ on:

 jobs:
  setup:
-    name: Setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    outputs:
      package_version: ${{ steps.create_tags.outputs.package_version }}
      tag_version: ${{ steps.create_tags.outputs.tag_version }}
@@ -64,92 +62,191 @@ jobs:
          draft: true
          prerelease: false

+
  cli:
-    name: CLI
-    runs-on: windows-2019
+    runs-on: windows-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

-      - name: Download latest RC build artifacts
-        uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74  # v2.14.0
-        with:
-          workflow: build.yml
-          workflow_conclusion: success
-          branch: rc
-          path: ./dist-cli
+      - name: Setup Windows builder
+        run: |
+          choco install checksum --no-progress
+          choco install reshack --no-progress

-      - name: Upload Windows zip release asset
+      - name: Set up Node
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        with:
+          node-version: '14.x'
+
+      - name: Update NPM
+        run: |
+          npm install -g npm@7
+          npm install -g node-gyp
+          node-gyp install $(node -v)
+
+      - name: Set VER_INFO
+        run: |
+          echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        env:
+          WIN_PKG: C:\Users\runneradmin\.pkg-cache\v3.0\fetched-v14.16.1-win-x64
+
+      - name: get pkg-fetch
+        shell: pwsh
+        run: |
+          cd $HOME
+          $fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v3.0/node-v14.16.1-win-x64"
+
+          New-Item -ItemType directory -Path ./.pkg-cache
+          New-Item -ItemType directory -Path ./.pkg-cache/v3.0
+          Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v3.0/fetched-v14.16.1-win-x64"
+        env:
+          WIN_PKG: C:\Users\runneradmin\.pkg-cache\v3.0\fetched-v14.16.1-win-x64
+
+      - name: Keytar
+        shell: pwsh
+        run: |
+          $keytarVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).dependencies.keytar
+          $nodeModVersion = node -e "console.log(process.config.variables.node_module_version)"
+          $keytarTar = "keytar-v${keytarVersion}-node-v${nodeModVersion}-{0}-x64.tar"
+          $keytarTarGz = "${keytarTar}.gz"
+          $keytarUrl = "https://github.com/atom/node-keytar/releases/download/v${keytarVersion}/${keytarTarGz}"
+
+          New-Item -ItemType directory -Path ./keytar/macos | Out-Null
+          New-Item -ItemType directory -Path ./keytar/linux | Out-Null
+          New-Item -ItemType directory -Path ./keytar/windows | Out-Null
+
+          Invoke-RestMethod -Uri $($keytarUrl -f "darwin") -OutFile "./keytar/macos/$($keytarTarGz -f "darwin")"
+          Invoke-RestMethod -Uri $($keytarUrl -f "linux") -OutFile "./keytar/linux/$($keytarTarGz -f "linux")"
+          Invoke-RestMethod -Uri $($keytarUrl -f "win32") -OutFile "./keytar/windows/$($keytarTarGz -f "win32")"
+
+          7z e "./keytar/macos/$($keytarTarGz -f "darwin")" -o"./keytar/macos"
+          7z e "./keytar/linux/$($keytarTarGz -f "linux")" -o"./keytar/linux"
+          7z e "./keytar/windows/$($keytarTarGz -f "win32")" -o"./keytar/windows"
+
+          7z e "./keytar/macos/$($keytarTar -f "darwin")" -o"./keytar/macos"
+          7z e "./keytar/linux/$($keytarTar -f "linux")" -o"./keytar/linux"
+          7z e "./keytar/windows/$($keytarTar -f "win32")" -o"./keytar/windows"
+
+      - name: Setup Version Info
+        shell: pwsh
+        run: ./scripts/make-versioninfo.ps1
+
+      - name: Resource Hacker
+        shell: cmd
+        run: |
+          set PATH=%PATH%;C:\Program Files (x86)\Resource Hacker
+          ResourceHacker -open %WIN_PKG% -save %WIN_PKG% -action delete -mask ICONGROUP,1,
+          ResourceHacker -open version-info.rc -save version-info.res -action compile
+          ResourceHacker -open %WIN_PKG% -save %WIN_PKG% -action addoverwrite -resource version-info.res
+
+      - name: Install
+        run: npm install
+
+      - name: Package CLI
+        run: npm run dist:cli
+
+      - name: Zip
+        shell: cmd
+        run: |
+          7z a ./dist-cli/bwdc-windows-%PACKAGE_VERSION%.zip ./dist-cli/windows/bwdc.exe ./keytar/windows/keytar.node
+          7z a ./dist-cli/bwdc-macos-%PACKAGE_VERSION%.zip ./dist-cli/macos/bwdc ./keytar/macos/keytar.node
+          7z a ./dist-cli/bwdc-linux-%PACKAGE_VERSION%.zip ./dist-cli/linux/bwdc ./keytar/linux/keytar.node
+
+      - name: Version Test
+        run: |
+          Expand-Archive -Path "./dist-cli/bwdc-windows-${env:PACKAGE_VERSION}.zip" -DestinationPath "./test/windows"
+          $testVersion = Invoke-Expression '& ./test/windows/bwdc.exe -v'
+          echo "version: $env:PACKAGE_VERSION"
+          echo "testVersion: $testVersion"
+          if($testVersion -ne $env:PACKAGE_VERSION) {
+            Throw "Version test failed."
+          }
+
+      - name: Create checksums
+        run: |
+          checksum -f="./dist-cli/bwdc-windows-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-windows-sha256-${env:PACKAGE_VERSION}.txt
+          checksum -f="./dist-cli/bwdc-macos-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-macos-sha256-${env:PACKAGE_VERSION}.txt
+          checksum -f="./dist-cli/bwdc-linux-${env:PACKAGE_VERSION}.zip" `
+            -t sha256 | Out-File ./dist-cli/bwdc-linux-sha256-${env:PACKAGE_VERSION}.txt
+
+      - name: upload windows zip release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-windows-${{ env._PACKAGE_VERSION }}.zip/bwdc-windows-${{ env._PACKAGE_VERSION }}.zip
-          asset_name: bwdc-windows-${{ env._PACKAGE_VERSION }}.zip
+          asset_path: ./dist-cli/bwdc-windows-${{ env.PACKAGE_VERSION }}.zip
+          asset_name: bwdc-windows-${{ env.PACKAGE_VERSION }}.zip
          asset_content_type: application/zip

-      - name: Upload MacOS zip release asset
+      - name: upload macos zip release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-macos-${{ env._PACKAGE_VERSION }}.zip/bwdc-macos-${{ env._PACKAGE_VERSION }}.zip
-          asset_name: bwdc-macos-${{ env._PACKAGE_VERSION }}.zip
+          asset_path: ./dist-cli/bwdc-macos-${{ env.PACKAGE_VERSION }}.zip
+          asset_name: bwdc-macos-${{ env.PACKAGE_VERSION }}.zip
          asset_content_type: application/zip

-      - name: Upload Linux zip release asset
+      - name: upload linux zip release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-linux-${{ env._PACKAGE_VERSION }}.zip/bwdc-linux-${{ env._PACKAGE_VERSION }}.zip
-          asset_name: bwdc-linux-${{ env._PACKAGE_VERSION }}.zip
+          asset_path: ./dist-cli/bwdc-linux-${{ env.PACKAGE_VERSION }}.zip
+          asset_name: bwdc-linux-${{ env.PACKAGE_VERSION }}.zip
          asset_content_type: application/zip

-      - name: Upload Windows checksum release asset
+      - name: upload windows checksum release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt/bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
-          asset_name: bwdc-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
+          asset_path: ./dist-cli/bwdc-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
+          asset_name: bwdc-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
          asset_content_type: text/plain

-      - name: Upload MacOS checksum release asset
+      - name: upload macos checksum release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt/bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
-          asset_name: bwdc-macos-sha256-${{ env._PACKAGE_VERSION }}.txt
+          asset_path: ./dist-cli/bwdc-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
+          asset_name: bwdc-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
          asset_content_type: text/plain

-      - name: Upload Linux checksum release asset
+      - name: upload linux checksum release asset
        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.setup.outputs.release_upload_url }}
-          asset_path: ./dist-cli/bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt/bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
-          asset_name: bwdc-linux-sha256-${{ env._PACKAGE_VERSION }}.txt
+          asset_path: ./dist-cli/bwdc-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
+          asset_name: bwdc-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
          asset_content_type: text/plain


  windows-gui:
-    name: Windows GUI
-    runs-on: windows-2019
+    runs-on: windows-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
+      - name: Set up dotnet
+        uses: actions/setup-dotnet@a71d1eb2c86af85faa8c772c03fb365e377e45ea
+        with:
+          dotnet-version: "3.1.x"
+
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
        with:
@@ -172,7 +269,22 @@ jobs:
          dotnet --version

      - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@f135c42c8596cb535c5bcb7523c0b2eef89709ac
+        shell: pwsh
+        run: |
+          cd $HOME
+          git clone https://github.com/vcsjones/AzureSignTool.git
+          cd AzureSignTool
+          $latest_head = $(git rev-parse HEAD)[0..9] -join ""
+          $latest_version = "0.0.0-g$latest_head"
+          Write-Host "--------"
+          Write-Host "git commit - $(git rev-parse HEAD)"
+          Write-Host "latest_head - $latest_head"
+          Write-Host "PACKAGE VERSION TO BUILD - $latest_version"
+          Write-Host "--------"
+          dotnet restore
+          dotnet pack --output ./nupkg
+          dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool
+          cd $HOME

      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -183,7 +295,7 @@ jobs:
      - name: Run linter
        run: npm run lint

-      - name: NPM rebuild
+      - name: npm rebuild
        run: npm run rebuild

      - name: Build & Sign
@@ -200,11 +312,10 @@ jobs:


  linux:
-    name: Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -223,37 +334,36 @@ jobs:
      - name: Set up environment
        run: |
          sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev
+          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev 
          sudo apt-get -y install rpm

      - name: Checkout repo
        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

-      - name: Set Package version
+      - name: Set PACKAGE_VERSION
        shell: pwsh
        run: |
          $env:pkgVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).version
-          echo "_PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
          echo "version: $env:pkgVersion"

-      - name: NPM install
+      - name: npm install
        run: npm install

-      - name: NPM rebuild
+      - name: npm rebuild
        run: npm run rebuild

-      - name: NPM package
+      - name: npm package
        run: npm run publish:lin
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


  macos:
-    name: MacOS
-    runs-on: macos-11
+    runs-on: macos-latest
    needs: setup
    env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
    steps:
      - name: Set up Node
        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
--- a/scripts/make-versioninfo.ps1
+++ b/scripts/make-versioninfo.ps1
@@ -1,4 +1,4 @@
-$major, $minor, $patch = $env:_PACKAGE_VERSION.split('.')
+$major,$minor,$patch = $env:PACKAGE_VERSION.split('.')

 $versionInfo = @"

@@ -15,8 +15,8 @@ BLOCK "StringFileInfo"
 		VALUE "CompanyName", "Bitwarden Inc."
 		VALUE "ProductName", "Bitwarden"
 		VALUE "FileDescription", "Bitwarden Directory Connector CLI"
-		VALUE "FileVersion", "$env:_PACKAGE_VERSION"
-		VALUE "ProductVersion", "$env:_PACKAGE_VERSION"
+		VALUE "FileVersion", "$env:PACKAGE_VERSION"
+		VALUE "ProductVersion", "$env:PACKAGE_VERSION"
 		VALUE "OriginalFilename", "bwdc.exe"
 		VALUE "InternalName", "bwdc"
 		VALUE "LegalCopyright", "Copyright Bitwarden Inc."
--- a/src-cli/package.json
+++ b/src-cli/package.json
@@ -2,7 +2,7 @@
  "name": "bitwarden-directory-connector",
  "productName": "Bitwarden Directory Connector",
  "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2.9.5",
+  "version": "2.9.4",
  "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
  "homepage": "https://bitwarden.com",
  "license": "GPL-3.0",
--- a/src/bwdc.ts
+++ b/src/bwdc.ts
@@ -93,7 +93,7 @@ export class Main {
        this.messagingService = new NoopMessagingService();
        this.environmentService = new EnvironmentService(this.storageService);
        this.apiService = new NodeApiService(this.tokenService, this.platformUtilsService, this.environmentService,
-            () => refreshToken(this.apiKeyService, this.authService), async (expired: boolean) => await this.logout());
+            this.refreshTokenCallback, async (expired: boolean) => await this.logout());
        this.apiKeyService = new ApiKeyService(this.tokenService, this.storageService);
        this.userService = new UserService(this.tokenService, this.storageService);
        this.containerService = new ContainerService(this.cryptoService);
@@ -118,6 +118,10 @@ export class Main {
        await this.apiKeyService.clear();
    }

+    refreshTokenCallback() {
+        return refreshToken(this.apiKeyService, this.authService);
+    }
+
    private async init() {
        await this.storageService.init();
        this.containerService.attachToWindow(global);
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
  "name": "bitwarden-directory-connector",
  "productName": "Bitwarden Directory Connector",
  "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2.9.6",
+  "version": "2.9.4",
  "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
  "homepage": "https://bitwarden.com",
  "license": "GPL-3.0",
--- a/src/services/azure-directory.service.ts
+++ b/src/services/azure-directory.service.ts
@@ -386,7 +386,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
            authProvider: done => {
                if (this.dirConfig.applicationId == null || this.dirConfig.key == null ||
                    this.dirConfig.tenant == null) {
-                    done(new Error(this.i18nService.t('dirConfigIncomplete')), null);
+                    done(this.i18nService.t('dirConfigIncomplete'), null);
                    return;
                }

@@ -421,14 +421,9 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
                            this.setAccessTokenExpiration(d.access_token, d.expires_in);
                            done(null, d.access_token);
                        } else if (d.error != null && d.error_description != null) {
-                            const shortError = d.error_description?.split('\n', 1)[0];
-                            const err = new Error(d.error + ' (' + res.statusCode + '): ' + shortError);
-                            // tslint: disable-next-line
-                            console.error(d.error_description);
-                            done(err, null);
+                            done(d.error + ' (' + res.statusCode + '): ' + d.error_description, null);
                        } else {
-                            const err = new Error('Unknown error (' + res.statusCode + ').')
-                            done(err, null);
+                            done('Unknown error (' + res.statusCode + ').', null);
                        }
                    });
                }).on('error', err => {
Author	SHA1	Message	Date
Matt Gibson	8072c523cc	Bump patch version to denote no major features released (#145 ) (cherry picked from commit `bb1cdebaf4`)	2021-08-18 16:40:50 -04:00
Matt Gibson	f96429a47b	Version bump to 2.10.0 (#143 ) (cherry picked from commit `01405f47c9`)	2021-08-17 15:09:49 -04:00