Merge branch 'master' into feature/org-admin-refresh

2025-12-15 15:53:27 +00:00 · 2022-12-14 11:09:43 -08:00
parent 2442fe146a 1c94844bc9
commit 443b3e0367
32 changed files with 297 additions and 169 deletions
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bitwarden/browser",
-  "version": "2022.10.2",
+  "version": "2022.12.0",
  "scripts": {
    "build": "webpack",
    "build:mv3": "cross-env MANIFEST_VERSION=3 webpack",
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
  "manifest_version": 2,
  "name": "__MSG_extName__",
  "short_name": "__MSG_appName__",
-  "version": "2022.10.2",
+  "version": "2022.12.0",
  "description": "__MSG_extDesc__",
  "default_locale": "en",
  "author": "Bitwarden Inc.",
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
  "minimum_chrome_version": "102.0",
  "name": "__MSG_extName__",
  "short_name": "__MSG_appName__",
-  "version": "2022.10.2",
+  "version": "2022.12.0",
  "description": "__MSG_extDesc__",
  "default_locale": "en",
  "author": "Bitwarden Inc.",
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -19,7 +19,7 @@
    "**/node_modules/@bitwarden/desktop-native/index.js",
    "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node"
  ],
-  "electronVersion": "19.0.8",
+  "electronVersion": "21.3.1",
  "generateUpdatesFilesForAllChannels": true,
  "publish": {
    "provider": "generic",
--- 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.11.1",
+  "version": "2022.12.1",
  "keywords": [
    "bitwarden",
    "password",
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@bitwarden/desktop",
-  "version": "2022.11.1",
+  "version": "2022.12.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@bitwarden/desktop",
-      "version": "2022.11.1",
+      "version": "2022.12.1",
      "license": "GPL-3.0",
      "dependencies": {
        "@bitwarden/desktop-native": "file:../desktop_native"
--- 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.11.1",
+  "version": "2022.12.1",
  "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
  "homepage": "https://bitwarden.com",
  "license": "GPL-3.0",
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bitwarden/web-vault",
-  "version": "2022.11.2",
+  "version": "2022.12.0",
  "scripts": {
    "build:oss": "webpack",
    "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -140,7 +140,8 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
    confirmText?: string,
    cancelText?: string,
    type?: string,
-    bodyIsHtml = false
+    bodyIsHtml = false,
+    target?: string
  ) {
    let iconClasses: string = null;
    if (type != null) {
@@ -182,6 +183,7 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
      cancelButtonText: cancelText,
      showConfirmButton: true,
      confirmButtonText: confirmText == null ? this.i18nService.t("ok") : confirmText,
+      target: target != null ? target : "body",
    });

    if (bootstrapModal != null) {
--- a/apps/web/src/app/organizations/manage/group-add-edit.component.ts
+++ b/apps/web/src/app/organizations/manage/group-add-edit.component.ts
@@ -267,7 +267,9 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
      this.group.name,
      this.i18nService.t("yes"),
      this.i18nService.t("no"),
-      "warning"
+      "warning",
+      false,
+      "app-group-add-edit .modal-content"
    );
    if (!confirmed) {
      return false;
--- a/apps/web/src/app/organizations/manage/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/organizations/manage/member-dialog/member-dialog.component.ts
@@ -237,7 +237,9 @@ export class MemberDialogComponent implements OnInit {
      this.i18nService.t("removeUserIdAccess", this.params.name),
      this.i18nService.t("yes"),
      this.i18nService.t("no"),
-      "warning"
+      "warning",
+      false,
+      "app-user-add-edit .modal-content"
    );
    if (!confirmed) {
      return false;
@@ -270,7 +272,9 @@ export class MemberDialogComponent implements OnInit {
      this.i18nService.t("revokeUserId", this.params.name),
      this.i18nService.t("revokeAccess"),
      this.i18nService.t("cancel"),
-      "warning"
+      "warning",
+      false,
+      "app-user-add-edit .modal-content"
    );
    if (!confirmed) {
      return false;
--- a/apps/web/src/app/organizations/vault/add-edit.component.ts
+++ b/apps/web/src/app/organizations/vault/add-edit.component.ts
@@ -29,6 +29,7 @@ import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.c
 })
 export class AddEditComponent extends BaseAddEditComponent {
  originalCipher: Cipher = null;
+  protected override componentName = "app-org-vault-add-edit";

  constructor(
    cipherService: CipherService,
--- a/apps/web/src/app/send/add-edit.component.ts
+++ b/apps/web/src/app/send/add-edit.component.ts
@@ -16,6 +16,8 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
  templateUrl: "add-edit.component.html",
 })
 export class AddEditComponent extends BaseAddEditComponent {
+  override componentName = "app-send-add-edit";
+
  constructor(
    i18nService: I18nService,
    platformUtilsService: PlatformUtilsService,
--- a/apps/web/src/app/settings/emergency-add-edit.component.ts
+++ b/apps/web/src/app/settings/emergency-add-edit.component.ts
@@ -26,6 +26,7 @@ import { AddEditComponent as BaseAddEditComponent } from "../vault/add-edit.comp
 export class EmergencyAddEditComponent extends BaseAddEditComponent {
  originalCipher: Cipher = null;
  viewOnly = true;
+  protected override componentName = "app-org-vault-add-edit";

  constructor(
    cipherService: CipherService,
--- a/apps/web/src/app/vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/add-edit.component.ts
@@ -37,6 +37,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
  viewOnly = false;

  protected totpInterval: number;
+  protected override componentName = "app-vault-add-edit";

  constructor(
    cipherService: CipherService,
--- a/apps/web/src/app/vault/attachments.component.ts
+++ b/apps/web/src/app/vault/attachments.component.ts
@@ -17,6 +17,7 @@ import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
 })
 export class AttachmentsComponent extends BaseAttachmentsComponent {
  viewOnly = false;
+  protected override componentName = "app-vault-attachments";

  constructor(
    cipherService: CipherService,
--- a/apps/web/src/app/vault/folder-add-edit.component.ts
+++ b/apps/web/src/app/vault/folder-add-edit.component.ts
@@ -12,6 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
  templateUrl: "folder-add-edit.component.html",
 })
 export class FolderAddEditComponent extends BaseFolderAddEditComponent {
+  protected override componentName = "app-folder-add-edit";
  constructor(
    folderService: FolderService,
    folderApiService: FolderApiServiceAbstraction,