Merge remote-tracking branch 'origin/master' into feature/trusted-device-encryption

.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

.github/workflows/build-browser.yml

@@ -145,8 +145,8 @@ jobs:
       - name: Build
         run: npm run dist
 
-      - name: Build Manifest v3
+      # - name: Build Manifest v3
-        run: npm run dist:mv3
+      #   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
+      # - name: Upload Opera MV3 artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
+      #   with:
-          name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip
+      #     name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-opera-mv3.zip
+      #     path: apps/browser/dist/dist-opera-mv3.zip
-          if-no-files-found: error
+      #     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
+      # - name: Upload Chrome MV3 artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
+      #   with:
-          name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
+      #     name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-chrome-mv3.zip
+      #     path: apps/browser/dist/dist-chrome-mv3.zip
-          if-no-files-found: error
+      #     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
+      # - name: Upload Edge MV3 artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
+      #   with:
-          name: dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip
+      #     name: dist-edge-MV3-${{ env._BUILD_NUMBER }}.zip
-          path: apps/browser/dist/dist-edge-mv3.zip
+      #     path: apps/browser/dist/dist-edge-mv3.zip
-          if-no-files-found: error
+      #     if-no-files-found: error
 
       - name: Upload browser source
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2

.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

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",

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.",

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.",

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);

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) {

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",