From 22cb3d57a4f71f17d256624af236723efa2196a6 Mon Sep 17 00:00:00 2001 From: Todd Martin <106564991+trmartin4@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:34:17 -0400 Subject: [PATCH 1/6] Adding missing await. (#5801) --- apps/web/src/app/core/init.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts index 4a2ef2f495..4d4afed3fb 100644 --- a/apps/web/src/app/core/init.service.ts +++ b/apps/web/src/app/core/init.service.ts @@ -45,7 +45,7 @@ export class InitService { const urls = process.env.URLS as Urls; urls.base ??= this.win.location.origin; - this.environmentService.setUrls(urls); + await this.environmentService.setUrls(urls); this.environmentService.initialized = true; setTimeout(() => this.notificationsService.init(), 3000); From 028e2b8a61441d8f3409f3c5116f7a0835cb403f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 12:40:14 +0000 Subject: [PATCH 2/6] Bumped browser version to 2023.7.1 (#5815) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> --- apps/browser/package.json | 2 +- apps/browser/src/manifest.json | 2 +- apps/browser/src/manifest.v3.json | 2 +- package-lock.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/browser/package.json b/apps/browser/package.json index 16ef13a448..5e1ad9bfd8 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2023.7.0", + "version": "2023.7.1", "scripts": { "build": "webpack", "build:mv3": "cross-env MANIFEST_VERSION=3 webpack", diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index be865f163c..a23032ae6a 100644 --- a/apps/browser/src/manifest.json +++ b/apps/browser/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "__MSG_appName__", - "version": "2023.7.0", + "version": "2023.7.1", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index 4059822f62..9a742e64e4 100644 --- a/apps/browser/src/manifest.v3.json +++ b/apps/browser/src/manifest.v3.json @@ -3,7 +3,7 @@ "minimum_chrome_version": "102.0", "name": "__MSG_extName__", "short_name": "__MSG_appName__", - "version": "2023.7.0", + "version": "2023.7.1", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/package-lock.json b/package-lock.json index e2454a5458..c7ce45ded5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -189,7 +189,7 @@ }, "apps/browser": { "name": "@bitwarden/browser", - "version": "2023.7.0" + "version": "2023.7.1" }, "apps/cli": { "name": "@bitwarden/cli", From afb6c86c2e9e55f45fcd748fc0d2024899f92c59 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Thu, 13 Jul 2023 16:08:16 +0200 Subject: [PATCH 3/6] Update web-path for team-auth-dev (#5817) With https://github.com/bitwarden/clients/pull/5336 all files got moved to apps/web/src/app/auth, but CODEOWNERS still pointed to apps/web/src/auth --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3d5ce5a21c..832a874607 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,7 +13,7 @@ bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/team-secrets-manage apps/browser/src/auth @bitwarden/team-auth-dev apps/cli/src/auth @bitwarden/team-auth-dev apps/desktop/src/auth @bitwarden/team-auth-dev -apps/web/src/auth @bitwarden/team-auth-dev +apps/web/src/app/auth @bitwarden/team-auth-dev # web connectors used for auth apps/web/src/connectors @bitwarden/team-auth-dev bitwarden_license/bit-web/src/app/auth @bitwarden/team-auth-dev From 312ee54434c3d766b3a03e306ed48e34e533feb0 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:08:36 -0400 Subject: [PATCH 4/6] Add default push location for Chocolatey (#5805) --- .github/workflows/release-cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 1bd1cb6a5c..6186f0d6df 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -243,7 +243,7 @@ jobs: shell: pwsh run: | cd dist - choco push + choco push --source=https://push.chocolatey.org/ npm: name: Publish NPM From aa6bb723f2d12b48df9109356e1b2f8e771ccc2d Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Thu, 13 Jul 2023 11:02:50 -0400 Subject: [PATCH 5/6] Disable mv3 artifacts (#5816) --- .github/workflows/build-browser.yml | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index 7c4a7f203a..8e4fc6d4f7 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -145,8 +145,8 @@ jobs: - name: Build run: npm run dist - - name: Build Manifest v3 - run: npm run dist:mv3 + # - name: Build Manifest v3 + # run: npm run dist:mv3 - name: Gulp run: gulp ci @@ -179,12 +179,12 @@ jobs: path: apps/browser/dist/dist-opera.zip if-no-files-found: error - - name: Upload Opera MV3 artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 - with: - name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip - path: apps/browser/dist/dist-opera-mv3.zip - if-no-files-found: error + # - name: Upload Opera MV3 artifact + # uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + # with: + # name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip + # path: apps/browser/dist/dist-opera-mv3.zip + # if-no-files-found: error - name: Upload Chrome artifact uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 @@ -193,12 +193,12 @@ jobs: path: apps/browser/dist/dist-chrome.zip if-no-files-found: error - - name: Upload Chrome MV3 artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 - with: - name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip - path: apps/browser/dist/dist-chrome-mv3.zip - if-no-files-found: error + # - name: Upload Chrome MV3 artifact + # uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + # with: + # name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip + # path: apps/browser/dist/dist-chrome-mv3.zip + # if-no-files-found: error - name: Upload Firefox artifact uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 @@ -214,12 +214,12 @@ jobs: path: apps/browser/dist/dist-edge.zip if-no-files-found: error - - name: Upload Edge MV3 artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 - with: - name: dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip - path: apps/browser/dist/dist-edge-mv3.zip - if-no-files-found: error + # - name: Upload Edge MV3 artifact + # uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + # with: + # name: dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip + # path: apps/browser/dist/dist-edge-mv3.zip + # if-no-files-found: error - name: Upload browser source uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 From baab72eaf218a7a3e7801eabe0d13c761d986bd6 Mon Sep 17 00:00:00 2001 From: Todd Martin <106564991+trmartin4@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:23:04 -0400 Subject: [PATCH 6/6] Found another missing await. (#5819) --- libs/common/src/platform/services/environment.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/platform/services/environment.service.ts b/libs/common/src/platform/services/environment.service.ts index 7b48c9d6eb..e77f259c12 100644 --- a/libs/common/src/platform/services/environment.service.ts +++ b/libs/common/src/platform/services/environment.service.ts @@ -293,7 +293,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction { } } else { // If we are setting the region to EU or US, clear the self-hosted URLs - this.stateService.setEnvironmentUrls(new EnvironmentUrls()); + await this.stateService.setEnvironmentUrls(new EnvironmentUrls()); if (region === Region.EU) { this.setUrlsInternal(this.euUrls); } else if (region === Region.US) {