bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 12:40:26 +00:00
Code Issues Releases Wiki Activity

Clean up sync

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-05-19 12:22:31 +02:00
parent 3ea1dd1c46
commit 684f96199f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/common/src/key-management/keys/response/private-account-keys.response.ts
View File

@@ -2,11 +2,14 @@ import { AsymmetricEncryptionDataResponse } from "./asymmetric-encryption-keys.r
import { UserSigningKeyData } from "./signing-keys.response";
export class PrivateAccountKeysResponseModel {
readonly SigningKeys: UserSigningKeyData;
readonly SigningKeys: UserSigningKeyData | null = null;
readonly AsymmetricEncryptionKeys: AsymmetricEncryptionDataResponse;
constructor(response: any) {
this.SigningKeys = new UserSigningKeyData(response.signingKeys);
if ("signingKeys" in response) {
this.SigningKeys = new UserSigningKeyData(response.signingKeys);
}
this.AsymmetricEncryptionKeys = new AsymmetricEncryptionDataResponse(
response.asymmetricEncryptionKeys,
);

4
libs/common/src/platform/sync/default-sync.service.ts
View File

@@ -199,13 +199,11 @@ export class DefaultSyncService extends CoreSyncService {
response.accountKeys.AsymmetricEncryptionKeys.wrappedPrivateKey.encryptedString!,
response.id,
);
try {
if (response.accountKeys.SigningKeys !== null) {
await this.keyService.setUserSigningKey(
response.accountKeys.SigningKeys.wrappedSigningKey,
response.id,
);
} catch (e) {
this.logService.error("Sync: Error setting user signing key", e);
}
await this.keyService.setProviderKeys(response.providers, response.id);
await this.keyService.setOrgKeys(