1
0
mirror of https://github.com/bitwarden/browser synced 2026-03-02 03:21:19 +00:00

fix(register): [PM-27085] Account Register Uses New Data Types - Initial changes.

This commit is contained in:
Patrick Pimentel
2026-01-20 20:47:37 -05:00
parent b71ca1a2c0
commit 88fd21c7b7
6 changed files with 69 additions and 14 deletions

View File

@@ -18,7 +18,9 @@ import {
EncryptedString,
EncString,
} from "@bitwarden/common/key-management/crypto/models/enc-string";
import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { UserKey } from "@bitwarden/common/types/key";
import { KeyService } from "@bitwarden/key-management";
export class WebRegistrationFinishService
@@ -28,12 +30,13 @@ export class WebRegistrationFinishService
constructor(
protected keyService: KeyService,
protected accountApiService: AccountApiService,
protected masterPasswordService: MasterPasswordServiceAbstraction,
private organizationInviteService: OrganizationInviteService,
private policyApiService: PolicyApiServiceAbstraction,
private logService: LogService,
private policyService: PolicyService,
) {
super(keyService, accountApiService);
super(keyService, accountApiService, masterPasswordService);
}
override async getOrgNameFromOrgInvite(): Promise<string | null> {
@@ -78,6 +81,7 @@ export class WebRegistrationFinishService
// Note: the org invite token and email verification are mutually exclusive. Only one will be present.
override async buildRegisterRequest(
newUserKey: UserKey,
email: string,
passwordInputResult: PasswordInputResult,
encryptedUserKey: EncryptedString,
@@ -90,6 +94,7 @@ export class WebRegistrationFinishService
providerUserId?: string,
): Promise<RegisterFinishRequest> {
const registerRequest = await super.buildRegisterRequest(
newUserKey,
email,
passwordInputResult,
encryptedUserKey,

View File

@@ -73,7 +73,10 @@ import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-managemen
import { AccountCryptographicStateService } from "@bitwarden/common/key-management/account-cryptography/account-cryptographic-state.service";
import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import {
InternalMasterPasswordServiceAbstraction,
MasterPasswordServiceAbstraction,
} from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { SessionTimeoutTypeService } from "@bitwarden/common/key-management/session-timeout";
import {
VaultTimeout,
@@ -286,6 +289,7 @@ const safeProviders: SafeProvider[] = [
deps: [
KeyServiceAbstraction,
AccountApiServiceAbstraction,
MasterPasswordServiceAbstraction,
OrganizationInviteService,
PolicyApiServiceAbstraction,
LogService,