From 459301737723672b42f4aefae7f89e217521a4a9 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Sun, 4 Jan 2026 18:31:29 -0800 Subject: [PATCH] [PM-27086 TDE Offboarding] Add 'Old' suffix to old methods --- ...initial-password.service.implementation.ts | 9 ++++++--- .../set-initial-password.component.ts | 20 ++++++++++++++----- ...et-initial-password.service.abstraction.ts | 11 +++++++--- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts index c399a85b452..8722f339b4a 100644 --- a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts +++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts @@ -31,7 +31,7 @@ import { SetInitialPasswordService, SetInitialPasswordCredentials, SetInitialPasswordUserType, - SetInitialPasswordTdeOffboardingCredentials, + SetInitialPasswordTdeOffboardingCredentialsOld, } from "./set-initial-password.service.abstraction"; export class DefaultSetInitialPasswordService implements SetInitialPasswordService { @@ -320,8 +320,11 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi ); } - async setInitialPasswordTdeOffboarding( - credentials: SetInitialPasswordTdeOffboardingCredentials, + /** + * @deprecated To be removed in PM-28143 + */ + async setInitialPasswordTdeOffboardingOld( + credentials: SetInitialPasswordTdeOffboardingCredentialsOld, userId: UserId, ) { const { newMasterKey, newServerMasterKeyHash, newPasswordHint } = credentials; diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts index 9f8b231abb0..f4ed38464ef 100644 --- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts +++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts @@ -43,7 +43,7 @@ import { I18nPipe } from "@bitwarden/ui-common"; import { SetInitialPasswordCredentials, SetInitialPasswordService, - SetInitialPasswordTdeOffboardingCredentials, + SetInitialPasswordTdeOffboardingCredentialsOld, SetInitialPasswordUserType, } from "./set-initial-password.service.abstraction"; @@ -274,7 +274,14 @@ export class SetInitialPasswordComponent implements OnInit { await this.setInitialPassword(passwordInputResult); break; case SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER: - await this.setInitialPasswordTdeOffboarding(passwordInputResult); + // Remove wrapping "if" check and early return in PM-28143 + if (passwordInputResult.newApisFlagEnabled) { + // ... + return; + } + + await this.setInitialPasswordTdeOffboardingOld(passwordInputResult); // remove in PM-28143 + break; default: this.logService.error( @@ -333,7 +340,10 @@ export class SetInitialPasswordComponent implements OnInit { } } - private async setInitialPasswordTdeOffboarding(passwordInputResult: PasswordInputResult) { + /** + * @deprecated To be removed in PM-28143 + */ + private async setInitialPasswordTdeOffboardingOld(passwordInputResult: PasswordInputResult) { const ctx = "Could not set initial password."; assertTruthy(passwordInputResult.newMasterKey, "newMasterKey", ctx); assertTruthy(passwordInputResult.newServerMasterKeyHash, "newServerMasterKeyHash", ctx); @@ -341,13 +351,13 @@ export class SetInitialPasswordComponent implements OnInit { assertNonNullish(passwordInputResult.newPasswordHint, "newPasswordHint", ctx); // can have an empty string as a valid value, so check non-nullish try { - const credentials: SetInitialPasswordTdeOffboardingCredentials = { + const credentials: SetInitialPasswordTdeOffboardingCredentialsOld = { newMasterKey: passwordInputResult.newMasterKey, newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash, newPasswordHint: passwordInputResult.newPasswordHint, }; - await this.setInitialPasswordService.setInitialPasswordTdeOffboarding( + await this.setInitialPasswordService.setInitialPasswordTdeOffboardingOld( credentials, this.userId, ); diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts index 560af93a96c..52815e51bbd 100644 --- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts +++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts @@ -55,7 +55,10 @@ export interface SetInitialPasswordCredentials { salt: MasterPasswordSalt; } -export interface SetInitialPasswordTdeOffboardingCredentials { +/** + * @deprecated To be removed in PM-28143 + */ +export interface SetInitialPasswordTdeOffboardingCredentialsOld { newMasterKey: MasterKey; newServerMasterKeyHash: string; newPasswordHint: string; @@ -86,6 +89,8 @@ export abstract class SetInitialPasswordService { ) => Promise; /** + * @deprecated To be removed in PM-28143 + * * Sets an initial password for a user who logs in after their org offboarded from * trusted device encryption and is now a master-password-encryption org: * - {@link SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER} @@ -93,8 +98,8 @@ export abstract class SetInitialPasswordService { * @param passwordInputResult credentials object received from the `InputPasswordComponent` * @param userId the account `userId` */ - abstract setInitialPasswordTdeOffboarding: ( - credentials: SetInitialPasswordTdeOffboardingCredentials, + abstract setInitialPasswordTdeOffboardingOld: ( + credentials: SetInitialPasswordTdeOffboardingCredentialsOld, userId: UserId, ) => Promise; }