bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-10 05:30:01 +00:00
Code Issues Releases Wiki Activity

Merge branches 'innovation/opaque' and 'innovation/opaque' of https://github.com/bitwarden/clients into innovation/opaque

Browse Source
This commit is contained in:
Jared Snider
2025-03-21 10:17:19 -04:00
parent a73c1f3170 3b872cc649
commit 39c1a63e30
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/web/src/app/auth/settings/change-password.component.ts
View File

@@ -14,7 +14,9 @@ import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.
import { OpaqueCipherConfiguration } from "@bitwarden/common/auth/opaque/models/opaque-cipher-configuration";
import { OpaqueKeyExchangeService } from "@bitwarden/common/auth/opaque/opaque-key-exchange.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -67,6 +69,7 @@ export class ChangePasswordComponent
accountService: AccountService,
toastService: ToastService,
private opaqueKeyExchangeService: OpaqueKeyExchangeService,
private configService: ConfigService,
) {
super(
i18nService,
@@ -228,20 +231,25 @@ export class ChangePasswordComponent
return this.updateKey();
});
} else {
const userConfiguredKdf = await this.kdfConfigService.getKdfConfig();
const cipherConfig = OpaqueCipherConfiguration.fromKdfConfig(
userConfiguredKdf.kdfType === KdfType.Argon2id
? userConfiguredKdf
: DEFAULT_OPAQUE_KDF_CONFIG,
const opaqueKeyExchangeFeatureFlag = await this.configService.getFeatureFlag(
FeatureFlag.OpaqueKeyExchange,
);
if (opaqueKeyExchangeFeatureFlag) {
const userConfiguredKdf = await this.kdfConfigService.getKdfConfig();
const cipherConfig = OpaqueCipherConfiguration.fromKdfConfig(
userConfiguredKdf.kdfType === KdfType.Argon2id
? userConfiguredKdf
: DEFAULT_OPAQUE_KDF_CONFIG,
);
// TODO: try catch this just in case server feature flag is disabled and clients still has it enabled.
const sessionId = await this.opaqueKeyExchangeService.register(
this.masterPassword,
newUserKey[0],
cipherConfig,
);
request.opaqueSessionId = sessionId;
// TODO: try catch this just in case server feature flag is disabled and clients still has it enabled.
const sessionId = await this.opaqueKeyExchangeService.register(
this.masterPassword,
newUserKey[0],
cipherConfig,
);
request.opaqueSessionId = sessionId;
}
this.formPromise = this.masterPasswordApiService.postPassword(request);
}