Merge remote-tracking branch 'origin' into auth/pm-18720/change-password-component-non-dialog-v2

libs/angular/src/auth/components/captcha-protected.component.ts

@@ -1,67 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, Input } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { CaptchaIFrame } from "@bitwarden/common/auth/captcha-iframe";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { ToastService } from "@bitwarden/components";
-
-@Directive()
-export abstract class CaptchaProtectedComponent {
-  @Input() captchaSiteKey: string = null;
-  captchaToken: string = null;
-  captcha: CaptchaIFrame;
-
-  constructor(
-    protected environmentService: EnvironmentService,
-    protected i18nService: I18nService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected toastService: ToastService,
-  ) {}
-
-  async setupCaptcha() {
-    const env = await firstValueFrom(this.environmentService.environment$);
-    const webVaultUrl = env.getWebVaultUrl();
-
-    this.captcha = new CaptchaIFrame(
-      window,
-      webVaultUrl,
-      this.i18nService,
-      (token: string) => {
-        this.captchaToken = token;
-      },
-      (error: string) => {
-        this.toastService.showToast({
-          variant: "error",
-          title: this.i18nService.t("errorOccurred"),
-          message: error,
-        });
-      },
-      (info: string) => {
-        this.toastService.showToast({
-          variant: "info",
-          title: this.i18nService.t("info"),
-          message: info,
-        });
-      },
-    );
-  }
-
-  showCaptcha() {
-    return !Utils.isNullOrWhitespace(this.captchaSiteKey);
-  }
-
-  protected handleCaptchaRequired(response: { captchaSiteKey: string }): boolean {
-    if (Utils.isNullOrWhitespace(response.captchaSiteKey)) {
-      return false;
-    }
-
-    this.captchaSiteKey = response.captchaSiteKey;
-    this.captcha.init(response.captchaSiteKey);
-    return true;
-  }
-}

libs/angular/src/directives/api-action.directive.ts

@@ -2,7 +2,6 @@
 // @ts-strict-ignore
 import { Directive, ElementRef, Input, OnChanges } from "@angular/core";
 
-import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 
@@ -39,11 +38,6 @@ export class ApiActionDirective implements OnChanges {
       },
       (e: any) => {
         this.el.nativeElement.loading = false;
-
-        if ((e as ErrorResponse).captchaRequired) {
-          this.logService.error("Captcha required error response: " + e.getSingleMessage());
-          return;
-        }
         this.logService?.error(`Received API exception:`, e);
         this.validationService.showError(e);
       },

libs/angular/src/scss/webfonts.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "DM Sans";
+  font-family: Roboto;
   src:
-    url("webfonts/dm-sans.woff2") format("woff2 supports variations"),
-    url("webfonts/dm-sans.woff2") format("woff2-variations");
+    url("webfonts/roboto.woff2") format("woff2 supports variations"),
+    url("webfonts/roboto.woff2") format("woff2-variations");
   font-display: swap;
   font-weight: 100 900;
 }

libs/angular/src/services/injection-tokens.ts

@@ -13,6 +13,7 @@ import {
 import { Theme } from "@bitwarden/common/platform/enums";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message } from "@bitwarden/common/platform/messaging";
+import { HttpOperations } from "@bitwarden/common/services/api.service";
 import { SafeInjectionToken } from "@bitwarden/ui-common";
 // Re-export the SafeInjectionToken from ui-common
 export { SafeInjectionToken } from "@bitwarden/ui-common";
@@ -61,3 +62,5 @@ export const REFRESH_ACCESS_TOKEN_ERROR_CALLBACK = new SafeInjectionToken<() =>
 export const ENV_ADDITIONAL_REGIONS = new SafeInjectionToken<RegionConfig[]>(
   "ENV_ADDITIONAL_REGIONS",
 );
+
+export const HTTP_OPERATIONS = new SafeInjectionToken<HttpOperations>("HTTP_OPERATIONS");

libs/angular/src/services/jslib-services.module.ts

@@ -339,6 +339,7 @@ import {
   CLIENT_TYPE,
   DEFAULT_VAULT_TIMEOUT,
   ENV_ADDITIONAL_REGIONS,
+  HTTP_OPERATIONS,
   INTRAPROCESS_MESSAGING_SUBJECT,
   LOCALES_DIRECTORY,
   LOCKED_CALLBACK,
@@ -702,6 +703,10 @@ const safeProviders: SafeProvider[] = [
     },
     deps: [ToastService, I18nServiceAbstraction],
   }),
+  safeProvider({
+    provide: HTTP_OPERATIONS,
+    useValue: { createRequest: (url, request) => new Request(url, request) },
+  }),
   safeProvider({
     provide: ApiServiceAbstraction,
     useClass: ApiService,
@@ -714,6 +719,7 @@ const safeProviders: SafeProvider[] = [
       LogService,
       LOGOUT_CALLBACK,
       VaultTimeoutSettingsService,
+      HTTP_OPERATIONS,
     ],
   }),
   safeProvider({