From 677829f03af26b36bc8bb2730a962798511b8032 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Thu, 12 Sep 2024 09:51:26 -0700 Subject: [PATCH] handle registerRoute$ in secondary content --- .../login-secondary-content.component.ts | 22 +++++++++++++++---- .../src/angular/login/login.component.html | 19 ---------------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/libs/auth/src/angular/login/login-secondary-content.component.ts b/libs/auth/src/angular/login/login-secondary-content.component.ts index f4d32533c6..e3badc7df0 100644 --- a/libs/auth/src/angular/login/login-secondary-content.component.ts +++ b/libs/auth/src/angular/login/login-secondary-content.component.ts @@ -1,16 +1,30 @@ -import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { Component, inject } from "@angular/core"; import { RouterModule } from "@angular/router"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { RegisterRouteService } from "@bitwarden/auth/common"; @Component({ standalone: true, - imports: [JslibModule, RouterModule], + imports: [CommonModule, JslibModule, RouterModule], template: `
{{ "newToBitwarden" | i18n }} - {{ "createAccount" | i18n }} + {{ + "createAccount" | i18n + }}
`, }) -export class LoginSecondaryContentComponent {} +export class LoginSecondaryContentComponent { + registerRouteService = inject(RegisterRouteService); + + // TODO: remove when email verification flag is removed + protected registerRoute$ = this.registerRouteService.registerRoute$(); + + // TODO-rr-bw: In the original login implementation, the "Create account" link + // also passes the email address to the registration page. We need to find a way to + // do this now that the "Create account" link is in a separate component as + // secondary content. +} diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html index 07f0190c14..be861e8471 100644 --- a/libs/auth/src/angular/login/login.component.html +++ b/libs/auth/src/angular/login/login.component.html @@ -74,25 +74,6 @@ {{ "logInWithPasskey" | i18n }} - - - - - -