From 3f77e75c187b8426dfbdb78954e943c1710622b3 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 22:21:24 +0000
Subject: [PATCH 01/12] trying out the github.ref

---
 .github/workflows/deploy.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 00000000..0bb21be4
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,17 @@
+name: Deploy
+
+on: 
+  release:
+    types:
+      - prereleased
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: testing
+        run: echo ${{ github.ref }}
+

From b73f01d529bf3b0c88999e28b989c88c9c17a3e6 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 22:24:22 +0000
Subject: [PATCH 02/12] trying GITHUB_REF

---
 .github/workflows/deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0bb21be4..37ca7985 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,5 +13,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: testing
-        run: echo ${{ github.ref }}
+        run: |
+          echo ${{ github.ref }}
+          echo ${{ github.event.GITHUB_REF }}
 

From 1e577eb43ccafbf4d04ce65c75e978c7846ed642 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 22:42:04 +0000
Subject: [PATCH 03/12] tesing the PKG_VERSION

---
 .github/workflows/deploy.yml | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 37ca7985..75bddc60 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,14 +6,48 @@ on:
       - prereleased
 
 jobs:
-  test:
+  setup:
     runs-on: ubuntu-latest
+    outputs:
+      package_version: ${{ steps.get_pkg_version.outputs.package_version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
+      - name: Get package version
+        id: get_pkg_version
+        run: |
+          TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
+          PKG_VERSION=${TAG_VERSION:1}
+
+          echo "PKG_VERSION=$PKG_VERSION"
+
+
+  linux:
+    runs-on: ubuntu-latest
+    if: false
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Install Snap
+        uses: samuelmeuli/action-snapcraft@v1
+        #with:
+        #  snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+
+        #- name: Get snap release asset
+        #  uses: dsaltares/fetch-gh-release-asset@master
+        #  with:
+        #    version: ${{ github.ref }}
+        #    file: 
+
       - name: testing
         run: |
           echo ${{ github.ref }}
           echo ${{ github.event.GITHUB_REF }}
 
+        #- name: Deploy to Snap Store
+        #  run: |
+        #    snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
+        #    snapcraft logout
+

From d6c3716d4b299edda3b8f3809733a111c617245f Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 22:49:46 +0000
Subject: [PATCH 04/12] testing PKG_VERSION

---
 .github/workflows/deploy.yml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 75bddc60..c94689c3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,34 +20,35 @@ jobs:
           TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
           PKG_VERSION=${TAG_VERSION:1}
 
-          echo "PKG_VERSION=$PKG_VERSION"
+          echo "::set-output name=package_version::$PKG_VERSION"
 
 
   linux:
     runs-on: ubuntu-latest
-    if: false
+    needs: setup
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Install Snap
-        uses: samuelmeuli/action-snapcraft@v1
-        #with:
-        #  snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+      #- name: Install Snap
+      #  uses: samuelmeuli/action-snapcraft@v1
+      #  with:
+      #    snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
-        #- name: Get snap release asset
-        #  uses: dsaltares/fetch-gh-release-asset@master
-        #  with:
-        #    version: ${{ github.ref }}
-        #    file: 
+      #- name: Get snap release asset
+      #  uses: dsaltares/fetch-gh-release-asset@master
+      #  with:
+      #    version: ${{ github.ref }}
+      #    file: 
 
       - name: testing
         run: |
-          echo ${{ github.ref }}
-          echo ${{ github.event.GITHUB_REF }}
+          echo "PKG_VERSION=$PKG_VERSION"
+        env:
+          PKG_VERSION: ${{ needs.setup.package_version }}
 
-        #- name: Deploy to Snap Store
-        #  run: |
-        #    snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
-        #    snapcraft logout
+      #- name: Deploy to Snap Store
+      #  run: |
+      #    snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
+      #    snapcraft logout
 

From 9df2b42cdf7e835c2733f699a61217389bfac0f9 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 23:00:22 +0000
Subject: [PATCH 05/12] retesting PKG_VERSION

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c94689c3..b116b00d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           echo "PKG_VERSION=$PKG_VERSION"
         env:
-          PKG_VERSION: ${{ needs.setup.package_version }}
+          PKG_VERSION: ${{ needs.setup.outputs.package_version }}
 
       #- name: Deploy to Snap Store
       #  run: |

From eb36b25c8b02c50b63abf0e4e4cb96632b399592 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 23:15:00 +0000
Subject: [PATCH 06/12] disabling jobs and changed packages to point to my repo

---
 .github/workflows/deploy.yml  | 18 +++++++++---------
 .github/workflows/release.yml | 10 +++-------
 package.json                  |  2 +-
 src/package.json              |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b116b00d..67afe2a1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,18 +35,18 @@ jobs:
       #  with:
       #    snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
-      #- name: Get snap release asset
-      #  uses: dsaltares/fetch-gh-release-asset@master
-      #  with:
-      #    version: ${{ github.ref }}
-      #    file: 
-
-      - name: testing
-        run: |
-          echo "PKG_VERSION=$PKG_VERSION"
+      - name: Get snap release asset
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          version: ${{ github.ref }}
+          file: bitwarden_${{ env.PKG_VERSION }}_amd64.snap
+          token: ${{ secrets.GITHUB_TOKEN }}
         env:
           PKG_VERSION: ${{ needs.setup.outputs.package_version }}
 
+      - name: testing
+        run: ls -atlh
+
       #- name: Deploy to Snap Store
       #  run: |
       #    snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d3535d21..b20775b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,8 +70,6 @@ jobs:
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@v1
-        with:
-          snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
       - name: Print environment
         run: |
@@ -98,14 +96,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Deploy to Snap Store
-        run: |
-          snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
-          snapcraft logout
-
 
   windows-signed:
     runs-on: windows-latest
+    if: false
     needs: setup
     steps:
       - name: Set up dotnet
@@ -206,6 +200,7 @@ jobs:
 
   windows-store:
     runs-on: windows-latest
+    if: false
     needs: setup
     steps:
       - name: Set up Node
@@ -266,6 +261,7 @@ jobs:
 
   macos:
     runs-on: macos-latest
+    if: false
     needs: setup
     steps:
       - name: Set up Node
diff --git a/package.json b/package.json
index 0b6d0330..367839a0 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "homepage": "https://bitwarden.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bitwarden/desktop"
+    "url": "https://github.com/joseph-flinn/desktop"
   },
   "license": "GPL-3.0",
   "scripts": {
diff --git a/src/package.json b/src/package.json
index af22216a..8e0243a8 100644
--- a/src/package.json
+++ b/src/package.json
@@ -9,7 +9,7 @@
   "main": "main.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bitwarden/desktop"
+    "url": "https://github.com/joseph-flinn/desktop"
   },
   "dependencies": {
     "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",

From 3c738c9b4e947e6bd0b236f4397ba3caa8630031 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 23:35:25 +0000
Subject: [PATCH 07/12] adding TAG_VERSION

---
 .github/workflows/deploy.yml | 5 ++++-
 src/package.json             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 67afe2a1..1441ad79 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       package_version: ${{ steps.get_pkg_version.outputs.package_version }}
+      tag_version: ${{ steps.get_pkg_version.outputs.package_version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -21,6 +22,7 @@ jobs:
           PKG_VERSION=${TAG_VERSION:1}
 
           echo "::set-output name=package_version::$PKG_VERSION"
+          echo "::set-output name=tag_version::$TAG_VERSION"
 
 
   linux:
@@ -38,11 +40,12 @@ jobs:
       - name: Get snap release asset
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          version: ${{ github.ref }}
+          version: ${{ env.TAG_VERSION }}
           file: bitwarden_${{ env.PKG_VERSION }}_amd64.snap
           token: ${{ secrets.GITHUB_TOKEN }}
         env:
           PKG_VERSION: ${{ needs.setup.outputs.package_version }}
+          TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
 
       - name: testing
         run: ls -atlh
diff --git a/src/package.json b/src/package.json
index 8e0243a8..be9f5e18 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.24.6",
+  "version": "1.24.7",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",

From e9dabbc5c06442958d7ff728fbdb587d4c30ae0e Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 23:53:21 +0000
Subject: [PATCH 08/12] fixing tag_version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1441ad79..bead4482 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       package_version: ${{ steps.get_pkg_version.outputs.package_version }}
-      tag_version: ${{ steps.get_pkg_version.outputs.package_version }}
+      tag_version: ${{ steps.get_pkg_version.outputs.tag_version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2

From f37461d742afb6f8468f7da18f0216e541871e76 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 26 Jan 2021 23:54:09 +0000
Subject: [PATCH 09/12] changing tag format

---
 .github/workflows/deploy.yml | 2 +-
 src/package.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bead4482..3f3146fc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Get snap release asset
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          version: ${{ env.TAG_VERSION }}
+          version: tags/${{ env.TAG_VERSION }}
           file: bitwarden_${{ env.PKG_VERSION }}_amd64.snap
           token: ${{ secrets.GITHUB_TOKEN }}
         env:
diff --git a/src/package.json b/src/package.json
index be9f5e18..13b1eeb2 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.24.7",
+  "version": "1.24.8",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",

From e545ecd165716b2758f33240252ef702fd6d8d92 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Fri, 29 Jan 2021 19:09:59 +0000
Subject: [PATCH 10/12] starting the deploy breakout

---
 .github/workflows/deploy.yml  | 137 ++++++++++++++++++++++++++++------
 .github/workflows/release.yml |  13 +---
 2 files changed, 117 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3f3146fc..5b4d4c10 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,57 +1,146 @@
 name: Deploy
 
 on: 
+  workflow_dispatch:
+    inputs:
+      release_tag_name_input:
+        description: "Release Tag Name <X.X.X>"
+        required: true
   release:
     types:
-      - prereleased
+      - published
+
 
 jobs:
   setup:
     runs-on: ubuntu-latest
     outputs:
-      package_version: ${{ steps.get_pkg_version.outputs.package_version }}
-      tag_version: ${{ steps.get_pkg_version.outputs.tag_version }}
+      package_version: ${{ steps.create_tags.outputs.package_version }}
+      tag_version: ${{ steps.create_tags.outputs.tag_version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Get package version
-        id: get_pkg_version
+      - name: Create Deploy version vars
+        id: create_tags
         run: |
-          TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
-          PKG_VERSION=${TAG_VERSION:1}
+          if ! [[ "${{ github.event_name }}" -eq "release" ]]; then
+            case "${RELEASE_TAG_NAME_INPUT:0:1}" in
+              v)
+                echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV
+                echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+                echo "::set-output name=package_version::${RELEASE_TAG_NAME_INPUT:1}"
+                echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT"
+                ;;
+              [0-9])
+                echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+                echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV
+                echo "::set-output name=package_version::$RELEASE_TAG_NAME_INPUT"
+                echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT"
+                ;;
+              *)
+                exit 1
+                ;;
+            esac
+          else
+            TAG_VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3)
+            PKG_VERSION=${TAG_VERSION:1}
 
-          echo "::set-output name=package_version::$PKG_VERSION"
-          echo "::set-output name=tag_version::$TAG_VERSION"
+            echo "::set-output name=package_version::$PKG_VERSION"
+            echo "::set-output name=tag_version::$TAG_VERSION"
+          fi
+        env:
+          RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }}
 
 
-  linux:
+  snap:
+    name: Deploy Snap
     runs-on: ubuntu-latest
     needs: setup
+    env:
+      PKG_VERSION: ${{ needs.setup.outputs.package_version }}
+      TAG_VERSION: ${{ needs.setup.ouputs.tag_version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      #- name: Install Snap
-      #  uses: samuelmeuli/action-snapcraft@v1
+      - name: Install Snap
+        uses: samuelmeuli/action-snapcraft@v1
       #  with:
       #    snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
-      - name: Get snap release asset
-        uses: dsaltares/fetch-gh-release-asset@master
+      - name: setup
+        run: mkdir dist
+
+      - name: get snap package
+        uses: Xotl/cool-github-releases@v1
+        with:
+          mode: download
+          tag_name: ${{ env.TAG_VERSION }}
+          assets: bitwarden_${{ env.PKG_VERSION }}_amd64.snap|./dist/bitwarden_${{ env.PKG_VERSION }}_amd64.snap
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: test
+        run: ls -alht dist
+
+      - name: Deploy to Snap Store
+        if: false
+        run: |
+          snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
+          snapcraft logout
+
+
+  choco:
+    name: Deploy Choco
+    runs-on: windows-latest
+    needs: setup
+    env:
+      PKG_VERSION: ${{ needs.setup.outputs.package_version }}
+      TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Get choco release asset
+        uses: dsaltares/fetch-gh-release-asset@0.0.5
         with:
           version: tags/${{ env.TAG_VERSION }}
-          file: bitwarden_${{ env.PKG_VERSION }}_amd64.snap
-          token: ${{ secrets.GITHUB_TOKEN }}
+          file: bitwarden.${{ env.PKG_VERSION }}.nupkg
         env:
-          PKG_VERSION: ${{ needs.setup.outputs.package_version }}
-          TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: testing
-        run: ls -atlh
+      #- name: Setup Chocolatey
+      #  run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
+      #  env:
+      #    CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
-      #- name: Deploy to Snap Store
-      #  run: |
-      #    snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
-      #    snapcraft logout
+      - name: make dist dir 
+        shell: pwsh
+        run: New-Item -ItemType directory -Path ./dist
 
+      - name: Get nupkg
+        uses: Xotl/cool-github-releases@v1
+        with:
+          mode: download
+          tag_name: ${{ env.TAG_VERSION }}
+          assets: bitwarden.${{ env.PKG_VERSION }}.nupkg|./dist/bitwarden.${{ env.PKG_VERSION }}.nupkg
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push to Chocolatey
+        if: false
+        shell: pwsh
+        run: |
+          cd dist
+          choco push
+
+
+  # Placeholder until the build thing works with the directory-connector
+  macos:
+    runs-on: macos-latest
+    if: false
+    needs: setup
+    steps:
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b20775b0..aaa355ff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,15 +68,10 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
 
-      - name: Install Snap
-        uses: samuelmeuli/action-snapcraft@v1
-
       - name: Print environment
         run: |
           node --version
           npm --version
-          snap --version
-          snapcraft --version || echo 'snapcraft unavailable'
 
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -99,7 +94,6 @@ jobs:
 
   windows-signed:
     runs-on: windows-latest
-    if: false
     needs: setup
     steps:
       - name: Set up dotnet
@@ -174,7 +168,7 @@ jobs:
           SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Deploy to Chocolatey
+      - name: Package Chocolatey
         shell: pwsh
         run: |
           Copy-Item -Path ./stores/chocolatey -Destination ./dist/chocolatey -Recurse
@@ -183,9 +177,11 @@ jobs:
           $checksum = checksum -t sha256 ./dist/chocolatey/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
           $chocoInstall = "./dist/chocolatey/tools/chocolateyinstall.ps1"
           (Get-Content $chocoInstall).replace('__version__', "$env:PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall
+          ls -alht dist/chocolatey
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
           cd ./dist/chocolatey
-          choco push
+          ls -alht dist/chocolatey
+          #choco push
 
       - name: Upload Chocolatey nupkg release asset
         uses: actions/upload-release-asset@v1
@@ -200,7 +196,6 @@ jobs:
 
   windows-store:
     runs-on: windows-latest
-    if: false
     needs: setup
     steps:
       - name: Set up Node

From 2dbeba0c97772315dd13a6c6460143ef17720be1 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Mon, 1 Feb 2021 13:43:57 -0800
Subject: [PATCH 11/12] finishing the mac portion of splitting out the
 deploylments

---
 .github/workflows/deploy.yml  | 37 +++++++++++++++++++++++------------
 .github/workflows/release.yml | 13 +++++++-----
 package.json                  |  2 +-
 src/package.json              |  4 ++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5b4d4c10..bc5c96bb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -66,8 +66,8 @@ jobs:
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@v1
-      #  with:
-      #    snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+        with:
+          snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
       - name: setup
         run: mkdir dist
@@ -84,7 +84,6 @@ jobs:
         run: ls -alht dist
 
       - name: Deploy to Snap Store
-        if: false
         run: |
           snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
           snapcraft logout
@@ -109,10 +108,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      #- name: Setup Chocolatey
-      #  run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
-      #  env:
-      #    CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
+      - name: Setup Chocolatey
+        run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
+        env:
+          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
       - name: make dist dir 
         shell: pwsh
@@ -127,20 +126,32 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push to Chocolatey
-        if: false
         shell: pwsh
         run: |
           cd dist
           choco push
 
 
-  # Placeholder until the build thing works with the directory-connector
   macos:
     runs-on: macos-latest
-    if: false
     needs: setup
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@v1
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: make target directory
+        run: mkdir -p dist/mas
+
+      - name: Get mac release asset
+        uses: Xotl/cool-github-releases@v1
         with:
-          node-version: '10.x'
+          mode: download
+          tag_name: ${{ env.TAG_VERSION }}
+          assets: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg|./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy to App Store
+        run: npm run upload:mas
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aaa355ff..d3198fb7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -181,7 +181,6 @@ jobs:
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
           cd ./dist/chocolatey
           ls -alht dist/chocolatey
-          #choco push
 
       - name: Upload Chocolatey nupkg release asset
         uses: actions/upload-release-asset@v1
@@ -352,8 +351,12 @@ jobs:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
-      - name: Deploy to App Store
-        run: npm run upload:mas
+      - name: Upload Apple Store release asset
+        uses: actions/upload-release-asset@v1
         env:
-          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_content_type: application
diff --git a/package.json b/package.json
index 367839a0..0b6d0330 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "homepage": "https://bitwarden.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/joseph-flinn/desktop"
+    "url": "https://github.com/bitwarden/desktop"
   },
   "license": "GPL-3.0",
   "scripts": {
diff --git a/src/package.json b/src/package.json
index 13b1eeb2..af22216a 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,14 +2,14 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.24.8",
+  "version": "1.24.6",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
   "main": "main.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/joseph-flinn/desktop"
+    "url": "https://github.com/bitwarden/desktop"
   },
   "dependencies": {
     "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",

From 3b4d8dc86752aad448a9cdf41b18f17e78137c7b Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Mon, 1 Feb 2021 13:56:58 -0800
Subject: [PATCH 12/12] re-enabling the macos workflow

---
 .github/workflows/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d3198fb7..1cbe2ce1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -255,7 +255,6 @@ jobs:
 
   macos:
     runs-on: macos-latest
-    if: false
     needs: setup
     steps:
       - name: Set up Node