From da9dca6dd601fdfe3550ff128cbbdaa8def0c67b Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 16 Aug 2022 19:51:45 +0100
Subject: [PATCH 1/9] Don't suppress outline for input[type="file"] controls
 (#3210)

Closes https://github.com/bitwarden/clients/issues/3209
---
 apps/browser/src/popup/scss/box.scss | 2 +-
 apps/desktop/src/scss/box.scss       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/popup/scss/box.scss b/apps/browser/src/popup/scss/box.scss
index 9629ddae6f8..7139f4514dc 100644
--- a/apps/browser/src/popup/scss/box.scss
+++ b/apps/browser/src/popup/scss/box.scss
@@ -441,7 +441,7 @@
       }
     }
 
-    &:focus {
+    &:not([type="file"]):focus {
       outline: none;
     }
   }
diff --git a/apps/desktop/src/scss/box.scss b/apps/desktop/src/scss/box.scss
index aa11b408a42..b3bd4004e24 100644
--- a/apps/desktop/src/scss/box.scss
+++ b/apps/desktop/src/scss/box.scss
@@ -343,7 +343,7 @@
       }
     }
 
-    &:focus {
+    &:not([type="file"]):focus {
       outline: none;
     }
   }

From b1a47b85b59f05f0f5298d55372fe86fdd56950f Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 16 Aug 2022 20:05:31 +0100
Subject: [PATCH 2/9] [PS-1303] Desktop/browser: tweak `.box-header-expandable`
 styles (#3308)

* Add extra margin for desktop settings expanded header buttons

* Only change box-header-expandable background on `:focus-visible` not `:focus`

Avoids having the background colour "stick" when clicking with the mouse until you click somewhere else
---
 apps/browser/src/popup/scss/box.scss | 2 +-
 apps/desktop/src/scss/box.scss       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/popup/scss/box.scss b/apps/browser/src/popup/scss/box.scss
index 7139f4514dc..6e0b6f9356a 100644
--- a/apps/browser/src/popup/scss/box.scss
+++ b/apps/browser/src/popup/scss/box.scss
@@ -33,7 +33,7 @@
     }
 
     &:hover,
-    &:focus,
+    &:focus-visible,
     &.active {
       @include themify($themes) {
         background-color: themed("boxBackgroundHoverColor");
diff --git a/apps/desktop/src/scss/box.scss b/apps/desktop/src/scss/box.scss
index b3bd4004e24..64cbf370abf 100644
--- a/apps/desktop/src/scss/box.scss
+++ b/apps/desktop/src/scss/box.scss
@@ -48,7 +48,7 @@
     }
 
     &:hover,
-    &:focus,
+    &:focus-visible,
     &.active {
       @include themify($themes) {
         background-color: themed("boxBackgroundHoverColor");
@@ -77,6 +77,10 @@
 
     &.box-content-padded {
       padding: 10px 15px;
+
+      .box-header-expandable[aria-expanded="true"] {
+        margin-bottom: 1rem;
+      }
     }
 
     &.condensed .box-content-row,

From 1137f83535aeed429a1785b789b39ede588c2403 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 12:47:42 -0700
Subject: [PATCH 3/9] Bumped desktop version to 2022.8.2 (#3319)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c0b306d8373..a283b68e519 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2022.8.1",
+  "version": "2022.8.2",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index a491ab12ecd..cc99cdb53e2 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2022.8.1",
+  "version": "2022.8.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2022.8.1",
+      "version": "2022.8.2",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-native": "file:../desktop_native"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 045762aa2d1..aa912f42231 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2022.8.1",
+  "version": "2022.8.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 67195454887..60dfc237cb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -221,7 +221,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2022.8.1",
+      "version": "2022.8.2",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From e7da2f0c22bfb3c10a4b439eef103b9ffd307686 Mon Sep 17 00:00:00 2001
From: Tomi Belan <tomi.belan@gmail.com>
Date: Tue, 16 Aug 2022 23:27:05 +0200
Subject: [PATCH 4/9] Allow bw sync without unlocking (#2916)

---
 apps/cli/src/program.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts
index 80eddf0c5e6..c4cdd2bf50f 100644
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -281,7 +281,7 @@ export class Program extends BaseProgram {
         writeLn("", true);
       })
       .action(async (cmd) => {
-        await this.exitIfLocked();
+        await this.exitIfNotAuthed();
         const command = new SyncCommand(this.main.syncService);
         const response = await command.run(cmd);
         this.processResponse(response);

From babfa30c68bca243fc9bac4e33c8af8005dbad2d Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Wed, 17 Aug 2022 09:42:26 +0100
Subject: [PATCH 5/9] [PS-1222] Remove `appBlurClick` throughout the popup and
 web code (#3208)

* Remove appBlurClick throughout the popup code

`appBlurClick` leads to focus being lost/reset for assistive technology users. It should not be necessary in any case - if focus does need to move after an action, explicitly set it somewhere programmatically using `focus()` rather than relying on browser heuristics

* Remove now redundant blur-click directive
---
 .../src/popup/vault/vault-select.component.html      |  9 +--------
 .../app/components/password-reprompt.component.html  |  2 +-
 libs/angular/src/directives/blur-click.directive.ts  | 12 ------------
 libs/angular/src/jslib.module.ts                     |  3 ---
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 libs/angular/src/directives/blur-click.directive.ts

diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html
index 2101b7c019f..ec4d4ff9e3e 100644
--- a/apps/browser/src/popup/vault/vault-select.component.html
+++ b/apps/browser/src/popup/vault/vault-select.component.html
@@ -26,26 +26,19 @@
     >
       <button
         appStopClick
-        appBlurClick
         (click)="selectAllVaults()"
         [ngClass]="{ active: !myVaultOnly && !selectOrganizationId }"
       >
         <i class="bwi bwi-fw bwi-filter" aria-hidden="true"></i>
         &nbsp;{{ "allVaults" | i18n }}
       </button>
-      <button
-        *ngIf="!enforcePersonalOwnwership"
-        appStopClick
-        appBlurClick
-        (click)="selectMyVault()"
-      >
+      <button *ngIf="!enforcePersonalOwnwership" appStopClick (click)="selectMyVault()">
         <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
         &nbsp;{{ "myVault" | i18n }}
       </button>
       <button
         *ngFor="let organization of organizations"
         appStopClick
-        appBlurClick
         (click)="selectOrganization(organization)"
       >
         <i
diff --git a/apps/web/src/app/components/password-reprompt.component.html b/apps/web/src/app/components/password-reprompt.component.html
index b2c068e9025..c61fcc394db 100644
--- a/apps/web/src/app/components/password-reprompt.component.html
+++ b/apps/web/src/app/components/password-reprompt.component.html
@@ -41,7 +41,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/libs/angular/src/directives/blur-click.directive.ts b/libs/angular/src/directives/blur-click.directive.ts
deleted file mode 100644
index 2fc1d36713d..00000000000
--- a/libs/angular/src/directives/blur-click.directive.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Directive, ElementRef, HostListener } from "@angular/core";
-
-@Directive({
-  selector: "[appBlurClick]",
-})
-export class BlurClickDirective {
-  constructor(private el: ElementRef) {}
-
-  @HostListener("click") onClick() {
-    this.el.nativeElement.blur();
-  }
-}
diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts
index f5a6bbef248..1bd05be4d7f 100644
--- a/libs/angular/src/jslib.module.ts
+++ b/libs/angular/src/jslib.module.ts
@@ -11,7 +11,6 @@ import { A11yInvalidDirective } from "./directives/a11y-invalid.directive";
 import { A11yTitleDirective } from "./directives/a11y-title.directive";
 import { ApiActionDirective } from "./directives/api-action.directive";
 import { AutofocusDirective } from "./directives/autofocus.directive";
-import { BlurClickDirective } from "./directives/blur-click.directive";
 import { BoxRowDirective } from "./directives/box-row.directive";
 import { FallbackSrcDirective } from "./directives/fallback-src.directive";
 import { InputStripSpacesDirective } from "./directives/input-strip-spaces.directive";
@@ -48,7 +47,6 @@ import { PasswordStrengthComponent } from "./shared/components/password-strength
     ApiActionDirective,
     AutofocusDirective,
     AvatarComponent,
-    BlurClickDirective,
     BoxRowDirective,
     CalloutComponent,
     ColorPasswordCountPipe,
@@ -78,7 +76,6 @@ import { PasswordStrengthComponent } from "./shared/components/password-strength
     AutofocusDirective,
     AvatarComponent,
     BitwardenToastModule,
-    BlurClickDirective,
     BoxRowDirective,
     CalloutComponent,
     ColorPasswordCountPipe,

From adb8be746a83355f3015f9fd41ed8981a5d5f2db Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Wed, 17 Aug 2022 12:11:47 +0100
Subject: [PATCH 6/9] Web: fix twoStepLogin modal `title` > `id` (#3323)

Fixes a small typo/oversight in the markup for the `twoStepLogin` modal
---
 apps/web/src/app/settings/two-factor-duo.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/settings/two-factor-duo.component.html b/apps/web/src/app/settings/two-factor-duo.component.html
index 220c6997b70..e3d057ff51d 100644
--- a/apps/web/src/app/settings/two-factor-duo.component.html
+++ b/apps/web/src/app/settings/two-factor-duo.component.html
@@ -2,7 +2,7 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h2 class="modal-title" title="2faDuoTitle">
+        <h2 class="modal-title" id="2faDuoTitle">
           {{ "twoStepLogin" | i18n }}
           <small>Duo</small>
         </h2>

From e59f635d3275531d0bfcae08f13294fce3d843e9 Mon Sep 17 00:00:00 2001
From: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>
Date: Wed, 17 Aug 2022 20:06:33 +0000
Subject: [PATCH 7/9] Update tag logic for web-sh container (#3327)

---
 .github/workflows/build-web.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index 39784468974..ef3853933ce 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -267,16 +267,23 @@ jobs:
       - name: Login to Azure ACR
         run: az acr login -n bitwardenqa
 
-      - name: Tag and Push RC to Azure ACR QA registry
+      - name: Tag and Push to Azure QA ACR
         env:
           REGISTRY: bitwardenqa.azurecr.io
         run: |
-          IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")  # slash safe branch name
+          if [[ $(grep "pull" <<< "${GITHUB_REF}") ]]; then
+            IMAGE_TAG=$(echo "${GITHUB_HEAD_REF}" | sed "s#/#-#g")
+          else
+            IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
+          fi
+
           if [[ "$IMAGE_TAG" == "master" ]]; then
             IMAGE_TAG=dev
           fi
+
           docker tag bitwarden/web \
             $REGISTRY/web-sh:$IMAGE_TAG
+
           docker push $REGISTRY/web-sh:$IMAGE_TAG
 
       - name: Log out of Docker

From 89b69f4bc6ee518ab959e1608aa01d969c9a23c6 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Thu, 18 Aug 2022 10:28:37 +0100
Subject: [PATCH 8/9] [PS-1307] Desktop: Change box-headers from `<div>` to
 semantic headings (#3313)

* Change box-headers from generic `<div>` to semantic headings, tweak heading styles

Essentially, a late port to desktop of aspects from https://github.com/bitwarden/clients/pull/2223 (which I hadn't realised at the time also affected the desktop app)

* Change box headers in modals to `<h1>`s

* Fix/normalise modals

* Harmonise modal dialog headings, use `aria-labelledby`
---
 .../accounts/delete-account.component.html    |  6 ++++--
 .../app/accounts/environment.component.html   | 10 +++++-----
 .../src/app/accounts/premium.component.html   |  4 ++--
 .../src/app/accounts/settings.component.html  |  6 +++---
 .../two-factor-options.component.html         |  4 ++--
 .../password-reprompt.component.html          |  6 ++++--
 .../src/app/send/add-edit.component.html      | 16 ++++++++--------
 .../add-edit-custom-fields.component.html     |  4 ++--
 .../src/app/vault/add-edit.component.html     | 16 ++++++++--------
 .../src/app/vault/attachments.component.html  |  8 ++++----
 .../src/app/vault/collections.component.html  |  4 ++--
 .../src/app/vault/export.component.html       |  4 ++--
 .../app/vault/folder-add-edit.component.html  |  4 ++--
 .../src/app/vault/generator.component.html    | 19 +++++++------------
 .../password-generator-history.component.html |  4 ++--
 .../app/vault/password-history.component.html |  4 ++--
 .../src/app/vault/share.component.html        |  8 ++++----
 .../vault/view-custom-fields.component.html   |  4 ++--
 .../desktop/src/app/vault/view.component.html | 12 ++++++------
 apps/desktop/src/scss/base.scss               |  6 ++----
 20 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/apps/desktop/src/app/accounts/delete-account.component.html b/apps/desktop/src/app/accounts/delete-account.component.html
index 1371cee162f..5e2e245c0cd 100644
--- a/apps/desktop/src/app/accounts/delete-account.component.html
+++ b/apps/desktop/src/app/accounts/delete-account.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{ 'settings' | i18n }}">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="deleteAccountTitle">
   <div class="modal-dialog" role="document">
     <form
       class="modal-content"
@@ -13,7 +13,9 @@
           {{ "deleteAccountWarning" | i18n }}
         </app-callout>
         <div class="box last">
-          <div class="box-header">{{ "deleteAccount" | i18n }}</div>
+          <h1 class="box-header" id="deleteAccountTitle">
+            {{ "deleteAccount" | i18n }}
+          </h1>
           <div class="box-content">
             <app-user-verification
               ngDefaultControl
diff --git a/apps/desktop/src/app/accounts/environment.component.html b/apps/desktop/src/app/accounts/environment.component.html
index eff32641c87..859554b92b1 100644
--- a/apps/desktop/src/app/accounts/environment.component.html
+++ b/apps/desktop/src/app/accounts/environment.component.html
@@ -1,11 +1,11 @@
-<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{ 'settings' | i18n }}">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="selfHosteEnvironmentTitle">
   <div class="modal-dialog" role="document">
     <form class="modal-content" (ngSubmit)="submit()">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header">
+          <h1 class="box-header" id="selfHosteEnvironmentTitle">
             {{ "selfHostedEnvironment" | i18n }}
-          </div>
+          </h1>
           <div class="box-content">
             <div class="box-content-row" appBoxRow>
               <label for="baseUrl">{{ "baseUrl" | i18n }}</label>
@@ -24,13 +24,13 @@
           </div>
         </div>
         <div class="box">
-          <div class="box-header">
+          <h2 class="box-header">
             <button type="button" (click)="toggleCustom()" [attr.aria-expanded]="showCustom">
               <i class="bwi bwi-plus-square" [hidden]="showCustom" aria-hidden="true"></i>
               <i class="bwi bwi-minus-square" [hidden]="!showCustom" aria-hidden="true"></i>
               {{ "customEnvironment" | i18n }}
             </button>
-          </div>
+          </h2>
           <div class="box-content" [hidden]="!showCustom">
             <div class="box-content-row" appBoxRow>
               <label for="webVaultUrl">{{ "webVaultUrl" | i18n }}</label>
diff --git a/apps/desktop/src/app/accounts/premium.component.html b/apps/desktop/src/app/accounts/premium.component.html
index 01c181daa81..f47f377cff2 100644
--- a/apps/desktop/src/app/accounts/premium.component.html
+++ b/apps/desktop/src/app/accounts/premium.component.html
@@ -3,9 +3,9 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="premiumTitle">
+          <h1 class="box-header" id="premiumTitle">
             {{ "premiumMembership" | i18n }}
-          </div>
+          </h1>
           <div class="box-content box-content-padded">
             <div *ngIf="!isPremium">
               <p class="text-center lead">{{ "premiumNotCurrentMember" | i18n }}</p>
diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index f775eb9bb44..33abdc934c6 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -1,11 +1,11 @@
-<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{ 'settings' | i18n }}">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="settingsTitle">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-body form">
         <div class="box">
-          <div class="box-header">
+          <h1 class="box-header" id="settingsTitle">
             {{ "settingsTitle" | i18n: currentUserEmail }}
-          </div>
+          </h1>
           <div class="box-content box-content-padded">
             <h2>
               <button
diff --git a/apps/desktop/src/app/accounts/two-factor-options.component.html b/apps/desktop/src/app/accounts/two-factor-options.component.html
index 778d2636e37..6f87c666215 100644
--- a/apps/desktop/src/app/accounts/two-factor-options.component.html
+++ b/apps/desktop/src/app/accounts/two-factor-options.component.html
@@ -3,9 +3,9 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="twoStepTitle">
+          <h1 class="box-header" id="twoStepTitle">
             {{ "twoStepOptions" | i18n }}
-          </div>
+          </h1>
           <div class="box-content">
             <button
               type="button"
diff --git a/apps/desktop/src/app/components/password-reprompt.component.html b/apps/desktop/src/app/components/password-reprompt.component.html
index 07d9abd8fcc..1ec4ef702c2 100644
--- a/apps/desktop/src/app/components/password-reprompt.component.html
+++ b/apps/desktop/src/app/components/password-reprompt.component.html
@@ -1,9 +1,11 @@
-<div class="modal fade" role="dialog" aria-modal="true">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordConfirmationTitle">
   <div class="modal-dialog modal-dialog-scrollable" role="document">
     <form class="modal-content" #form (ngSubmit)="submit()">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header">{{ "passwordConfirmation" | i18n }}</div>
+          <h1 class="box-header" id="passwordConfirmationTitle">
+            {{ "passwordConfirmation" | i18n }}
+          </h1>
           <div class="box-content">
             <div class="box-content-row box-content-row-flex" appBoxRow>
               <div class="row-main">
diff --git a/apps/desktop/src/app/send/add-edit.component.html b/apps/desktop/src/app/send/add-edit.component.html
index 855cd9ca645..d61cbf99652 100644
--- a/apps/desktop/src/app/send/add-edit.component.html
+++ b/apps/desktop/src/app/send/add-edit.component.html
@@ -10,9 +10,9 @@
         </app-callout>
       </div>
       <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
           {{ title }}
-        </div>
+        </h2>
         <div class="box-content">
           <div class="box-content-row" appBoxRow>
             <label for="name">{{ "name" | i18n }}</label>
@@ -92,7 +92,7 @@
         </div>
       </div>
       <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
           <button
             type="button"
             class="toggle"
@@ -107,7 +107,7 @@
               [ngClass]="{ 'bwi-angle-down': !showOptions, 'bwi-chevron-up': showOptions }"
             ></i>
           </button>
-        </div>
+        </h2>
       </div>
       <div [hidden]="!showOptions">
         <app-send-efflux-dates
@@ -179,9 +179,9 @@
           </div>
         </div>
         <div class="box">
-          <div class="box-header">
+          <h2 class="box-header">
             {{ "notes" | i18n }}
-          </div>
+          </h2>
           <div class="box-content">
             <div class="box-content-row" appBoxRow>
               <textarea
@@ -227,9 +227,9 @@
         </div>
       </div>
       <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
           {{ "share" | i18n }}
-        </div>
+        </h2>
         <div class="box-content">
           <div class="box-content-row" appBoxRow *ngIf="editMode">
             <label for="link">{{ "sendLinkLabel" | i18n }}</label>
diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
index cf4635c34c9..17416fa728c 100644
--- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
@@ -1,7 +1,7 @@
 <div class="box">
-  <div class="box-header">
+  <h2 class="box-header">
     {{ "customFields" | i18n }}
-  </div>
+  </h2>
   <div class="box-content">
     <div cdkDropList (cdkDropListDropped)="drop($event)" *ngIf="cipher.hasFields">
       <div
diff --git a/apps/desktop/src/app/vault/add-edit.component.html b/apps/desktop/src/app/vault/add-edit.component.html
index 05c9e130e08..14222de0aa8 100644
--- a/apps/desktop/src/app/vault/add-edit.component.html
+++ b/apps/desktop/src/app/vault/add-edit.component.html
@@ -5,9 +5,9 @@
         <app-callout type="info" *ngIf="allowOwnershipOptions() && !allowPersonal">
           {{ "personalOwnershipPolicyInEffect" | i18n }}
         </app-callout>
-        <div class="box-header">
+        <h2 class="box-header">
           {{ title }}
-        </div>
+        </h2>
         <div class="box-content">
           <div class="box-content-row" *ngIf="!editMode" appBoxRow>
             <label for="type">{{ "type" | i18n }}</label>
@@ -504,9 +504,9 @@
         </div>
       </div>
       <div class="box">
-        <div class="box-header">
+        <h2 class="box-header">
           <label for="notes">{{ "notes" | i18n }}</label>
-        </div>
+        </h2>
         <div class="box-content">
           <div class="box-content-row" appBoxRow>
             <textarea id="notes" name="Notes" rows="6" [(ngModel)]="cipher.notes"></textarea>
@@ -520,9 +520,9 @@
       >
       </app-vault-add-edit-custom-fields>
       <div class="box" *ngIf="allowOwnershipOptions()">
-        <div class="box-header">
+        <h2 class="box-header">
           {{ "ownership" | i18n }}
-        </div>
+        </h2>
         <div class="box-content">
           <div class="box-content-row" appBoxRow>
             <label for="organizationId">{{ "whoOwnsThisItem" | i18n }}</label>
@@ -539,9 +539,9 @@
         </div>
       </div>
       <div class="box" *ngIf="(!editMode || cloneMode) && cipher.organizationId">
-        <div class="box-header">
+        <h2 class="box-header">
           {{ "collections" | i18n }}
-        </div>
+        </h2>
         <div class="box-content" *ngIf="!collections || !collections.length">
           {{ "noCollectionsInList" | i18n }}
         </div>
diff --git a/apps/desktop/src/app/vault/attachments.component.html b/apps/desktop/src/app/vault/attachments.component.html
index 5981b2b62b9..8a7cb93ce56 100644
--- a/apps/desktop/src/app/vault/attachments.component.html
+++ b/apps/desktop/src/app/vault/attachments.component.html
@@ -3,9 +3,9 @@
     <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
       <div class="modal-body">
         <div class="box" *ngIf="cipher && cipher.hasAttachments">
-          <div class="box-header" id="attachmentsTitle">
+          <h1 class="box-header" id="attachmentsTitle">
             {{ "attachments" | i18n }}
-          </div>
+          </h1>
           <div class="box-content no-hover">
             <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
               <div class="row-main">
@@ -39,9 +39,9 @@
           </div>
         </div>
         <div class="box">
-          <div class="box-header">
+          <h2 class="box-header">
             {{ "newAttachment" | i18n }}
-          </div>
+          </h2>
           <div class="box-content no-hover">
             <div class="box-content-row">
               <label for="file">{{ "file" | i18n }}</label>
diff --git a/apps/desktop/src/app/vault/collections.component.html b/apps/desktop/src/app/vault/collections.component.html
index acdc5ea0a97..047bd77d804 100644
--- a/apps/desktop/src/app/vault/collections.component.html
+++ b/apps/desktop/src/app/vault/collections.component.html
@@ -3,9 +3,9 @@
     <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="collectionsTitle">
+          <h1 class="box-header" id="collectionsTitle">
             {{ "collections" | i18n }}
-          </div>
+          </h1>
           <div class="box-content" *ngIf="!collections || !collections.length">
             {{ "noCollectionsInList" | i18n }}
           </div>
diff --git a/apps/desktop/src/app/vault/export.component.html b/apps/desktop/src/app/vault/export.component.html
index 09e21b063d5..229156c1f6a 100644
--- a/apps/desktop/src/app/vault/export.component.html
+++ b/apps/desktop/src/app/vault/export.component.html
@@ -11,9 +11,9 @@
         </app-callout>
         <app-export-scope-callout *ngIf="!disabledByPolicy"></app-export-scope-callout>
         <div class="box">
-          <div class="box-header" id="exportTitle">
+          <h1 class="box-header" id="exportTitle">
             {{ "exportVault" | i18n }}
-          </div>
+          </h1>
           <div class="box-content">
             <div class="box-content-row" appBoxRow>
               <label for="format">{{ "fileFormat" | i18n }}</label>
diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.html b/apps/desktop/src/app/vault/folder-add-edit.component.html
index 6457b223c01..ea7303dceb2 100644
--- a/apps/desktop/src/app/vault/folder-add-edit.component.html
+++ b/apps/desktop/src/app/vault/folder-add-edit.component.html
@@ -3,9 +3,9 @@
     <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="folderAddEditTitle">
+          <h1 class="box-header" id="folderAddEditTitle">
             {{ title }}
-          </div>
+          </h1>
           <div class="box-content">
             <div class="box-content-row" appBoxRow>
               <label for="name">{{ "name" | i18n }}</label>
diff --git a/apps/desktop/src/app/vault/generator.component.html b/apps/desktop/src/app/vault/generator.component.html
index e1a64ca5d41..adde67630b0 100644
--- a/apps/desktop/src/app/vault/generator.component.html
+++ b/apps/desktop/src/app/vault/generator.component.html
@@ -1,15 +1,10 @@
-<div
-  class="modal fade"
-  role="dialog"
-  aria-modal="true"
-  attr.aria-label="{{ 'generatePassword' | i18n }}"
->
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="generatorTitle">
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-body">
-        <div class="modal-title">
+        <h1 class="modal-title" id="generatorTitle">
           {{ "generator" | i18n }}
-        </div>
+        </h1>
         <app-callout
           type="info"
           *ngIf="enforcedPasswordPolicyOptions?.inEffect() && type === 'password'"
@@ -103,7 +98,7 @@
         </div>
         <ng-container *ngIf="type === 'password'">
           <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
               <button
                 type="button"
                 (click)="toggleOptions()"
@@ -114,7 +109,7 @@
                 <i class="bwi bwi-minus-square" aria-hidden="true" [hidden]="!showOptions"></i>
                 {{ "options" | i18n }}
               </button>
-            </div>
+            </h2>
             <div class="box-content condensed" [hidden]="!showOptions">
               <div
                 class="box-content-row box-content-row-radio"
@@ -303,7 +298,7 @@
         </ng-container>
         <ng-container *ngIf="type === 'username'">
           <div class="box">
-            <div class="box-header">
+            <h2 class="box-header">
               <button
                 type="button"
                 (click)="toggleOptions()"
@@ -314,7 +309,7 @@
                 <i class="bwi bwi-minus-square" aria-hidden="true" [hidden]="!showOptions"></i>
                 {{ "options" | i18n }}
               </button>
-            </div>
+            </h2>
             <div class="box-content condensed" [hidden]="!showOptions">
               <div
                 class="box-content-row box-content-row-radio"
diff --git a/apps/desktop/src/app/vault/password-generator-history.component.html b/apps/desktop/src/app/vault/password-generator-history.component.html
index 8bef68a689f..6a8dfd909ef 100644
--- a/apps/desktop/src/app/vault/password-generator-history.component.html
+++ b/apps/desktop/src/app/vault/password-generator-history.component.html
@@ -3,9 +3,9 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="passwordGenHistoryTitle">
+          <h1 class="box-header" id="passwordGenHistoryTitle">
             {{ "passwordHistory" | i18n }}
-          </div>
+          </h1>
           <div class="box-content condensed">
             <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
               <div class="row-main">
diff --git a/apps/desktop/src/app/vault/password-history.component.html b/apps/desktop/src/app/vault/password-history.component.html
index 633cee14c78..49493273c16 100644
--- a/apps/desktop/src/app/vault/password-history.component.html
+++ b/apps/desktop/src/app/vault/password-history.component.html
@@ -3,9 +3,9 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="passwordHistoryTitle">
+          <h1 class="box-header" id="passwordHistoryTitle">
             {{ "passwordHistory" | i18n }}
-          </div>
+          </h1>
           <div class="box-content condensed">
             <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
               <div class="row-main">
diff --git a/apps/desktop/src/app/vault/share.component.html b/apps/desktop/src/app/vault/share.component.html
index 0f78ae87e40..f80c3b48296 100644
--- a/apps/desktop/src/app/vault/share.component.html
+++ b/apps/desktop/src/app/vault/share.component.html
@@ -3,9 +3,9 @@
     <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
       <div class="modal-body">
         <div class="box">
-          <div class="box-header" id="moveToOrgTitle">
+          <h1 class="box-header" id="moveToOrgTitle">
             {{ "moveToOrganization" | i18n }}
-          </div>
+          </h1>
           <div class="box-content" *ngIf="!organizations || !organizations.length">
             <div class="box-content-row">
               {{ "noOrganizationsList" | i18n }}
@@ -29,9 +29,9 @@
           </div>
         </div>
         <div class="box" *ngIf="organizations && organizations.length">
-          <div class="box-header">
+          <h2 class="box-header">
             {{ "collections" | i18n }}
-          </div>
+          </h2>
           <div class="box-content" *ngIf="!collections || !collections.length">
             {{ "noCollectionsInList" | i18n }}
           </div>
diff --git a/apps/desktop/src/app/vault/view-custom-fields.component.html b/apps/desktop/src/app/vault/view-custom-fields.component.html
index d1980048eb4..598c4c0f8dd 100644
--- a/apps/desktop/src/app/vault/view-custom-fields.component.html
+++ b/apps/desktop/src/app/vault/view-custom-fields.component.html
@@ -1,7 +1,7 @@
 <div class="box">
-  <div class="box-header">
+  <h2 class="box-header">
     {{ "customFields" | i18n }}
-  </div>
+  </h2>
   <div class="box-content">
     <div class="box-content-row box-content-row-flex" *ngFor="let field of cipher.fields">
       <div class="row-main">
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index 5038e4b984b..3d613736235 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -1,9 +1,9 @@
 <div class="content">
   <div class="inner-content" *ngIf="cipher">
     <div class="box">
-      <div class="box-header">
+      <h2 class="box-header">
         {{ "itemInformation" | i18n }}
-      </div>
+      </h2>
       <div class="box-content">
         <div class="box-content-row">
           <span class="row-label">{{ "name" | i18n }}</span>
@@ -321,9 +321,9 @@
       </div>
     </div>
     <div class="box" *ngIf="cipher.notes">
-      <div class="box-header">
+      <h2 class="box-header">
         {{ "notes" | i18n }}
-      </div>
+      </h2>
       <div class="box-content">
         <div class="box-content-row pre-wrap">{{ cipher.notes }}</div>
       </div>
@@ -336,9 +336,9 @@
     >
     </app-vault-view-custom-fields>
     <div class="box" *ngIf="cipher.hasAttachments && (canAccessPremium || cipher.organizationId)">
-      <div class="box-header">
+      <h2 class="box-header">
         {{ "attachments" | i18n }}
-      </div>
+      </h2>
       <div class="box-content">
         <button
           type="button"
diff --git a/apps/desktop/src/scss/base.scss b/apps/desktop/src/scss/base.scss
index 9d667ac602d..0c891784fff 100644
--- a/apps/desktop/src/scss/base.scss
+++ b/apps/desktop/src/scss/base.scss
@@ -31,10 +31,8 @@ h4,
 h5,
 h6 {
   font-family: $font-family-sans-serif;
-
-  @include themify($themes) {
-    color: themed("textColor");
-  }
+  font-size: $font-size-base;
+  font-weight: normal;
 }
 
 p {

From 179a3b37263e1884f879f657562c9dabbc8b6eea Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 18 Aug 2022 08:23:16 -0600
Subject: [PATCH 9/9] [PS-1265] fix on install hook (#3278)

* Create service factories

* Add onInstall hook to service worker

* Add factory helper and common options structure

* Use factories in main.background

* simplify common factory options

* Split factory service cache and options.

Improve factory method base type handling.

* Add dev flag for managed environment.
---
 apps/browser/config/development.json          |  5 +-
 apps/browser/src/background.ts                |  2 +
 .../browser/src/background/main.background.ts | 88 ++++++++++++-------
 .../crypto-function-service.factory.ts        | 24 +++++
 .../encrypt-service.factory.ts                | 35 ++++++++
 .../environment-service.factory.ts            | 30 +++++++
 .../service_factories/factory-options.ts      | 24 +++++
 .../key-generation-service.factory.ts         | 24 +++++
 .../service_factories/log-service.factory.ts  | 26 ++++++
 .../state-migration-service.factory.ts        | 40 +++++++++
 .../state-service.factory.ts                  | 55 ++++++++++++
 .../storage-service.factory.ts                | 49 +++++++++++
 apps/browser/src/flags.ts                     | 22 ++++-
 .../src/listeners/onInstallListener.ts        | 38 ++++++++
 .../services/browser-environment.service.ts   | 29 +++---
 .../src/types/group-policy-environment.ts     |  9 ++
 16 files changed, 448 insertions(+), 52 deletions(-)
 create mode 100644 apps/browser/src/background/service_factories/crypto-function-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/encrypt-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/environment-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/factory-options.ts
 create mode 100644 apps/browser/src/background/service_factories/key-generation-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/log-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/state-migration-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/state-service.factory.ts
 create mode 100644 apps/browser/src/background/service_factories/storage-service.factory.ts
 create mode 100644 apps/browser/src/listeners/onInstallListener.ts
 create mode 100644 apps/browser/src/types/group-policy-environment.ts

diff --git a/apps/browser/config/development.json b/apps/browser/config/development.json
index a91e00ae5c4..a97475823c7 100644
--- a/apps/browser/config/development.json
+++ b/apps/browser/config/development.json
@@ -1,6 +1,9 @@
 {
   "devFlags": {
-    "storeSessionDecrypted": false
+    "storeSessionDecrypted": false,
+    "managedEnvironment": {
+      "base": "https://localhost:8080"
+    }
   },
   "flags": {}
 }
diff --git a/apps/browser/src/background.ts b/apps/browser/src/background.ts
index ea24defb8cb..ebc2aad10ad 100644
--- a/apps/browser/src/background.ts
+++ b/apps/browser/src/background.ts
@@ -1,10 +1,12 @@
 import MainBackground from "./background/main.background";
 import { onCommandListener } from "./listeners/onCommandListener";
+import { onInstallListener } from "./listeners/onInstallListener";
 
 const manifest = chrome.runtime.getManifest();
 
 if (manifest.manifest_version === 3) {
   chrome.commands.onCommand.addListener(onCommandListener);
+  chrome.runtime.onInstalled.addListener(onInstallListener);
 } else {
   const bitwardenMain = ((window as any).bitwardenMain = new MainBackground());
   bitwardenMain.bootstrap().then(() => {
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 04f963e1861..b4edd387db8 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -47,7 +47,6 @@ import { AuditService } from "@bitwarden/common/services/audit.service";
 import { AuthService } from "@bitwarden/common/services/auth.service";
 import { CipherService } from "@bitwarden/common/services/cipher.service";
 import { CollectionService } from "@bitwarden/common/services/collection.service";
-import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
 import { EncryptService } from "@bitwarden/common/services/encrypt.service";
 import { EventService } from "@bitwarden/common/services/event.service";
@@ -55,7 +54,6 @@ import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
 import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
-import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { OrganizationService } from "@bitwarden/common/services/organization.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
@@ -74,7 +72,6 @@ import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service";
 import { UserVerificationApiService } from "@bitwarden/common/services/userVerification/userVerification-api.service";
 import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service";
 import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service";
-import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
 
 import { BrowserApi } from "../browser/browserApi";
 import { SafariApp } from "../browser/safariApp";
@@ -85,15 +82,11 @@ import { StateService as StateServiceAbstraction } from "../services/abstraction
 import AutofillService from "../services/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
 import { BrowserCryptoService } from "../services/browserCrypto.service";
-import BrowserLocalStorageService from "../services/browserLocalStorage.service";
 import BrowserMessagingService from "../services/browserMessaging.service";
 import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
 import { FolderService } from "../services/folders/folder.service";
 import I18nService from "../services/i18n.service";
-import { KeyGenerationService } from "../services/keyGeneration.service";
-import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
-import { StateService } from "../services/state.service";
 import { VaultFilterService } from "../services/vaultFilter.service";
 import VaultTimeoutService from "../services/vaultTimeout.service";
 
@@ -104,6 +97,17 @@ import IconDetails from "./models/iconDetails";
 import { NativeMessagingBackground } from "./nativeMessaging.background";
 import NotificationBackground from "./notification.background";
 import RuntimeBackground from "./runtime.background";
+import { cryptoFunctionServiceFactory } from "./service_factories/crypto-function-service.factory";
+import { encryptServiceFactory } from "./service_factories/encrypt-service.factory";
+import { environmentServiceFactory } from "./service_factories/environment-service.factory";
+import { logServiceFactory } from "./service_factories/log-service.factory";
+import { stateMigrationServiceFactory } from "./service_factories/state-migration-service.factory";
+import { stateServiceFactory } from "./service_factories/state-service.factory";
+import {
+  diskStorageServiceFactory,
+  memoryStorageServiceFactory,
+  secureStorageServiceFactory,
+} from "./service_factories/storage-service.factory";
 import TabsBackground from "./tabs.background";
 import WebRequestBackground from "./webRequest.background";
 
@@ -195,33 +199,40 @@ export default class MainBackground {
     const logoutCallback = async (expired: boolean, userId?: string) =>
       await this.logout(expired, userId);
 
+    const services: Record<string, unknown> = {};
+    const factoryOptions = {
+      logServiceOptions: {
+        isDev: false,
+      },
+      cryptoFunctionServiceOptions: {
+        win: window,
+      },
+      stateMigrationServiceOptions: {
+        stateFactory: new StateFactory(GlobalState, Account),
+      },
+      stateServiceOptions: {
+        stateFactory: new StateFactory(GlobalState, Account),
+      },
+    };
+
     this.messagingService = isPrivateMode
       ? new BrowserMessagingPrivateModeBackgroundService()
       : new BrowserMessagingService();
-    this.logService = new ConsoleLogService(false);
-    this.cryptoFunctionService = new WebCryptoFunctionService(window);
-    this.storageService = new BrowserLocalStorageService();
-    this.secureStorageService = new BrowserLocalStorageService();
-    this.memoryStorageService =
-      chrome.runtime.getManifest().manifest_version == 3
-        ? new LocalBackedSessionStorageService(
-            new EncryptService(this.cryptoFunctionService, this.logService, false),
-            new KeyGenerationService(this.cryptoFunctionService)
-          )
-        : new MemoryStorageService();
-    this.stateMigrationService = new StateMigrationService(
-      this.storageService,
-      this.secureStorageService,
-      new StateFactory(GlobalState, Account)
-    );
-    this.stateService = new StateService(
-      this.storageService,
-      this.secureStorageService,
-      this.memoryStorageService,
-      this.logService,
-      this.stateMigrationService,
-      new StateFactory(GlobalState, Account)
-    );
+    this.logService = logServiceFactory(services, factoryOptions);
+    this.cryptoFunctionService = cryptoFunctionServiceFactory(services, factoryOptions);
+    this.storageService = diskStorageServiceFactory(services, factoryOptions);
+    this.secureStorageService = secureStorageServiceFactory(services, factoryOptions);
+    this.memoryStorageService = memoryStorageServiceFactory(services, {
+      ...factoryOptions,
+      encryptServiceOptions: {
+        logMacFailures: false,
+      },
+    });
+    this.stateMigrationService = stateMigrationServiceFactory(services, factoryOptions);
+    this.stateService = stateServiceFactory(services, {
+      ...factoryOptions,
+      encryptServiceOptions: { logMacFailures: false },
+    });
     this.platformUtilsService = new BrowserPlatformUtilsService(
       this.messagingService,
       this.stateService,
@@ -245,7 +256,13 @@ export default class MainBackground {
       }
     );
     this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
-    this.encryptService = new EncryptService(this.cryptoFunctionService, this.logService, true);
+    this.encryptService = encryptServiceFactory(services, {
+      ...factoryOptions,
+      encryptServiceOptions: {
+        logMacFailures: true,
+      },
+      alwaysInitializeNewService: true,
+    }); // Update encrypt service with new instances
     this.cryptoService = new BrowserCryptoService(
       this.cryptoFunctionService,
       this.encryptService,
@@ -255,7 +272,12 @@ export default class MainBackground {
     );
     this.tokenService = new TokenService(this.stateService);
     this.appIdService = new AppIdService(this.storageService);
-    this.environmentService = new BrowserEnvironmentService(this.stateService, this.logService);
+    this.environmentService = environmentServiceFactory(services, {
+      ...factoryOptions,
+      encryptServiceOptions: {
+        logMacFailures: false,
+      },
+    });
     this.apiService = new ApiService(
       this.tokenService,
       this.platformUtilsService,
diff --git a/apps/browser/src/background/service_factories/crypto-function-service.factory.ts b/apps/browser/src/background/service_factories/crypto-function-service.factory.ts
new file mode 100644
index 00000000000..fa0fd5d9a03
--- /dev/null
+++ b/apps/browser/src/background/service_factories/crypto-function-service.factory.ts
@@ -0,0 +1,24 @@
+import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
+import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
+
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+
+type CryptoFunctionServiceFactoryOptions = FactoryOptions & {
+  cryptoFunctionServiceOptions: {
+    win: Window | typeof global;
+  };
+};
+
+export type CryptoFunctionServiceInitOptions = CryptoFunctionServiceFactoryOptions;
+
+export function cryptoFunctionServiceFactory(
+  cache: { cryptoFunctionService?: CryptoFunctionService } & CachedServices,
+  opts: CryptoFunctionServiceFactoryOptions
+): CryptoFunctionService {
+  return factory(
+    cache,
+    "cryptoFunctionService",
+    opts,
+    () => new WebCryptoFunctionService(opts.cryptoFunctionServiceOptions.win)
+  );
+}
diff --git a/apps/browser/src/background/service_factories/encrypt-service.factory.ts b/apps/browser/src/background/service_factories/encrypt-service.factory.ts
new file mode 100644
index 00000000000..c8f529b0ecb
--- /dev/null
+++ b/apps/browser/src/background/service_factories/encrypt-service.factory.ts
@@ -0,0 +1,35 @@
+import { EncryptService } from "@bitwarden/common/services/encrypt.service";
+
+import {
+  cryptoFunctionServiceFactory,
+  CryptoFunctionServiceInitOptions,
+} from "./crypto-function-service.factory";
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import { LogServiceInitOptions, logServiceFactory } from "./log-service.factory";
+
+type EncryptServiceFactoryOptions = FactoryOptions & {
+  encryptServiceOptions: {
+    logMacFailures: boolean;
+  };
+};
+
+export type EncryptServiceInitOptions = EncryptServiceFactoryOptions &
+  CryptoFunctionServiceInitOptions &
+  LogServiceInitOptions;
+
+export function encryptServiceFactory(
+  cache: { encryptService?: EncryptService } & CachedServices,
+  opts: EncryptServiceInitOptions
+): EncryptService {
+  return factory(
+    cache,
+    "encryptService",
+    opts,
+    () =>
+      new EncryptService(
+        cryptoFunctionServiceFactory(cache, opts),
+        logServiceFactory(cache, opts),
+        opts.encryptServiceOptions.logMacFailures
+      )
+  );
+}
diff --git a/apps/browser/src/background/service_factories/environment-service.factory.ts b/apps/browser/src/background/service_factories/environment-service.factory.ts
new file mode 100644
index 00000000000..4116583970f
--- /dev/null
+++ b/apps/browser/src/background/service_factories/environment-service.factory.ts
@@ -0,0 +1,30 @@
+import { BrowserEnvironmentService } from "../../services/browser-environment.service";
+
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+import {
+  stateServiceFactory as stateServiceFactory,
+  StateServiceInitOptions,
+} from "./state-service.factory";
+
+type EnvironmentServiceFactoryOptions = FactoryOptions;
+
+export type EnvironmentServiceInitOptions = EnvironmentServiceFactoryOptions &
+  StateServiceInitOptions &
+  LogServiceInitOptions;
+
+export function environmentServiceFactory(
+  cache: { environmentService?: BrowserEnvironmentService } & CachedServices,
+  opts: EnvironmentServiceInitOptions
+): BrowserEnvironmentService {
+  return factory(
+    cache,
+    "environmentService",
+    opts,
+    () =>
+      new BrowserEnvironmentService(
+        stateServiceFactory(cache, opts),
+        logServiceFactory(cache, opts)
+      )
+  );
+}
diff --git a/apps/browser/src/background/service_factories/factory-options.ts b/apps/browser/src/background/service_factories/factory-options.ts
new file mode 100644
index 00000000000..a78d607854a
--- /dev/null
+++ b/apps/browser/src/background/service_factories/factory-options.ts
@@ -0,0 +1,24 @@
+export type CachedServices = Record<string, any>;
+
+export type FactoryOptions = {
+  alwaysInitializeNewService?: boolean;
+  doNotStoreInitializedService?: boolean;
+  [optionsKey: string]: unknown;
+};
+
+export function factory<
+  TCache extends CachedServices,
+  TName extends keyof TCache,
+  TOpts extends FactoryOptions
+>(cachedServices: TCache, name: TName, opts: TOpts, factory: () => TCache[TName]): TCache[TName] {
+  let instance = cachedServices[name];
+  if (opts.alwaysInitializeNewService || !instance) {
+    instance = factory();
+  }
+
+  if (!opts.doNotStoreInitializedService) {
+    cachedServices[name] = instance;
+  }
+
+  return instance as TCache[TName];
+}
diff --git a/apps/browser/src/background/service_factories/key-generation-service.factory.ts b/apps/browser/src/background/service_factories/key-generation-service.factory.ts
new file mode 100644
index 00000000000..89fe5f3066e
--- /dev/null
+++ b/apps/browser/src/background/service_factories/key-generation-service.factory.ts
@@ -0,0 +1,24 @@
+import { KeyGenerationService } from "../../services/keyGeneration.service";
+
+import {
+  cryptoFunctionServiceFactory,
+  CryptoFunctionServiceInitOptions,
+} from "./crypto-function-service.factory";
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+
+type KeyGenerationServiceFactoryOptions = FactoryOptions;
+
+export type KeyGenerationServiceInitOptions = KeyGenerationServiceFactoryOptions &
+  CryptoFunctionServiceInitOptions;
+
+export function keyGenerationServiceFactory(
+  cache: { keyGenerationService?: KeyGenerationService } & CachedServices,
+  opts: KeyGenerationServiceInitOptions
+): KeyGenerationService {
+  return factory(
+    cache,
+    "keyGenerationService",
+    opts,
+    () => new KeyGenerationService(cryptoFunctionServiceFactory(cache, opts))
+  );
+}
diff --git a/apps/browser/src/background/service_factories/log-service.factory.ts b/apps/browser/src/background/service_factories/log-service.factory.ts
new file mode 100644
index 00000000000..407aadd12f6
--- /dev/null
+++ b/apps/browser/src/background/service_factories/log-service.factory.ts
@@ -0,0 +1,26 @@
+import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
+import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
+
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+
+type LogServiceFactoryOptions = FactoryOptions & {
+  logServiceOptions: {
+    isDev: boolean;
+    filter?: (level: LogLevelType) => boolean;
+  };
+};
+
+export type LogServiceInitOptions = LogServiceFactoryOptions;
+
+export function logServiceFactory(
+  cache: { logService?: LogService } & CachedServices,
+  opts: LogServiceInitOptions
+): LogService {
+  return factory(
+    cache,
+    "logService",
+    opts,
+    () => new ConsoleLogService(opts.logServiceOptions.isDev, opts.logServiceOptions.filter)
+  );
+}
diff --git a/apps/browser/src/background/service_factories/state-migration-service.factory.ts b/apps/browser/src/background/service_factories/state-migration-service.factory.ts
new file mode 100644
index 00000000000..cffa7ee765f
--- /dev/null
+++ b/apps/browser/src/background/service_factories/state-migration-service.factory.ts
@@ -0,0 +1,40 @@
+import { StateFactory } from "@bitwarden/common/factories/stateFactory";
+import { GlobalState } from "@bitwarden/common/models/domain/globalState";
+import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
+
+import { Account } from "../../models/account";
+
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import {
+  diskStorageServiceFactory,
+  DiskStorageServiceInitOptions,
+  secureStorageServiceFactory,
+  SecureStorageServiceInitOptions,
+} from "./storage-service.factory";
+
+type StateMigrationServiceFactoryOptions = FactoryOptions & {
+  stateMigrationServiceOptions: {
+    stateFactory: StateFactory<GlobalState, Account>;
+  };
+};
+
+export type StateMigrationServiceInitOptions = StateMigrationServiceFactoryOptions &
+  DiskStorageServiceInitOptions &
+  SecureStorageServiceInitOptions;
+
+export function stateMigrationServiceFactory(
+  cache: { stateMigrationService?: StateMigrationService } & CachedServices,
+  opts: StateMigrationServiceInitOptions
+): StateMigrationService {
+  return factory(
+    cache,
+    "stateMigrationService",
+    opts,
+    () =>
+      new StateMigrationService(
+        diskStorageServiceFactory(cache, opts),
+        secureStorageServiceFactory(cache, opts),
+        opts.stateMigrationServiceOptions.stateFactory
+      )
+  );
+}
diff --git a/apps/browser/src/background/service_factories/state-service.factory.ts b/apps/browser/src/background/service_factories/state-service.factory.ts
new file mode 100644
index 00000000000..f936afbbc10
--- /dev/null
+++ b/apps/browser/src/background/service_factories/state-service.factory.ts
@@ -0,0 +1,55 @@
+import { StateFactory } from "@bitwarden/common/factories/stateFactory";
+import { GlobalState } from "@bitwarden/common/models/domain/globalState";
+
+import { Account } from "../../models/account";
+import { StateService } from "../../services/state.service";
+
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+import {
+  stateMigrationServiceFactory,
+  StateMigrationServiceInitOptions,
+} from "./state-migration-service.factory";
+import {
+  diskStorageServiceFactory,
+  secureStorageServiceFactory,
+  memoryStorageServiceFactory,
+  DiskStorageServiceInitOptions,
+  SecureStorageServiceInitOptions,
+  MemoryStorageServiceInitOptions,
+} from "./storage-service.factory";
+
+type StateServiceFactoryOptions = FactoryOptions & {
+  stateServiceOptions: {
+    useAccountCache?: boolean;
+    stateFactory: StateFactory<GlobalState, Account>;
+  };
+};
+
+export type StateServiceInitOptions = StateServiceFactoryOptions &
+  DiskStorageServiceInitOptions &
+  SecureStorageServiceInitOptions &
+  MemoryStorageServiceInitOptions &
+  LogServiceInitOptions &
+  StateMigrationServiceInitOptions;
+
+export function stateServiceFactory(
+  cache: { stateService?: StateService } & CachedServices,
+  opts: StateServiceInitOptions
+): StateService {
+  return factory(
+    cache,
+    "stateService",
+    opts,
+    () =>
+      new StateService(
+        diskStorageServiceFactory(cache, opts),
+        secureStorageServiceFactory(cache, opts),
+        memoryStorageServiceFactory(cache, opts),
+        logServiceFactory(cache, opts),
+        stateMigrationServiceFactory(cache, opts),
+        opts.stateServiceOptions.stateFactory,
+        opts.stateServiceOptions.useAccountCache
+      )
+  );
+}
diff --git a/apps/browser/src/background/service_factories/storage-service.factory.ts b/apps/browser/src/background/service_factories/storage-service.factory.ts
new file mode 100644
index 00000000000..8ef7e1e93a8
--- /dev/null
+++ b/apps/browser/src/background/service_factories/storage-service.factory.ts
@@ -0,0 +1,49 @@
+import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
+import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
+
+import BrowserLocalStorageService from "../../services/browserLocalStorage.service";
+import { LocalBackedSessionStorageService } from "../../services/localBackedSessionStorage.service";
+
+import { encryptServiceFactory, EncryptServiceInitOptions } from "./encrypt-service.factory";
+import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import {
+  keyGenerationServiceFactory,
+  KeyGenerationServiceInitOptions,
+} from "./key-generation-service.factory";
+
+type StorageServiceFactoryOptions = FactoryOptions;
+
+export type DiskStorageServiceInitOptions = StorageServiceFactoryOptions;
+export type SecureStorageServiceInitOptions = StorageServiceFactoryOptions;
+export type MemoryStorageServiceInitOptions = StorageServiceFactoryOptions &
+  EncryptServiceInitOptions &
+  KeyGenerationServiceInitOptions;
+
+export function diskStorageServiceFactory(
+  cache: { diskStorageService?: AbstractStorageService } & CachedServices,
+  opts: DiskStorageServiceInitOptions
+): AbstractStorageService {
+  return factory(cache, "diskStorageService", opts, () => new BrowserLocalStorageService());
+}
+
+export function secureStorageServiceFactory(
+  cache: { secureStorageService?: AbstractStorageService } & CachedServices,
+  opts: SecureStorageServiceInitOptions
+): AbstractStorageService {
+  return factory(cache, "secureStorageService", opts, () => new BrowserLocalStorageService());
+}
+
+export function memoryStorageServiceFactory(
+  cache: { memoryStorageService?: AbstractStorageService } & CachedServices,
+  opts: MemoryStorageServiceInitOptions
+): AbstractStorageService {
+  return factory(cache, "memoryStorageService", opts, () => {
+    if (chrome.runtime.getManifest().manifest_version == 3) {
+      return new LocalBackedSessionStorageService(
+        encryptServiceFactory(cache, opts),
+        keyGenerationServiceFactory(cache, opts)
+      );
+    }
+    return new MemoryStorageService();
+  });
+}
diff --git a/apps/browser/src/flags.ts b/apps/browser/src/flags.ts
index 2480c2cace7..23012f3f5ea 100644
--- a/apps/browser/src/flags.ts
+++ b/apps/browser/src/flags.ts
@@ -1,3 +1,5 @@
+import { GroupPolicyEnvironment } from "./types/group-policy-environment";
+
 function getFlags<T>(envFlags: string | T): T {
   if (typeof envFlags === "string") {
     return JSON.parse(envFlags) as T;
@@ -21,11 +23,13 @@ export function flagEnabled(flag: FlagName): boolean {
  */
 export type DevFlags = {
   storeSessionDecrypted?: boolean;
+  managedEnvironment?: GroupPolicyEnvironment;
 };
 
 export type DevFlagName = keyof DevFlags;
 
 /**
+ * Gets whether the given dev flag is truthy.
  * Gets the value of a dev flag from environment.
  * Will always return false unless in development.
  * @param flag The name of the dev flag to check
@@ -37,5 +41,21 @@ export function devFlagEnabled(flag: DevFlagName): boolean {
   }
 
   const devFlags = getFlags<DevFlags>(process.env.DEV_FLAGS);
-  return devFlags[flag] == null || devFlags[flag];
+  return devFlags[flag] == null || !!devFlags[flag];
+}
+
+/**
+ * Gets the value of a dev flag from environment.
+ * Will always return false unless in development.
+ * @param flag The name of the dev flag to check
+ * @returns The value of the flag
+ * @throws Error if the flag is not enabled
+ */
+export function devFlagValue<K extends DevFlagName>(flag: K): DevFlags[K] {
+  if (!devFlagEnabled(flag)) {
+    throw new Error(`This method should not be called, it is protected by a disabled dev flag.`);
+  }
+
+  const devFlags = getFlags<DevFlags>(process.env.DEV_FLAGS);
+  return devFlags[flag];
 }
diff --git a/apps/browser/src/listeners/onInstallListener.ts b/apps/browser/src/listeners/onInstallListener.ts
new file mode 100644
index 00000000000..8d871b7788b
--- /dev/null
+++ b/apps/browser/src/listeners/onInstallListener.ts
@@ -0,0 +1,38 @@
+import { StateFactory } from "@bitwarden/common/factories/stateFactory";
+import { GlobalState } from "@bitwarden/common/models/domain/globalState";
+
+import { environmentServiceFactory } from "../background/service_factories/environment-service.factory";
+import { BrowserApi } from "../browser/browserApi";
+import { Account } from "../models/account";
+
+export function onInstallListener(details: chrome.runtime.InstalledDetails) {
+  const cache = {};
+  const opts = {
+    encryptServiceOptions: {
+      logMacFailures: false,
+    },
+    cryptoFunctionServiceOptions: {
+      win: self,
+    },
+    logServiceOptions: {
+      isDev: false,
+    },
+    stateServiceOptions: {
+      stateFactory: new StateFactory(GlobalState, Account),
+    },
+    stateMigrationServiceOptions: {
+      stateFactory: new StateFactory(GlobalState, Account),
+    },
+  };
+  const environmentService = environmentServiceFactory(cache, opts);
+
+  setTimeout(async () => {
+    if (details.reason != null && details.reason === "install") {
+      BrowserApi.createNewTab("https://bitwarden.com/browser-start/");
+
+      if (await environmentService.hasManagedEnvironment()) {
+        await environmentService.setUrlsToManagedEnvironment();
+      }
+    }
+  }, 100);
+}
diff --git a/apps/browser/src/services/browser-environment.service.ts b/apps/browser/src/services/browser-environment.service.ts
index 0fff387e641..384d22fda51 100644
--- a/apps/browser/src/services/browser-environment.service.ts
+++ b/apps/browser/src/services/browser-environment.service.ts
@@ -2,15 +2,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { EnvironmentService } from "@bitwarden/common/services/environment.service";
 
-type GroupPolicyEnvironment = {
-  base?: string;
-  webVault?: string;
-  api?: string;
-  identity?: string;
-  icons?: string;
-  notifications?: string;
-  events?: string;
-};
+import { devFlagEnabled, devFlagValue } from "../flags";
+import { GroupPolicyEnvironment } from "../types/group-policy-environment";
 
 export class BrowserEnvironmentService extends EnvironmentService {
   constructor(stateService: StateService, private logService: LogService) {
@@ -41,15 +34,17 @@ export class BrowserEnvironmentService extends EnvironmentService {
   }
 
   getManagedEnvironment(): Promise<GroupPolicyEnvironment> {
-    return new Promise((resolve, reject) => {
-      chrome.storage.managed.get("environment", (result) => {
-        if (chrome.runtime.lastError) {
-          return reject(chrome.runtime.lastError);
-        }
+    return devFlagEnabled("managedEnvironment")
+      ? new Promise((resolve) => resolve(devFlagValue("managedEnvironment")))
+      : new Promise((resolve, reject) => {
+          chrome.storage.managed.get("environment", (result) => {
+            if (chrome.runtime.lastError) {
+              return reject(chrome.runtime.lastError);
+            }
 
-        resolve(result.environment);
-      });
-    });
+            resolve(result.environment);
+          });
+        });
   }
 
   async setUrlsToManagedEnvironment() {
diff --git a/apps/browser/src/types/group-policy-environment.ts b/apps/browser/src/types/group-policy-environment.ts
new file mode 100644
index 00000000000..217913c58c6
--- /dev/null
+++ b/apps/browser/src/types/group-policy-environment.ts
@@ -0,0 +1,9 @@
+export type GroupPolicyEnvironment = {
+  base?: string;
+  webVault?: string;
+  api?: string;
+  identity?: string;
+  icons?: string;
+  notifications?: string;
+  events?: string;
+};