Merge branch 'main' into ps/extension-refresh

libs/angular/src/auth/components/two-factor-auth/two-factor-auth-duo.component.html

@@ -0,0 +1,6 @@
+<ng-container>
+  <p bitTypography="body1" class="tw-mb-0">
+    {{ "duoRequiredByOrgForAccount" | i18n }}
+  </p>
+  <p bitTypography="body1">{{ "launchDuoAndFollowStepsToFinishLoggingIn" | i18n }}</p>
+</ng-container>

libs/angular/src/auth/components/two-factor-auth/two-factor-auth-duo.component.ts

@@ -0,0 +1,79 @@
+import { DialogModule } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { ReactiveFormsModule, FormsModule } from "@angular/forms";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  ButtonModule,
+  LinkModule,
+  TypographyModule,
+  FormFieldModule,
+  AsyncActionsModule,
+  ToastService,
+} from "@bitwarden/components";
+
+@Component({
+  standalone: true,
+  selector: "app-two-factor-auth-duo",
+  templateUrl: "two-factor-auth-duo.component.html",
+  imports: [
+    CommonModule,
+    JslibModule,
+    DialogModule,
+    ButtonModule,
+    LinkModule,
+    TypographyModule,
+    ReactiveFormsModule,
+    FormFieldModule,
+    AsyncActionsModule,
+    FormsModule,
+  ],
+  providers: [I18nPipe],
+})
+export class TwoFactorAuthDuoComponent {
+  @Output() token = new EventEmitter<string>();
+  @Input() providerData: any;
+
+  duoFramelessUrl: string = null;
+  duoResultListenerInitialized = false;
+
+  constructor(
+    protected i18nService: I18nService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected toastService: ToastService,
+  ) {}
+
+  async ngOnInit(): Promise<void> {
+    await this.init();
+  }
+
+  async init() {
+    // Setup listener for duo-redirect.ts connector to send back the code
+    if (!this.duoResultListenerInitialized) {
+      // setup client specific duo result listener
+      this.setupDuoResultListener();
+      this.duoResultListenerInitialized = true;
+    }
+
+    // flow must be launched by user so they can choose to remember the device or not.
+    this.duoFramelessUrl = this.providerData.AuthUrl;
+  }
+
+  // Each client will have own implementation
+  protected setupDuoResultListener(): void {}
+  async launchDuoFrameless(): Promise<void> {
+    if (this.duoFramelessUrl === null) {
+      this.toastService.showToast({
+        variant: "error",
+        title: null,
+        message: this.i18nService.t("duoHealthCheckResultsInNullAuthUrlError"),
+      });
+      return;
+    }
+    this.platformUtilsService.launchUri(this.duoFramelessUrl);
+  }
+}

libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html

@@ -16,6 +16,15 @@
       (token)="token = $event; submitForm()"
       *ngIf="selectedProviderType === providerType.WebAuthn"
     />
+    <app-two-factor-auth-duo
+      (token)="token = $event; submitForm()"
+      [providerData]="providerData"
+      *ngIf="
+        selectedProviderType === providerType.OrganizationDuo ||
+        selectedProviderType === providerType.Duo
+      "
+      #duoComponent
+    />
     <bit-form-control *ngIf="selectedProviderType != null">
       <bit-label>{{ "rememberMe" | i18n }}</bit-label>
       <input type="checkbox" bitCheckbox formControlName="remember" />
@@ -35,10 +44,28 @@
         buttonType="primary"
         bitButton
         bitFormButton
-        *ngIf="selectedProviderType != null && selectedProviderType !== providerType.WebAuthn"
+        *ngIf="
+          selectedProviderType != null &&
+          selectedProviderType !== providerType.WebAuthn &&
+          selectedProviderType !== providerType.Duo &&
+          selectedProviderType !== providerType.OrganizationDuo
+        "
       >
         <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ actionButtonText }} </span>
       </button>
+      <button
+        type="button"
+        buttonType="primary"
+        bitButton
+        (click)="launchDuo()"
+        *ngIf="
+          selectedProviderType === providerType.Duo ||
+          selectedProviderType === providerType.OrganizationDuo
+        "
+      >
+        <span> <i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "launchDuo" | i18n }}</span>
+      </button>
+
       <a routerLink="/login" bitButton buttonType="secondary">
         {{ "cancel" | i18n }}
       </a>

libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from "@angular/common";
-import { Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import { ActivatedRoute, NavigationExtras, Router, RouterLink } from "@angular/router";
 import { Subject, takeUntil, lastValueFrom, first, firstValueFrom } from "rxjs";
@@ -39,6 +39,7 @@ import {
 import { CaptchaProtectedComponent } from "../captcha-protected.component";
 
 import { TwoFactorAuthAuthenticatorComponent } from "./two-factor-auth-authenticator.component";
+import { TwoFactorAuthDuoComponent } from "./two-factor-auth-duo.component";
 import { TwoFactorAuthEmailComponent } from "./two-factor-auth-email.component";
 import { TwoFactorAuthWebAuthnComponent } from "./two-factor-auth-webauthn.component";
 import { TwoFactorAuthYubikeyComponent } from "./two-factor-auth-yubikey.component";
@@ -63,6 +64,7 @@ import {
     TwoFactorOptionsComponent,
     TwoFactorAuthAuthenticatorComponent,
     TwoFactorAuthEmailComponent,
+    TwoFactorAuthDuoComponent,
     TwoFactorAuthYubikeyComponent,
     TwoFactorAuthWebAuthnComponent,
   ],
@@ -78,6 +80,7 @@ export class TwoFactorAuthComponent extends CaptchaProtectedComponent implements
   selectedProviderType: TwoFactorProviderType = TwoFactorProviderType.Authenticator;
   providerData: any;
 
+  @ViewChild("duoComponent") duoComponent!: TwoFactorAuthDuoComponent;
   formGroup = this.formBuilder.group({
     token: [
       "",
@@ -220,6 +223,12 @@ export class TwoFactorAuthComponent extends CaptchaProtectedComponent implements
     }
   }
 
+  async launchDuo() {
+    if (this.duoComponent != null) {
+      await this.duoComponent.launchDuoFrameless();
+    }
+  }
+
   protected handleMigrateEncryptionKey(result: AuthResult): boolean {
     if (!result.requiresEncryptionKeyMigration) {
       return false;

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

@@ -1050,6 +1050,7 @@ const safeProviders: SafeProvider[] = [
       SECURE_STORAGE,
       UserDecryptionOptionsServiceAbstraction,
       LogService,
+      ConfigService,
     ],
   }),
   safeProvider({

libs/angular/src/tools/generator/components/generator.component.ts

@@ -151,9 +151,6 @@ export class GeneratorComponent implements OnInit, OnDestroy {
       this.usernameOptions.subaddressType = this.usernameOptions.catchallType = "random";
     } else {
       this.usernameOptions.website = this.usernameWebsite;
-      const websiteOption = { name: this.i18nService.t("websiteName"), value: "website-name" };
-      this.subaddressOptions.push(websiteOption);
-      this.catchallOptions.push(websiteOption);
     }
   }
 
@@ -201,6 +198,12 @@ export class GeneratorComponent implements OnInit, OnDestroy {
         takeUntil(this.destroy$),
       ),
     );
+
+    if (this.usernameWebsite !== null) {
+      const websiteOption = { name: this.i18nService.t("websiteName"), value: "website-name" };
+      this.subaddressOptions.push(websiteOption);
+      this.catchallOptions.push(websiteOption);
+    }
   }
 
   ngOnDestroy() {