Bumped version to 2022.5.2 (#1730 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Bumped version to 2022.5.1 (#1727 )
2025-12-11 22:03:21 +00:00 · 2022-06-07 13:04:54 -07:00 · 2022-06-07 11:47:12 -07:00 · 2022-06-06 13:28:10 -04:00 · 2022-06-02 09:09:08 -04:00 · 2022-06-02 11:34:27 +02:00
43 changed files with 384 additions and 220 deletions
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-> **Repository Reorganization in Progress**
+> **Archived**
 >
-> We are currently migrating some projects over to a mono repository. For existing PR's we will be providing documentation on how to move/migrate them. To minimize the overhead we are actively reviewing open PRs. If possible please ensure any pending comments are resolved as soon as possible.
->
-> New pull requests created during this transition period may not get addressed —if needed, please create a new PR after the reorganization is complete.
+> This repository is archived, please go to https://github.com/bitwarden/clients for future development.

 <p align="center">
    <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/web-vault-macbook.png" alt="" width="600" height="358" />
--- a/bitwarden_license/src/app/organizations/organizations-routing.module.ts
+++ b/bitwarden_license/src/app/organizations/organizations-routing.module.ts
@@ -22,14 +22,16 @@ const routes: Routes = [
        component: ManageComponent,
        canActivate: [PermissionsGuard],
        data: {
-          permissions: NavigationPermissionsService.getPermissions("manage").concat(
-            Permissions.ManageSso
-          ),
+          permissions: NavigationPermissionsService.getPermissions("manage"),
        },
        children: [
          {
            path: "sso",
            component: SsoComponent,
+            canActivate: [PermissionsGuard],
+            data: {
+              permissions: [Permissions.ManageSso],
+            },
          },
        ],
      },
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -15,3 +15,4 @@ files:
        en-GB: en_GB
        en-IN: en_IN
        sr-CY: sr_CY
+        sr-CS: sr_CS
--- a/2
+++ b/2
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -101,7 +101,7 @@
      <div [ngClass]="{ 'col-5': layout, 'col-12': !layout }">
        <div class="row justify-content-md-center mt-5">
          <div [ngClass]="{ 'col-5': !layout, 'col-12': layout }">
-            <p class="lead text-center mb-4" *ngIf="!layout">{{ "createAccount" | i18n }}</p>
+            <h1 class="lead text-center mb-4" *ngIf="!layout">{{ "createAccount" | i18n }}</h1>
            <div class="card d-block">
              <div class="card-body">
                <app-callout
--- a/src/app/components/organization-switcher.component.html
+++ b/src/app/components/organization-switcher.component.html
@@ -46,7 +46,7 @@
  <bit-menu #orgPickerMenu>
    <ul aria-labelledby="pickerButton" class="tw-p-0 tw-m-0">
      <li *ngFor="let org of organizations" class="tw-list-none tw-flex tw-flex-col" role="none">
-        <a bit-menu-item [routerLink]="['/organizations', org.id]">
+        <a bitMenuItem [routerLink]="['/organizations', org.id]">
          <i
            class="bwi bwi-check mr-2"
            [ngClass]="org.id === activeOrganization.id ? 'visible' : 'invisible'"
@@ -58,7 +58,7 @@
      </li>
      <bit-menu-divider></bit-menu-divider>
      <li class="tw-list-none" role="none">
-        <a bit-menu-item routerLink="/create-organization">
+        <a bitMenuItem routerLink="/create-organization">
          <i class="bwi bwi-plus mr-2"></i>
          {{ "newOrganization" | i18n }}</a
        >
--- a/src/app/components/premium-badge.component.ts
+++ b/src/app/components/premium-badge.component.ts
@@ -5,7 +5,7 @@ import { MessagingService } from "jslib-common/abstractions/messaging.service";
@Component({
  selector: "app-premium-badge",
  template: `
-    <button *appNotPremium bit-badge badgeType="success" (click)="premiumRequired()">
+    <button *appNotPremium bitBadge badgeType="success" (click)="premiumRequired()">
      {{ "premium" | i18n }}
    </button>
  `,
--- a/src/app/layouts/footer.component.html
+++ b/src/app/layouts/footer.component.html
@@ -1,6 +1,6 @@
 <div class="container footer text-muted">
  <div class="row">
-    <div class="col">&copy; {{ year }}, Bitwarden Inc.</div>
+    <div class="col">&copy; {{ year }} Bitwarden Inc.</div>
    <div class="col text-center"></div>
    <div class="col text-right">
      {{ "versionNumber" | i18n: version }}
--- a/src/app/layouts/frontend-layout.component.html
+++ b/src/app/layouts/frontend-layout.component.html
@@ -1,5 +1,5 @@
 <router-outlet></router-outlet>
 <div class="container my-5 text-muted text-center">
-  &copy; {{ year }}, Bitwarden Inc. <br />
+  &copy; {{ year }} Bitwarden Inc. <br />
  {{ "versionNumber" | i18n: version }}
 </div>
--- a/src/app/layouts/navbar.component.html
+++ b/src/app/layouts/navbar.component.html
@@ -65,24 +65,24 @@
              </div>
            </div>
            <bit-menu-divider></bit-menu-divider>
-            <a bit-menu-item routerLink="/settings/account">
+            <a bitMenuItem routerLink="/settings/account">
              <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
              {{ "accountSettings" | i18n }}
            </a>
-            <a bit-menu-item href="https://bitwarden.com/help/" target="_blank" rel="noopener">
+            <a bitMenuItem href="https://bitwarden.com/help/" target="_blank" rel="noopener">
              <i class="bwi bwi-fw bwi-question-circle" aria-hidden="true"></i>
              {{ "getHelp" | i18n }}
            </a>
-            <a bit-menu-item href="https://bitwarden.com/download/" target="_blank" rel="noopener">
+            <a bitMenuItem href="https://bitwarden.com/download/" target="_blank" rel="noopener">
              <i class="bwi bwi-fw bwi-download" aria-hidden="true"></i>
              {{ "getApps" | i18n }}
            </a>
            <bit-menu-divider></bit-menu-divider>
-            <button bit-menu-item type="button" (click)="lock()">
+            <button bitMenuItem type="button" (click)="lock()">
              <i class="bwi bwi-fw bwi-lock" aria-hidden="true"></i>
              {{ "lockNow" | i18n }}
            </button>
-            <button bit-menu-item type="button" (click)="logOut()">
+            <button bitMenuItem type="button" (click)="logOut()">
              <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
              {{ "logOut" | i18n }}
            </button>
--- a/src/app/modules/loose-components.module.ts
+++ b/src/app/modules/loose-components.module.ts
@@ -35,7 +35,6 @@ import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/
 import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "../organizations/manage/collection-add-edit.component";
 import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component";
 import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/manage/entity-events.component";
-import { EntityUsersComponent as OrgEntityUsersComponent } from "../organizations/manage/entity-users.component";
 import { EventsComponent as OrgEventsComponent } from "../organizations/manage/events.component";
 import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/manage/group-add-edit.component";
 import { GroupsComponent as OrgGroupsComponent } from "../organizations/manage/groups.component";
@@ -243,7 +242,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
    OrgCollectionAddEditComponent,
    OrgCollectionsComponent,
    OrgEntityEventsComponent,
-    OrgEntityUsersComponent,
    OrgEventsComponent,
    OrgExportComponent,
    OrgExposedPasswordsReportComponent,
@@ -403,7 +401,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
    OrgCollectionAddEditComponent,
    OrgCollectionsComponent,
    OrgEntityEventsComponent,
-    OrgEntityUsersComponent,
    OrgEventsComponent,
    OrgExportComponent,
    OrgExposedPasswordsReportComponent,
--- a/src/app/modules/organizations/manage/entity-users.component.html
+++ b/src/app/modules/organizations/manage/entity-users.component.html
@@ -29,52 +29,52 @@
        ></i>
        <span class="sr-only">{{ "loading" | i18n }}</span>
      </div>
-      <div
-        class="modal-body"
-        *ngIf="
-          !loading && users && (users | search: searchText:'name':'email':'id') as searchedUsers
-        "
+      <cdk-virtual-scroll-viewport
+        itemSize="46"
+        minBufferPx="600"
+        maxBufferPx="1200"
+        [style]="scrollViewportStyle"
      >
-        <div class="d-flex">
-          <div class="mr-3">
-            <label class="sr-only" for="search">{{ "search" | i18n }}</label>
-            <input
-              type="search"
-              class="form-control form-control-sm"
-              id="search"
-              placeholder="{{ 'search' | i18n }}"
-              name="SearchText"
-              [(ngModel)]="searchText"
-            />
+        <div class="modal-body" *ngIf="!loading && users && searchedUsers">
+          <div class="d-flex">
+            <div class="mr-3">
+              <label class="sr-only" for="search">{{ "search" | i18n }}</label>
+              <input
+                type="search"
+                class="form-control form-control-sm"
+                id="search"
+                placeholder="{{ 'search' | i18n }}"
+                name="SearchText"
+                [(ngModel)]="searchText"
+              />
+            </div>
+            <div class="btn-group btn-group-sm" role="group">
+              <button
+                type="button"
+                class="btn btn-outline-secondary"
+                [ngClass]="{ active: !showSelected }"
+                (click)="filterSelected(false)"
+              >
+                {{ "all" | i18n }}
+              </button>
+              <button
+                type="button"
+                class="btn btn-outline-secondary"
+                [ngClass]="{ active: showSelected }"
+                (click)="filterSelected(true)"
+              >
+                {{ "selected" | i18n }}
+                <span class="badge badge-pill badge-info" *ngIf="selectedCount">{{
+                  selectedCount
+                }}</span>
+              </button>
+            </div>
          </div>
-          <div class="btn-group btn-group-sm" role="group">
-            <button
-              type="button"
-              class="btn btn-outline-secondary"
-              [ngClass]="{ active: !showSelected }"
-              (click)="filterSelected(false)"
-            >
-              {{ "all" | i18n }}
-            </button>
-            <button
-              type="button"
-              class="btn btn-outline-secondary"
-              [ngClass]="{ active: showSelected }"
-              (click)="filterSelected(true)"
-            >
-              {{ "selected" | i18n }}
-              <span class="badge badge-pill badge-info" *ngIf="selectedCount">{{
-                selectedCount
-              }}</span>
-            </button>
-          </div>
-        </div>
-        <ng-container *ngIf="!searchedUsers.length">
-          <hr />
-          {{ "noUsersInList" | i18n }}
-        </ng-container>
-        <ng-container *ngIf="searchedUsers.length">
-          <table class="table table-hover table-list mb-0">
+          <ng-container *ngIf="!searchedUsers.length">
+            <hr />
+            {{ "noUsersInList" | i18n }}
+          </ng-container>
+          <table class="table table-hover table-list mb-0" [hidden]="!searchedUsers.length">
            <thead>
              <tr>
                <th>&nbsp;</th>
@@ -91,7 +91,7 @@
              </tr>
            </thead>
            <tbody>
-              <tr *ngFor="let u of searchedUsers">
+              <tr *cdkVirtualFor="let u of searchedUsers" class="">
                <td class="table-list-checkbox" (click)="check(u)">
                  <input
                    type="checkbox"
@@ -164,8 +164,8 @@
              </tr>
            </tbody>
          </table>
-        </ng-container>
-      </div>
+        </div>
+      </cdk-virtual-scroll-viewport>
      <div class="modal-footer">
        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
--- a/src/app/modules/organizations/manage/entity-users.component.ts
+++ b/src/app/modules/organizations/manage/entity-users.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";

+import { SearchPipe } from "jslib-angular/pipes/search.pipe";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
@@ -13,6 +14,7 @@ import { OrganizationUserUserDetailsResponse } from "jslib-common/models/respons
@Component({
  selector: "app-entity-users",
  templateUrl: "entity-users.component.html",
+  providers: [SearchPipe],
 })
 export class EntityUsersComponent implements OnInit {
  @Input() entity: "group" | "collection";
@@ -33,6 +35,7 @@ export class EntityUsersComponent implements OnInit {
  private allUsers: OrganizationUserUserDetailsResponse[] = [];

  constructor(
+    private search: SearchPipe,
    private apiService: ApiService,
    private i18nService: I18nService,
    private platformUtilsService: PlatformUtilsService,
@@ -52,6 +55,14 @@ export class EntityUsersComponent implements OnInit {
    }
  }

+  get searchedUsers() {
+    return this.search.transform(this.users, this.searchText, "name", "email", "id");
+  }
+
+  get scrollViewportStyle() {
+    return `min-height: 120px; height: ${120 + this.searchedUsers.length * 46}px`;
+  }
+
  async loadUsers() {
    const users = await this.apiService.getOrganizationUsers(this.organizationId);
    this.allUsers = users.data.map((r) => r).sort(Utils.getSortFunction(this.i18nService, "email"));
--- a/src/app/modules/organizations/manage/organization-manage.module.ts
+++ b/src/app/modules/organizations/manage/organization-manage.module.ts
@@ -0,0 +1,13 @@
+import { ScrollingModule } from "@angular/cdk/scrolling";
+import { NgModule } from "@angular/core";
+
+import { SharedModule } from "../../shared.module";
+
+import { EntityUsersComponent } from "./entity-users.component";
+
+@NgModule({
+  imports: [SharedModule, ScrollingModule],
+  declarations: [EntityUsersComponent],
+  exports: [EntityUsersComponent],
+})
+export class OrganizationManageModule {}
--- a/src/app/modules/organizations/users/enroll-master-password-reset.component.html
+++ b/src/app/modules/organizations/users/enroll-master-password-reset.component.html
@@ -0,0 +1,59 @@
+<div
+  class="modal fade"
+  role="dialog"
+  aria-modal="true"
+  aria-labelledby="enrollMasterPasswordResetTitle"
+>
+  <div class="modal-dialog modal-dialog-scrollable" role="document">
+    <form
+      class="modal-content"
+      #form
+      (ngSubmit)="submit()"
+      [appApiAction]="formPromise"
+      ngNativeValidate
+    >
+      <div class="modal-header">
+        <h2 class="modal-title" id="enrollMasterPasswordResetTitle">
+          {{ (isEnrolled ? "withdrawPasswordReset" : "enrollPasswordReset") | i18n }}
+        </h2>
+        <button
+          type="button"
+          class="close"
+          data-dismiss="modal"
+          appA11yTitle="{{ 'close' | i18n }}"
+        >
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <app-callout type="warning" *ngIf="!isEnrolled">
+          {{ "resetPasswordEnrollmentWarning" | i18n }}
+        </app-callout>
+        <app-user-verification [(ngModel)]="verification" name="secret"> </app-user-verification>
+      </div>
+      <div class="modal-footer">
+        <button bitButton buttonType="primary" type="submit" [disabled]="form.loading">
+          <i
+            class="bwi bwi-spinner bwi-spin"
+            title="{{ 'loading' | i18n }}"
+            *ngIf="form.loading"
+          ></i>
+          <span>
+            {{ "submit" | i18n }}
+          </span>
+        </button>
+        <button
+          bitButton
+          buttonType="secondary"
+          type="button"
+          data-dismiss="modal"
+          appA11yTitle="{{ 'close' | i18n }}"
+        >
+          <span>
+            {{ "cancel" | i18n }}
+          </span>
+        </button>
+      </div>
+    </form>
+  </div>
+</div>
--- a/src/app/modules/organizations/users/enroll-master-password-reset.component.ts
+++ b/src/app/modules/organizations/users/enroll-master-password-reset.component.ts
@@ -0,0 +1,97 @@
+import { Component } from "@angular/core";
+
+import { ModalRef } from "jslib-angular/components/modal/modal.ref";
+import { ModalConfig } from "jslib-angular/services/modal.service";
+import { ApiService } from "jslib-common/abstractions/api.service";
+import { CryptoService } from "jslib-common/abstractions/crypto.service";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { LogService } from "jslib-common/abstractions/log.service";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { SyncService } from "jslib-common/abstractions/sync.service";
+import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
+import { Utils } from "jslib-common/misc/utils";
+import { Organization } from "jslib-common/models/domain/organization";
+import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest";
+import { Verification } from "jslib-common/types/verification";
+
+@Component({
+  selector: "app-enroll-master-password-reset",
+  templateUrl: "enroll-master-password-reset.component.html",
+})
+export class EnrollMasterPasswordReset {
+  organization: Organization;
+
+  verification: Verification;
+  formPromise: Promise<any>;
+
+  constructor(
+    private userVerificationService: UserVerificationService,
+    private apiService: ApiService,
+    private platformUtilsService: PlatformUtilsService,
+    private i18nService: I18nService,
+    private cryptoService: CryptoService,
+    private syncService: SyncService,
+    private logService: LogService,
+    private modalRef: ModalRef,
+    config: ModalConfig
+  ) {
+    this.organization = config.data.organization;
+  }
+
+  async submit() {
+    let toastStringRef = "withdrawPasswordResetSuccess";
+
+    this.formPromise = this.userVerificationService
+      .buildRequest(this.verification, OrganizationUserResetPasswordEnrollmentRequest)
+      .then(async (request) => {
+        // Set variables
+        let keyString: string = null;
+
+        // Enrolling
+        if (!this.organization.resetPasswordEnrolled) {
+          // Retrieve Public Key
+          const orgKeys = await this.apiService.getOrganizationKeys(this.organization.id);
+          if (orgKeys == null) {
+            throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
+          }
+
+          const publicKey = Utils.fromB64ToArray(orgKeys.publicKey);
+
+          // RSA Encrypt user's encKey.key with organization public key
+          const encKey = await this.cryptoService.getEncKey();
+          const encryptedKey = await this.cryptoService.rsaEncrypt(encKey.key, publicKey.buffer);
+          keyString = encryptedKey.encryptedString;
+          toastStringRef = "enrollPasswordResetSuccess";
+
+          // Create request and execute enrollment
+          request.resetPasswordKey = keyString;
+          await this.apiService.putOrganizationUserResetPasswordEnrollment(
+            this.organization.id,
+            this.organization.userId,
+            request
+          );
+        } else {
+          // Withdrawal
+          request.resetPasswordKey = keyString;
+          await this.apiService.putOrganizationUserResetPasswordEnrollment(
+            this.organization.id,
+            this.organization.userId,
+            request
+          );
+        }
+
+        await this.syncService.fullSync(true);
+      });
+    try {
+      await this.formPromise;
+      this.platformUtilsService.showToast("success", null, this.i18nService.t(toastStringRef));
+      this.modalRef.close();
+    } catch (e) {
+      this.logService.error(e);
+    }
+  }
+
+  get isEnrolled(): boolean {
+    return this.organization.resetPasswordEnrolled;
+  }
+}
--- a/src/app/modules/organizations/users/organization-user.module.ts
+++ b/src/app/modules/organizations/users/organization-user.module.ts
@@ -0,0 +1,14 @@
+import { ScrollingModule } from "@angular/cdk/scrolling";
+import { NgModule } from "@angular/core";
+
+import { LooseComponentsModule } from "../../loose-components.module";
+import { SharedModule } from "../../shared.module";
+
+import { EnrollMasterPasswordReset } from "./enroll-master-password-reset.component";
+
+@NgModule({
+  imports: [SharedModule, ScrollingModule, LooseComponentsModule],
+  declarations: [EnrollMasterPasswordReset],
+  exports: [EnrollMasterPasswordReset],
+})
+export class OrganizationUserModule {}
--- a/src/app/modules/vault-filter/components/organization-options.component.ts
+++ b/src/app/modules/vault-filter/components/organization-options.component.ts
@@ -1,17 +1,17 @@
 import { Component, Input } from "@angular/core";

+import { ModalService } from "jslib-angular/services/modal.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { PolicyType } from "jslib-common/enums/policyType";
-import { Utils } from "jslib-common/misc/utils";
 import { Organization } from "jslib-common/models/domain/organization";
 import { Policy } from "jslib-common/models/domain/policy";
-import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest";
+
+import { EnrollMasterPasswordReset } from "../../organizations/users/enroll-master-password-reset.component";

@Component({
  selector: "app-organization-options",
@@ -29,8 +29,8 @@ export class OrganizationOptionsComponent {
    private i18nService: I18nService,
    private apiService: ApiService,
    private syncService: SyncService,
-    private cryptoService: CryptoService,
    private policyService: PolicyService,
+    private modalService: ModalService,
    private logService: LogService
  ) {}

@@ -113,70 +113,11 @@ export class OrganizationOptionsComponent {
  }

  async toggleResetPasswordEnrollment(org: Organization) {
-    // Set variables
-    let keyString: string = null;
-    let toastStringRef = "withdrawPasswordResetSuccess";
-
-    // Enrolling
-    if (!org.resetPasswordEnrolled) {
-      // Alert user about enrollment
-      const confirmed = await this.platformUtilsService.showDialog(
-        this.i18nService.t("resetPasswordEnrollmentWarning"),
-        null,
-        this.i18nService.t("yes"),
-        this.i18nService.t("no"),
-        "warning"
-      );
-      if (!confirmed) {
-        return;
-      }
-
-      // Retrieve Public Key
-      this.actionPromise = this.apiService
-        .getOrganizationKeys(org.id)
-        .then(async (response) => {
-          if (response == null) {
-            throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
-          }
-
-          const publicKey = Utils.fromB64ToArray(response.publicKey);
-
-          // RSA Encrypt user's encKey.key with organization public key
-          const encKey = await this.cryptoService.getEncKey();
-          const encryptedKey = await this.cryptoService.rsaEncrypt(encKey.key, publicKey.buffer);
-          keyString = encryptedKey.encryptedString;
-          toastStringRef = "enrollPasswordResetSuccess";
-
-          // Create request and execute enrollment
-          const request = new OrganizationUserResetPasswordEnrollmentRequest();
-          request.resetPasswordKey = keyString;
-          return this.apiService.putOrganizationUserResetPasswordEnrollment(
-            org.id,
-            org.userId,
-            request
-          );
-        })
-        .then(() => {
-          return this.syncService.fullSync(true);
-        });
-    } else {
-      // Withdrawal
-      const request = new OrganizationUserResetPasswordEnrollmentRequest();
-      request.resetPasswordKey = keyString;
-      this.actionPromise = this.apiService
-        .putOrganizationUserResetPasswordEnrollment(org.id, org.userId, request)
-        .then(() => {
-          return this.syncService.fullSync(true);
-        });
-    }
-
-    try {
-      await this.actionPromise;
-      this.platformUtilsService.showToast("success", null, this.i18nService.t(toastStringRef));
-      await this.load();
-    } catch (e) {
-      this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
-      this.logService.error(e);
-    }
+    this.modalService.open(EnrollMasterPasswordReset, {
+      allowMultipleModals: true,
+      data: {
+        organization: org,
+      },
+    });
  }
 }
--- a/src/app/modules/vault-filter/vault-filter.component.ts
+++ b/src/app/modules/vault-filter/vault-filter.component.ts
@@ -23,14 +23,4 @@ export class VaultFilterComponent extends BaseVaultFilterComponent {
  searchTextChanged() {
    this.onSearchTextChanged.emit(this.searchText);
  }
-
-  // This method exists because the vault component gets its data mixed up during the initial sync on first login. It looks for data before the sync is complete.
-  // It should be removed as soon as doing so makes sense.
-  async reloadOrganizations() {
-    this.organizations = await this.vaultFilterService.buildOrganizations();
-    this.activePersonalOwnershipPolicy =
-      await this.vaultFilterService.checkForPersonalOwnershipPolicy();
-    this.activeSingleOrganizationPolicy =
-      await this.vaultFilterService.checkForSingleOrganizationPolicy();
-  }
 }
--- a/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts
+++ b/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts
@@ -58,7 +58,6 @@ export class IndividualVaultComponent implements OnInit, OnDestroy {
  updateKeyModalRef: ViewContainerRef;

  favorites = false;
-  type: CipherType = null;
  folderId: string = null;
  collectionId: string = null;
  organizationId: string = null;
@@ -327,7 +326,7 @@ export class IndividualVaultComponent implements OnInit, OnDestroy {

  async addCipher() {
    const component = await this.editCipher(null);
-    component.type = this.type;
+    component.type = this.activeFilter.cipherType;
    component.folderId = this.folderId === "none" ? null : this.folderId;
    if (this.activeFilter.selectedCollectionId != null) {
      const collection = this.filterComponent.collections.fullList.filter(
@@ -399,7 +398,7 @@ export class IndividualVaultComponent implements OnInit, OnDestroy {
    if (queryParams == null) {
      queryParams = {
        favorites: this.favorites ? true : null,
-        type: this.type,
+        type: this.activeFilter.cipherType,
        folderId: this.folderId,
        collectionId: this.collectionId,
        deleted: this.deleted ? true : null,
--- a/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.html
+++ b/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.html
@@ -1,5 +1,5 @@
 <button
-  bit-badge
+  bitBadge
  [style.color]="textColor"
  [style.background-color]="color"
  appA11yTitle="{{ organizationName }}"
--- a/src/app/organizations/manage/collections.component.ts
+++ b/src/app/organizations/manage/collections.component.ts
@@ -20,8 +20,9 @@ import {
 import { ListResponse } from "jslib-common/models/response/listResponse";
 import { CollectionView } from "jslib-common/models/view/collectionView";

+import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component";
+
 import { CollectionAddEditComponent } from "./collection-add-edit.component";
-import { EntityUsersComponent } from "./entity-users.component";

@Component({
  selector: "app-org-manage-collections",
--- a/src/app/organizations/manage/groups.component.ts
+++ b/src/app/organizations/manage/groups.component.ts
@@ -12,7 +12,8 @@ import { SearchService } from "jslib-common/abstractions/search.service";
 import { Utils } from "jslib-common/misc/utils";
 import { GroupResponse } from "jslib-common/models/response/groupResponse";

-import { EntityUsersComponent } from "./entity-users.component";
+import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component";
+
 import { GroupAddEditComponent } from "./group-add-edit.component";

@Component({
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -52,7 +52,7 @@
            target="_blank"
            rel="noopener"
            appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/provider-users/"
+            href="https://bitwarden.com/help/user-types-access-control/"
          >
            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
          </a>
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from "@angular/core";

 import { LooseComponentsModule } from "./modules/loose-components.module";
+import { OrganizationManageModule } from "./modules/organizations/manage/organization-manage.module";
+import { OrganizationUserModule } from "./modules/organizations/users/organization-user.module";
 import { PipesModule } from "./modules/pipes/pipes.module";
 import { SharedModule } from "./modules/shared.module";
 import { VaultFilterModule } from "./modules/vault-filter/vault-filter.module";
@@ -13,6 +15,8 @@ import { OrganizationBadgeModule } from "./modules/vault/modules/organization-ba
    VaultFilterModule,
    OrganizationBadgeModule,
    PipesModule,
+    OrganizationManageModule,
+    OrganizationUserModule,
  ],
  exports: [LooseComponentsModule, VaultFilterModule, OrganizationBadgeModule, PipesModule],
  bootstrap: [],
--- a/src/app/reports/breach-report.component.html
+++ b/src/app/reports/breach-report.component.html
@@ -17,13 +17,7 @@
      <small class="form-text text-muted">{{ "breachCheckUsernameEmail" | i18n }}</small>
    </div>
  </div>
-  <button
-    bit-button
-    buttonType="primary"
-    class="btn-submit"
-    type="submit"
-    [disabled]="form.loading"
-  >
+  <button bitButton buttonType="primary" class="btn-submit" type="submit" [disabled]="form.loading">
    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "checkBreaches" | i18n }}</span>
  </button>
--- a/src/app/reports/exposed-passwords-report.component.html
+++ b/src/app/reports/exposed-passwords-report.component.html
@@ -3,7 +3,7 @@
 </div>
 <p>{{ "exposedPasswordsReportDesc" | i18n }}</p>
 <button
-  bit-button
+  bitButton
  buttonType="primary"
  type="button"
  class="btn-submit"
--- a/src/app/reports/report-card.component.html
+++ b/src/app/reports/report-card.component.html
@@ -15,7 +15,7 @@
      <p class="tw-mb-0">{{ report.description | i18n }}</p>
    </div>
    <span
-      bit-badge
+      bitBadge
      badgeType="success"
      class="tw-absolute tw-left-2 tw-top-2 tw-leading-none"
      *ngIf="premium"
--- a/src/app/reports/reports.component.html
+++ b/src/app/reports/reports.component.html
@@ -3,7 +3,7 @@

  <div class="row mt-4">
    <div class="col">
-      <a bit-button routerLink="./" *ngIf="!homepage">
+      <a bitButton routerLink="./" *ngIf="!homepage">
        <i class="bwi bwi-angle-left" aria-hidden="true"></i>
        {{ "backToReports" | i18n }}
      </a>
--- a/src/app/send/access.component.html
+++ b/src/app/send/access.component.html
@@ -1,7 +1,7 @@
 <form #form (ngSubmit)="load()" [appApiAction]="formPromise" class="container" ngNativeValidate>
  <div class="row justify-content-center mt-5">
    <div class="col-12">
-      <p class="lead text-center mb-4">Bitwarden Send</p>
+      <h1 class="lead text-center mb-4">Bitwarden Send</h1>
    </div>
    <div class="col-12 text-center" *ngIf="creatorIdentifier != null">
      <p>{{ "sendCreatorIdentifier" | i18n: creatorIdentifier }}</p>
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -23,7 +23,7 @@
            <ul class="filter-options">
              <li class="filter-option" [ngClass]="{ active: selectedAll }">
                <span class="filter-buttons">
-                  <button bit-button class="filter-button" appStopClick (click)="selectAll()">
+                  <button bitButton class="filter-button" appStopClick (click)="selectAll()">
                    <i class="bwi bwi-fw bwi-filter"></i>{{ "allSends" | i18n }}
                  </button>
                </span>
@@ -38,7 +38,7 @@
              <li class="filter-option" [ngClass]="{ active: selectedType === sendType.Text }">
                <span class="filter-buttons">
                  <button
-                    bit-button
+                    bitButton
                    class="filter-button"
                    appStopClick
                    (click)="selectType(sendType.Text)"
@@ -50,7 +50,7 @@
              <li class="filter-option" [ngClass]="{ active: selectedType === sendType.File }">
                <span class="filter-buttons">
                  <button
-                    bit-button
+                    bitButton
                    class="filter-button"
                    appStopClick
                    (click)="selectType(sendType.File)"
@@ -160,19 +160,15 @@
                <i class="bwi bwi-ellipsis-v bwi-lg" aria-hidden="true"></i>
              </button>
              <bit-menu #sendOptions>
-                <button bit-menu-item (click)="copy(s)">
+                <button bitMenuItem (click)="copy(s)">
                  <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
                  {{ "copySendLink" | i18n }}
                </button>
-                <button
-                  bit-menu-item
-                  (click)="removePassword(s)"
-                  *ngIf="s.password && !disableSend"
-                >
+                <button bitMenuItem (click)="removePassword(s)" *ngIf="s.password && !disableSend">
                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                  {{ "removePassword" | i18n }}
                </button>
-                <button bit-menu-item (click)="delete(s)">
+                <button bitMenuItem (click)="delete(s)">
                  <span class="tw-text-danger">
                    <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                    {{ "delete" | i18n }}
--- a/src/app/settings/account.component.html
+++ b/src/app/settings/account.component.html
@@ -14,13 +14,13 @@
 <div class="card border-danger">
  <div class="card-body">
    <p>{{ "dangerZoneDesc" | i18n }}</p>
-    <button bit-button buttonType="danger" (click)="deauthorizeSessions()">
+    <button bitButton buttonType="danger" (click)="deauthorizeSessions()">
      {{ "deauthorizeSessions" | i18n }}
    </button>
-    <button bit-button buttonType="danger" (click)="purgeVault()">
+    <button bitButton buttonType="danger" (click)="purgeVault()">
      {{ "purgeVault" | i18n }}
    </button>
-    <button bit-button buttonType="danger" (click)="deleteAccount()">
+    <button bitButton buttonType="danger" (click)="deleteAccount()">
      {{ "deleteAccount" | i18n }}
    </button>
  </div>
--- a/src/app/settings/change-kdf.component.html
+++ b/src/app/settings/change-kdf.component.html
@@ -71,7 +71,7 @@
      </div>
    </div>
  </div>
-  <button bit-button buttonType="primary" class="btn-submit" [disabled]="form.loading">
+  <button bitButton buttonType="primary" class="btn-submit" [disabled]="form.loading">
    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "changeKdf" | i18n }}</span>
  </button>
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -87,7 +87,7 @@
      </a>
    </div>
  </div>
-  <button bit-button buttonType="primary" class="btn-submit" [disabled]="form.loading">
+  <button bitButton buttonType="primary" class="btn-submit" [disabled]="form.loading">
    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "changeMasterPassword" | i18n }}</span>
  </button>
--- a/src/app/settings/payment-method.component.html
+++ b/src/app/settings/payment-method.component.html
@@ -3,7 +3,7 @@
    {{ "paymentMethod" | i18n }}
  </h1>
  <button
-    bit-button
+    bitButton
    buttonType="secondary"
    (click)="load()"
    class="tw-ml-auto"
@@ -28,7 +28,7 @@
    <strong>{{ creditOrBalance | currency: "$" }}</strong>
  </p>
  <p>{{ "creditAppliedDesc" | i18n }}</p>
-  <button bit-button buttonType="secondary" (click)="addCredit()" *ngIf="!showAddCredit">
+  <button bitButton buttonType="secondary" (click)="addCredit()" *ngIf="!showAddCredit">
    {{ "addCredit" | i18n }}
  </button>
  <app-add-credit
@@ -56,7 +56,7 @@
      {{ paymentSource.description }}
    </p>
  </ng-container>
-  <button bit-button buttonType="secondary" (click)="changePayment()" *ngIf="!showAdjustPayment">
+  <button bitButton buttonType="secondary" (click)="changePayment()" *ngIf="!showAdjustPayment">
    {{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
  </button>
  <app-adjust-payment
--- a/src/app/settings/premium.component.html
+++ b/src/app/settings/premium.component.html
@@ -48,7 +48,7 @@
    {{ "premiumPrice" | i18n: (premiumPrice | currency: "$") }}
  </p>
  <a
-    bit-button
+    bitButton
    href="https://vault.bitwarden.com/#/settings/premium"
    target="_blank"
    rel="noopener"
@@ -69,7 +69,7 @@
      }}</small>
    </div>
    <button
-      bit-button
+      bitButton
      buttonType="primary"
      type="submit"
      class="btn-submit"
@@ -125,13 +125,7 @@
    </p>
  </div>
  <small class="text-muted font-italic">{{ "paymentChargedAnnually" | i18n }}</small>
-  <button
-    bit-button
-    buttonType="primary"
-    type="submit"
-    class="btn-submit"
-    [disabled]="form.loading"
-  >
+  <button bitButton buttonType="primary" type="submit" class="btn-submit" [disabled]="form.loading">
    <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
    <span>{{ "submit" | i18n }}</span>
  </button>
--- a/src/app/settings/security-keys.component.html
+++ b/src/app/settings/security-keys.component.html
@@ -8,10 +8,10 @@
 <p>
  {{ "userApiKeyDesc" | i18n }}
 </p>
-<button bit-button buttonType="secondary" (click)="viewUserApiKey()">
+<button bitButton buttonType="secondary" (click)="viewUserApiKey()">
  {{ "viewApiKey" | i18n }}
 </button>
-<button bit-button buttonType="secondary" (click)="rotateUserApiKey()">
+<button bitButton buttonType="secondary" (click)="rotateUserApiKey()">
  {{ "rotateApiKey" | i18n }}
 </button>
 <ng-template #viewUserApiKeyTemplate></ng-template>
--- a/src/app/settings/two-factor-setup.component.html
+++ b/src/app/settings/two-factor-setup.component.html
@@ -5,7 +5,7 @@
 <p *ngIf="organizationId">{{ "twoStepLoginOrganizationDesc" | i18n }}</p>
 <bit-callout type="warning" *ngIf="!organizationId">
  <p>{{ "twoStepLoginRecoveryWarning" | i18n }}</p>
-  <button bit-button buttonType="secondary" (click)="recoveryCode()">
+  <button bitButton buttonType="secondary" (click)="recoveryCode()">
    {{ "viewRecoveryCode" | i18n }}
  </button>
 </bit-callout>
@@ -45,7 +45,7 @@
    </div>
    <div class="ml-auto">
      <button
-        bit-button
+        bitButton
        buttonType="secondary"
        [disabled]="!canAccessPremium && p.premium"
        (click)="manage(p.type)"
--- a/src/app/settings/user-billing-history.component.html
+++ b/src/app/settings/user-billing-history.component.html
@@ -3,7 +3,7 @@
    {{ "billingHistory" | i18n }}
  </h1>
  <button
-    bit-button
+    bitButton
    buttonType="secondary"
    (click)="load()"
    class="tw-ml-auto"
--- a/src/app/settings/user-subscription.component.html
+++ b/src/app/settings/user-subscription.component.html
@@ -39,7 +39,7 @@
  >
    <p>{{ "subscriptionPendingCanceled" | i18n }}</p>
    <button
-      bit-button
+      bitButton
      type="button"
      buttonType="secondary"
      #reinstateBtn
@@ -63,7 +63,7 @@
        <dt>{{ "status" | i18n }}</dt>
        <dd>
          <span class="text-capitalize">{{ (subscription && subscription.status) || "-" }}</span>
-          <span bit-badge badgeType="warning" *ngIf="subscriptionMarkedForCancel">{{
+          <span bitBadge badgeType="warning" *ngIf="subscriptionMarkedForCancel">{{
            "pendingCancellation" | i18n
          }}</span>
        </dd>
@@ -96,11 +96,11 @@
  </div>
  <ng-container *ngIf="selfHosted">
    <div>
-      <button type="button" bit-button buttonType="secondary" (click)="updateLicense()">
+      <button type="button" bitButton buttonType="secondary" (click)="updateLicense()">
        {{ "updateLicense" | i18n }}
      </button>
      <a
-        bit-button
+        bitButton
        buttonType="secondary"
        href="https://vault.bitwarden.com/#/settings/subscription"
        target="_blank"
@@ -131,7 +131,7 @@
  <ng-container *ngIf="!selfHosted">
    <div class="d-flex">
      <button
-        bit-button
+        bitButton
        type="button"
        buttonType="secondary"
        (click)="downloadLicense()"
@@ -140,7 +140,7 @@
        {{ "downloadLicense" | i18n }}
      </button>
      <button
-        bit-button
+        bitButton
        #cancelBtn
        type="button"
        buttonType="danger"
@@ -171,11 +171,11 @@
    <ng-container *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
      <div class="mt-3">
        <div class="d-flex" *ngIf="!showAdjustStorage">
-          <button bit-button type="button" buttonType="secondary" (click)="adjustStorage(true)">
+          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(true)">
            {{ "addStorage" | i18n }}
          </button>
          <button
-            bit-button
+            bitButton
            type="button"
            buttonType="secondary"
            class="tw-ml-1"
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -64,12 +64,12 @@
          </button>
          <bit-menu #cipherOptions>
            <ng-container *ngIf="c.type === cipherType.Login && !c.isDeleted">
-              <button bit-menu-item (click)="copy(c, c.login.username, 'username', 'Username')">
+              <button bitMenuItem (click)="copy(c, c.login.username, 'username', 'Username')">
                <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
                {{ "copyUsername" | i18n }}
              </button>
              <button
-                bit-menu-item
+                bitMenuItem
                (click)="copy(c, c.login.password, 'password', 'Password')"
                *ngIf="c.viewPassword"
              >
@@ -77,24 +77,24 @@
                {{ "copyPassword" | i18n }}
              </button>
              <button
-                bit-menu-item
+                bitMenuItem
                (click)="copy(c, c.login.totp, 'verificationCodeTotp', 'TOTP')"
                *ngIf="displayTotpCopyButton(c)"
              >
                <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
                {{ "copyVerificationCode" | i18n }}
              </button>
-              <button bit-menu-item *ngIf="c.login.canLaunch" (click)="launch(c.login.launchUri)">
+              <button bitMenuItem *ngIf="c.login.canLaunch" (click)="launch(c.login.launchUri)">
                <i class="bwi bwi-fw bwi-share-square" aria-hidden="true"></i>
                {{ "launch" | i18n }}
              </button>
            </ng-container>
-            <button bit-menu-item (click)="attachments(c)">
+            <button bitMenuItem (click)="attachments(c)">
              <i class="bwi bwi-fw bwi-paperclip" aria-hidden="true"></i>
              {{ "attachments" | i18n }}
            </button>
            <button
-              bit-menu-item
+              bitMenuItem
              *ngIf="((!organization && !c.organizationId) || organization) && !c.isDeleted"
              (click)="clone(c)"
            >
@@ -102,26 +102,26 @@
              {{ "clone" | i18n }}
            </button>
            <button
-              bit-menu-item
+              bitMenuItem
              *ngIf="!organization && !c.organizationId && !c.isDeleted"
              (click)="share(c)"
            >
              <i class="bwi bwi-fw bwi-arrow-circle-right" aria-hidden="true"></i>
              {{ "moveToOrganization" | i18n }}
            </button>
-            <button bit-menu-item *ngIf="c.organizationId && !c.isDeleted" (click)="collections(c)">
+            <button bitMenuItem *ngIf="c.organizationId && !c.isDeleted" (click)="collections(c)">
              <i class="bwi bwi-fw bwi-collection" aria-hidden="true"></i>
              {{ "collections" | i18n }}
            </button>
-            <button bit-menu-item *ngIf="c.organizationId && accessEvents" (click)="events(c)">
+            <button bitMenuItem *ngIf="c.organizationId && accessEvents" (click)="events(c)">
              <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
              {{ "eventLogs" | i18n }}
            </button>
-            <button bit-menu-item (click)="restore(c)" *ngIf="c.isDeleted">
+            <button bitMenuItem (click)="restore(c)" *ngIf="c.isDeleted">
              <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
              {{ "restore" | i18n }}
            </button>
-            <button bit-menu-item (click)="delete(c)">
+            <button bitMenuItem (click)="delete(c)">
              <span class="tw-text-danger">
                <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                {{ (c.isDeleted ? "permanentlyDelete" : "delete") | i18n }}
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -4163,7 +4163,7 @@
    "message": "Password reset success!"
  },
  "resetPasswordEnrollmentWarning": {
-    "message": "Enrollment will allow organization administrators to change your master password. Are you sure you want to enroll?"
+    "message": "Enrollment will allow organization administrators to change your master password"
  },
  "resetPasswordPolicy": {
    "message": "Master Password Reset"
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -204,8 +204,60 @@ const devServer =
            return [
              {
                key: "Content-Security-Policy",
-                value:
-                  "default-src 'self'; script-src 'self' 'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w=' https://js.stripe.com https://js.braintreegateway.com https://www.paypalobjects.com; style-src 'self' https://assets.braintreegateway.com https://*.paypal.com 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='; img-src 'self' data: https://icons.bitwarden.net https://*.paypal.com https://www.paypalobjects.com https://q.stripe.com https://haveibeenpwned.com https://www.gravatar.com; child-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; frame-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; connect-src 'self' wss://notifications.bitwarden.com https://notifications.bitwarden.com https://cdn.bitwarden.net https://api.pwnedpasswords.com https://2fa.directory/api/v3/totp.json https://api.stripe.com https://www.paypal.com https://api.braintreegateway.com https://client-analytics.braintreegateway.com https://*.braintree-api.com https://*.blob.core.windows.net https://app.simplelogin.io/api/alias/random/new https://app.anonaddy.com/api/v1/aliases; object-src 'self' blob:;",
+                value: `
+                  default-src 'self'; 
+                  script-src 
+                    'self'
+                    'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w='
+                    https://js.stripe.com
+                    https://js.braintreegateway.com
+                    https://www.paypalobjects.com;
+                  style-src
+                    'self'
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
+                    'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4=';
+                    'sha256-0xHKHIT3+e2Gknxsm/cpErSprhL+o254L/y5bljg74U='
+                  img-src
+                    'self'
+                    data:
+                      https://icons.bitwarden.net
+                      https://*.paypal.com
+                      https://www.paypalobjects.com
+                      https://q.stripe.com
+                      https://haveibeenpwned.com
+                      https://www.gravatar.com;
+                  child-src
+                    'self'
+                    https://js.stripe.com
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    https://*.duosecurity.com;
+                  frame-src
+                    'self'
+                    https://js.stripe.com
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    https://*.duosecurity.com;
+                  connect-src
+                    'self'
+                    wss://notifications.bitwarden.com
+                    https://notifications.bitwarden.com
+                    https://cdn.bitwarden.net
+                    https://api.pwnedpasswords.com
+                    https://2fa.directory/api/v3/totp.json
+                    https://api.stripe.com
+                    https://www.paypal.com
+                    https://api.braintreegateway.com
+                    https://client-analytics.braintreegateway.com
+                    https://*.braintree-api.com
+                    https://*.blob.core.windows.net
+                    https://app.simplelogin.io/api/alias/random/new
+                    https://app.anonaddy.com/api/v1/aliases;
+                  object-src 
+                    'self'
+                    blob:;`,
              },
            ];
          }
Author	SHA1	Message	Date
github-actions[bot]	ee4afdd0f2	Bumped version to 2022.5.2 (#1730 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-06-07 13:04:54 -07:00
github-actions[bot]	6da0925374	Bumped version to 2022.5.1 (#1727 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-06-07 11:47:12 -07:00
Addison Beck	c233afcdf5	[fix] Pull org admin vault collections directly from the API (#1700 ) * [fix] Pull org admin vault collections directly from the API * [refactor] Establish pattern for interfaces in module scoped services * [fix] Remove access modifiers from constructor params for an extended service * [fix] Rename skipFilterCollectionRefresh to firstLoaded * [fix] Simplify hiding unwanted filters in the org vault * Revert "[refactor] Establish pattern for interfaces in module scoped services" This reverts commit `f1edae5a3e`. * Update src/app/modules/vault-filter/vault-filter.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Update src/app/modules/vault-filter/organization-vault-filter.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [fix] Ran prettier Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>	2022-06-06 13:28:10 -04:00
Oscar Hinton	e1ffca07ba	Add archive notice (#1724 )	2022-06-02 09:09:08 -04:00
Oscar Hinton	fb35805202	[CL-38] Follow Angular styleguide naming convention (#1655 )	2022-06-02 11:34:27 +02:00
dwbit	b6b7298980	Adding missing code for Serbian Latin (#1713 )	2022-06-02 11:23:48 +02:00
Kyle Spearrin	52406bc969	Allow firefox relay service in generator (#1723 ) * Allow firefox relay service in generator * Update generator.component.ts * Update generator.component.ts * make pretty	2022-06-01 20:33:06 -04:00
Thomas Rittson	d7dd2435fc	Fix Manage SSO permissions (#1709 )	2022-06-02 07:20:07 +10:00
Matt Gibson	ae3788d42b	[PS-616] Feature/require auth for enroll password reset (#1698 ) * Make enrollment a modal component * Add verification to org user module * Move enroll to component * Update warning for modal * update jslib * Use ModalRef to close the modal * Use bit-button	2022-06-01 09:04:49 -05:00
Jordan Cooks	0e62e2ec2b	Link to correct doc for Org User Types (#1676 ) Help center document linked is for the Provider Portal; this modal is for Organization Users. Correcting link to help docs.	2022-06-01 15:47:49 +02:00
Daniel James Smith	95d177da38	Fix expanding/collapsing of nested collections (#1722 )	2022-06-01 14:46:48 +02:00
Joseph Flinn	ad0512e344	Version check typo (#1717 ) * fixing dumb issue * Fixing another dumb mistake	2022-05-31 18:08:32 -07:00
Joseph Flinn	8fe9504cd1	Updating the path for the Release Version Check (#1716 )	2022-05-31 17:48:59 -07:00
Joseph Flinn	b8aa25b981	Updating the version check to the new Github action (#1714 ) * Updating the version check to the new Github action * Update .github/workflows/release.yml Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com> * switching action branch tag to commit tag Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>	2022-05-31 16:11:26 -07:00
github-actions[bot]	5d09ddbc8d	Bumped version to 2022.05.0 (#1715 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2022-05-31 15:41:37 -07:00
Gbubemi Smith	bde9a28f2b	sync jslib master (#1712 )	2022-05-30 10:56:14 +01:00
Gbubemi Smith	dfb03a53c0	sync jslib master (#1711 )	2022-05-27 17:28:16 +01:00
Thomas Rittson	b98b391283	Update jslib (#1710 )	2022-05-27 13:11:41 +10:00
Gbubemi Smith	f195aee90c	Revert "[ps-136] Igonre accented characters in vault search (#1690 )" (#1706 ) This reverts commit `58d9ac5ebc`.	2022-05-26 10:05:36 +01:00
Thomas Rittson	eefcda7e41	[EC-177] Update Key Connector error message (#1705 ) * Update Key Connector error message * Update jslib	2022-05-26 07:00:59 +10:00
Thomas Avery	42cd171685	Swap to heading tags on presented headings (#1707 )	2022-05-25 15:10:13 -05:00
Robyn MacCallum	8ef27713f1	[SG-345] Switch in-line "+" add org button to more explicit version (#1703 ) * switch in-line plus add org button to more explicit version * Add spaces to line up text better	2022-05-25 10:18:00 -04:00
Robyn MacCallum	57b647bde5	Fix 'Link SSO' not appearing (#1702 )	2022-05-23 19:41:21 -04:00
Robyn MacCallum	681ace4b1b	Use vaultFilter cipher type (#1701 )	2022-05-23 16:09:52 -04:00
Gbubemi Smith	58d9ac5ebc	[ps-136] Igonre accented characters in vault search (#1690 ) * removed accented character from serach input field * updated jslib	2022-05-20 15:22:44 +01:00
André Filipe da Silva Bispo	eab478da0c	PS-502: Remove extraneous comma from web vault footer (#1697 ) - removed comma from footer files Co-authored-by: André Bispo <abispo@bitwarden.com>	2022-05-19 18:30:38 +01:00
Matt Gibson	5a78853de5	[PS-655] Add `Organization_SponsorshipsSynced` event type. (#1696 ) * Add `Organization_SponsorshipsSynced` event type. Update events display to handle events triggered by installations rather than users * Update jslib	2022-05-19 10:28:26 -05:00
Robyn MacCallum	b4ddce1da2	Make spacing match other rows in vault filter (#1695 ) * Make spacing match other rows in vault filter * Add spaces in headings	2022-05-18 10:12:01 -04:00
Addison Beck	6ee47f0057	[fix] Remove function implementation that was moved to jslib (#1692 ) * [fix] Remove function implementation that was moved to jslib * [dep] Update jslib	2022-05-17 21:08:39 -04:00
Oscar Hinton	7b55c8ad1a	[EC-203] Add logic for falling back to the users vault (#1688 ) * Add logic for falling back to the users vault * Update error message * Add jira ticket	2022-05-17 12:46:42 -04:00
Robyn MacCallum	30057d2ac4	Fix switcher not appearing for users affected by single org policy (#1689 )	2022-05-17 10:04:43 -04:00
Robyn MacCallum	6f7b712bc7	[SG-16] Fix various small bugs (#1686 ) * Fix all items showing in No Folder * Fix folders not showing for orgs * Fix missing toasts if there are errors with org options	2022-05-17 09:20:39 -04:00
Justin Baur	45da771404	Fix Defects (#1683 )	2022-05-16 09:45:35 -04:00
Jake Fink	902c620eb6	change revoke text (#1684 )	2022-05-16 09:08:25 -04:00
Matt Gibson	ca35ccbd35	PS-515 Fix/org users list performance (#1673 ) * [PS-515] Use virtual scroll to speed up long user lists WIP: this is currently showing a large blank area under the last user. Need to figure out why virtual-scroll-spacer is sized too large. * Fix cdk-virtual-scroll styling * Format csp for readability * Set Viewport height The viewport height was * Calculate viewport height from item size Virtual scroll viewports need set heights, we can emulate the old modal behavior by calculating an approximate height required by the viewport to display all items. It will not go beyond the window due to the `.modal-dialog-scrollable` class * Remove modal css changes * pr review	2022-05-13 15:52:58 -04:00
Kyle Spearrin	85aa4274f3	remove hostname from simplelogin. update jslib (#1679 )	2022-05-13 15:36:37 -04:00
Addison Beck	ffb63a1cc7	[fix] Various Trash filter bugs from EUVR (#1681 ) * [fix] Hide the Add Item button when filtering for trash * [fix] Use correct bulk actions for trash filter	2022-05-13 15:14:51 -04:00
Addison Beck	3501be9484	[fix] Add max width to vault filter buttons to keep content unified (#1678 )	2022-05-13 15:14:39 -04:00
Addison Beck	5d1522b77a	[fix] Check policies when reloading organizations for filters (#1677 )	2022-05-13 15:14:27 -04:00
Oscar Hinton	be30d47038	[EC-200] Handle an edge case where ciphers were not selectable (#1674 )	2022-05-13 15:32:15 +02:00
Thomas Rittson	888892b3e7	Revert accidental cnesting of org routes (#1670 )	2022-05-13 08:31:30 +10:00
Oscar Hinton	f4f3e8c574	[SG-279] Fix unlock button not working after logging in through SSO (#1672 )	2022-05-12 16:21:50 +02:00
Oscar Hinton	3367736c7e	[SG-267] Exposed passwords report: console error (#1671 )	2022-05-12 15:47:18 +02:00
Vincent Salucci	e3e7fce70a	[bug:euvr] Self-hosted instance hiding subscription nav item (#1669 )	2022-05-12 08:43:27 -04:00
Thomas Rittson	74bdfe2602	Fix permission checking when accessing manage SSO (#1663 )	2022-05-12 09:12:02 +10:00
Thomas Rittson	9e01d47a3f	Update Go Premium link (#1660 )	2022-05-12 06:53:18 +10:00
Vincent Salucci	67de7d4bfb	[bug:euvr] Change password init fix (#1667 )	2022-05-11 15:39:56 -04:00
Vincent Salucci	f5245a280e	[bug:euvr] Create Organization Updates (#1664 )	2022-05-11 15:39:39 -04:00
Addison Beck	1dc9502676	[fix] Update the navbar when creating an organization for the first time (#1668 )	2022-05-11 14:10:02 -04:00
Robyn MacCallum	ccf0d64a7b	Use correct localization string (#1665 )	2022-05-11 13:32:42 -04:00
Jake Fink	dc2078ae58	add better error handling to tax call (#1666 )	2022-05-11 11:13:42 -04:00
Thomas Rittson	da470ad709	[SG-234] Fix account menu icon colour (#1653 )	2022-05-11 08:38:45 +10:00