From 76a3cb5a466b6937afcdc3d3476cfd59ced6baf4 Mon Sep 17 00:00:00 2001
From: Addison Beck <github@addisonbeck.com>
Date: Wed, 26 Jun 2024 16:01:05 -0400
Subject: [PATCH] Update CLI storefronts to use bitwarden licensed artifacts
 (#9827)

* Update the build job to use `bit` artifacts for stores

* Update the CLI's license in `package.json` for the NPM store

* Add license configuration to `snapcraft.yaml`
---
 .github/workflows/build-cli.yml     | 10 +++++-----
 apps/cli/package.json               |  2 +-
 apps/cli/stores/snap/snapcraft.yaml |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index 5e333b3b58..1c2693f2de 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -240,7 +240,7 @@ jobs:
 
       - name: Package Chocolatey
         shell: pwsh
-        if: ${{ matrix.license_type.prefix }} == 'oss'
+        if: ${{ matrix.license_type.prefix }} == 'bit'
         run: |
           Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse
           Copy-Item dist/${{ matrix.license_type.prefix }}/windows/bw.exe -Destination dist/chocolatey/tools
@@ -282,7 +282,7 @@ jobs:
           if-no-files-found: error
 
       - name: Upload Chocolatey asset
-        if: matrix.license_type.prefix == 'oss'
+        if: matrix.license_type.prefix == 'bit'
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
@@ -290,7 +290,7 @@ jobs:
           if-no-files-found: error
 
       - name: Upload NPM Build Directory asset
-        if: matrix.license_type.prefix == 'oss'
+        if: matrix.license_type.prefix == 'bit'
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
@@ -320,13 +320,13 @@ jobs:
       - name: Get bw linux cli
         uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
         with:
-          name: bw-oss-linux-${{ env._PACKAGE_VERSION }}.zip
+          name: bw-bit-linux-${{ env._PACKAGE_VERSION }}.zip
           path: apps/cli/dist/snap
 
       - name: Rename snap artifact
         run: |
           cd dist/snap
-          mv bw-oss-linux-${{ env._PACKAGE_VERSION }}.zip bw-linux-${{ env._PACKAGE_VERSION }}.zip
+          mv bw-bit-linux-${{ env._PACKAGE_VERSION }}.zip bw-linux-${{ env._PACKAGE_VERSION }}.zip
 
       - name: Setup Snap Package
         run: |
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 97b4dcf2ec..2fb60b7624 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -15,7 +15,7 @@
     "type": "git",
     "url": "https://github.com/bitwarden/clients"
   },
-  "license": "GPL-3.0-only",
+  "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "clean": "rimraf dist",
     "build:oss": "webpack",
diff --git a/apps/cli/stores/snap/snapcraft.yaml b/apps/cli/stores/snap/snapcraft.yaml
index 865adcfe4b..c79d8fc399 100644
--- a/apps/cli/stores/snap/snapcraft.yaml
+++ b/apps/cli/stores/snap/snapcraft.yaml
@@ -1,6 +1,7 @@
 name: bw
 version: __version__
 summary: Bitwarden CLI - A secure and free password manager for all of your devices.
+license: Proprietary
 description: |
   Bitwarden, Inc. is the parent company of 8bit Solutions LLC.