Merge branch 'main' into tools/PM-6819/reactive-generator

apps/browser/src/_locales/en/messages.json

@@ -3148,5 +3148,8 @@
  },
  "errorAssigningTargetFolder": {
  "message": "Error assigning target folder."
+ },
+ "new": {
+ "message": "New"
  }
 }

apps/browser/src/auth/popup/account-switching/current-account.component.ts

@@ -1,13 +1,15 @@
-import { Location } from "@angular/common";
+import { CommonModule, Location } from "@angular/common";
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Observable, combineLatest, switchMap } from "rxjs";
 
+import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { UserId } from "@bitwarden/common/types/guid";
+import { AvatarModule } from "@bitwarden/components";
 
 export type CurrentAccount = {
  id: UserId;
@@ -20,6 +22,8 @@ export type CurrentAccount = {
 @Component({
  selector: "app-current-account",
  templateUrl: "current-account.component.html",
+ standalone: true,
+ imports: [CommonModule, JslibModule, AvatarModule],
 })
 export class CurrentAccountComponent {
  currentAccount$: Observable<CurrentAccount>;

apps/browser/src/auth/popup/login-via-auth-request.component.ts

@@ -20,7 +20,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -44,7 +43,6 @@ export class LoginViaAuthRequestComponent extends BaseLoginWithDeviceComponent {
  platformUtilsService: PlatformUtilsService,
  anonymousHubService: AnonymousHubService,
  validationService: ValidationService,
- stateService: StateService,
  loginEmailService: LoginEmailServiceAbstraction,
  syncService: SyncService,
  deviceTrustService: DeviceTrustServiceAbstraction,
@@ -67,12 +65,11 @@ export class LoginViaAuthRequestComponent extends BaseLoginWithDeviceComponent {
  platformUtilsService,
  anonymousHubService,
  validationService,
- stateService,
+ accountService,
  loginEmailService,
  deviceTrustService,
  authRequestService,
  loginStrategyService,
- accountService,
  );
  super.onSuccessfulLogin = async () => {
  await syncService.fullSync(true);

apps/browser/src/background/main.background.ts

@@ -109,6 +109,7 @@ import { DefaultConfigService } from "@bitwarden/common/platform/services/config
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
+import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
 import { Fido2AuthenticatorService } from "@bitwarden/common/platform/services/fido2/fido2-authenticator.service";
 import { Fido2ClientService } from "@bitwarden/common/platform/services/fido2/fido2-client.service";
 import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service";
@@ -218,7 +219,6 @@ import { BrowserCryptoService } from "../platform/services/browser-crypto.servic
 import { BrowserEnvironmentService } from "../platform/services/browser-environment.service";
 import BrowserLocalStorageService from "../platform/services/browser-local-storage.service";
 import BrowserMemoryStorageService from "../platform/services/browser-memory-storage.service";
-import { BrowserMultithreadEncryptServiceImplementation } from "../platform/services/browser-multithread-encrypt.service.implementation";
 import { BrowserScriptInjectorService } from "../platform/services/browser-script-injector.service";
 import { DefaultBrowserStateService } from "../platform/services/default-browser-state.service";
 import I18nService from "../platform/services/i18n.service";
@@ -477,14 +477,14 @@ export default class MainBackground {
  storageServiceProvider,
  );
 
- this.encryptService = flagEnabled("multithreadDecryption")
- ? new BrowserMultithreadEncryptServiceImplementation(
-  this.cryptoFunctionService,
- this.logService,
- true,
- this.offscreenDocumentService,
- )
- : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true);
+ this.encryptService =
+ flagEnabled("multithreadDecryption") && BrowserApi.isManifestVersion(2)
+ ? new MultithreadEncryptServiceImplementation(
+  this.cryptoFunctionService,
+  this.logService,
+  true,
+  )
+  : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true);
 
  this.singleUserStateProvider = new DefaultSingleUserStateProvider(
  storageServiceProvider,

apps/browser/src/platform/offscreen-document/abstractions/offscreen-document.ts

@@ -2,7 +2,6 @@ export type OffscreenDocumentExtensionMessage = {
  [key: string]: any;
  command: string;
  text?: string;
- decryptRequest?: string;
 };
 
 type OffscreenExtensionMessageEventParams = {
@@ -14,7 +13,6 @@ export type OffscreenDocumentExtensionMessageHandlers = {
  [key: string]: ({ message, sender }: OffscreenExtensionMessageEventParams) => any;
  offscreenCopyToClipboard: ({ message }: OffscreenExtensionMessageEventParams) => any;
  offscreenReadFromClipboard: () => any;
- offscreenDecryptItems: ({ message }: OffscreenExtensionMessageEventParams) => Promise<string>;
 };
 
 export interface OffscreenDocument {

apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts

@@ -1,25 +1,7 @@
-import { mock } from "jest-mock-extended";
-
-import { Decryptable } from "@bitwarden/common/platform/interfaces/decryptable.interface";
-import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-
 import { flushPromises, sendExtensionRuntimeMessage } from "../../autofill/spec/testing-utils";
 import { BrowserApi } from "../browser/browser-api";
 import BrowserClipboardService from "../services/browser-clipboard.service";
 
-jest.mock(
- "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation",
- () => ({
- MultithreadEncryptServiceImplementation: class MultithreadEncryptServiceImplementation {
- getDecryptedItemsFromWorker = async <T extends InitializerMetadata>(
- items: Decryptable<T>[],
- _key: SymmetricCryptoKey,
- ): Promise<string> => JSON.stringify(items);
- },
- }),
-);
-
 describe("OffscreenDocument", () => {
  const browserApiMessageListenerSpy = jest.spyOn(BrowserApi, "messageListener");
  const browserClipboardServiceCopySpy = jest.spyOn(BrowserClipboardService, "copy");
@@ -78,37 +60,5 @@ describe("OffscreenDocument", () => {
  expect(browserClipboardServiceReadSpy).toHaveBeenCalledWith(window);
  });
  });
-
- describe("handleOffscreenDecryptItems", () => {
- it("returns an empty array as a string if the decrypt request is not present in the message", async () => {
- let response: string | undefined;
- sendExtensionRuntimeMessage(
- { command: "offscreenDecryptItems" },
- mock<chrome.runtime.MessageSender>(),
- (res: string) => (response = res),
- );
- await flushPromises();
-
- expect(response).toBe("[]");
- });
-
- it("decrypts the items and sends back the response as a string", async () => {
- const items = [{ id: "test" }];
- const key = { id: "test" };
- const decryptRequest = JSON.stringify({ items, key });
- let response: string | undefined;
-
- sendExtensionRuntimeMessage(
- { command: "offscreenDecryptItems", decryptRequest },
- mock<chrome.runtime.MessageSender>(),
- (res: string) => {
- response = res;
- },
- );
- await flushPromises();
-
- expect(response).toBe(JSON.stringify(items));
- });
- });
  });
 });

apps/browser/src/platform/offscreen-document/offscreen-document.ts

@@ -1,35 +1,21 @@
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
-import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
-import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
 
 import { BrowserApi } from "../browser/browser-api";
 import BrowserClipboardService from "../services/browser-clipboard.service";
 
 import {
- OffscreenDocument as OffscreenDocumentInterface,
  OffscreenDocumentExtensionMessage,
  OffscreenDocumentExtensionMessageHandlers,
+ OffscreenDocument as OffscreenDocumentInterface,
 } from "./abstractions/offscreen-document";
 
 class OffscreenDocument implements OffscreenDocumentInterface {
- private readonly consoleLogService: ConsoleLogService;
- private encryptService: MultithreadEncryptServiceImplementation;
+ private consoleLogService: ConsoleLogService = new ConsoleLogService(false);
  private readonly extensionMessageHandlers: OffscreenDocumentExtensionMessageHandlers = {
  offscreenCopyToClipboard: ({ message }) => this.handleOffscreenCopyToClipboard(message),
  offscreenReadFromClipboard: () => this.handleOffscreenReadFromClipboard(),
- offscreenDecryptItems: ({ message }) => this.handleOffscreenDecryptItems(message),
  };
 
- constructor() {
- const cryptoFunctionService = new WebCryptoFunctionService(self);
- this.consoleLogService = new ConsoleLogService(false);
- this.encryptService = new MultithreadEncryptServiceImplementation(
- cryptoFunctionService,
- this.consoleLogService,
- true,
- );
- }
-
  /**
  * Initializes the offscreen document extension.
  */
@@ -53,23 +39,6 @@ class OffscreenDocument implements OffscreenDocumentInterface {
  return await BrowserClipboardService.read(self);
  }
 
- /**
- * Decrypts the items in the message using the encrypt service.
- *
- * @param message - The extension message containing the items to decrypt
- */
- private async handleOffscreenDecryptItems(
- message: OffscreenDocumentExtensionMessage,
- ): Promise<string> {
- const { decryptRequest } = message;
- if (!decryptRequest) {
- return "[]";
- }
-
- const request = JSON.parse(decryptRequest);
- return await this.encryptService.getDecryptedItemsFromWorker(request.items, request.key);
- }
-
  /**
  * Sets up the listener for extension messages.
  */

apps/browser/src/platform/popup/components/pop-out.component.html

@@ -1,5 +1,15 @@
-<ng-container *ngIf="show">
+<ng-container *ngIf="show && !useRefreshVariant">
  <button type="button" (click)="expand()" appA11yTitle="{{ 'popOutNewWindow' | i18n }}">
  <i class="bwi bwi-external-link bwi-rotate-270 bwi-lg bwi-fw" aria-hidden="true"></i>
  </button>
 </ng-container>
+<ng-container *ngIf="show && useRefreshVariant">
+ <button
+ bitIconButton="bwi-popout"
+ size="small"
+ type="button"
+ appA11yTitle="{{ 'popOutNewWindow' | i18n }}"
+ [title]="'popOutNewWindow' | i18n"
+ (click)="expand()"
+ ></button>
+</ng-container>

apps/browser/src/platform/popup/components/pop-out.component.ts

@@ -2,22 +2,31 @@ import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { IconButtonModule } from "@bitwarden/components";
 
 import BrowserPopupUtils from "../browser-popup-utils";
 
 @Component({
  selector: "app-pop-out",
  templateUrl: "pop-out.component.html",
  standalone: true,
- imports: [CommonModule, JslibModule],
+ imports: [CommonModule, JslibModule, IconButtonModule],
 })
 export class PopOutComponent implements OnInit {
  @Input() show = true;
+ useRefreshVariant = false;
 
- constructor(private platformUtilsService: PlatformUtilsService) {}
+ constructor(
+ private platformUtilsService: PlatformUtilsService,
+ private configService: ConfigService,
+ ) {}
+
+ async ngOnInit() {
+ this.useRefreshVariant = await this.configService.getFeatureFlag(FeatureFlag.ExtensionRefresh);
 
- ngOnInit() {
  if (this.show) {
  if (
  (BrowserPopupUtils.inSidebar(window) && this.platformUtilsService.isFirefox()) ||