From 684f96199f9120df64eecda3e83a55562f11b8d3 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Mon, 19 May 2025 12:22:31 +0200 Subject: [PATCH] Clean up sync --- .../keys/response/private-account-keys.response.ts | 7 +++++-- libs/common/src/platform/sync/default-sync.service.ts | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/common/src/key-management/keys/response/private-account-keys.response.ts b/libs/common/src/key-management/keys/response/private-account-keys.response.ts index 3dc2023a770..d72dc12afad 100644 --- a/libs/common/src/key-management/keys/response/private-account-keys.response.ts +++ b/libs/common/src/key-management/keys/response/private-account-keys.response.ts @@ -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, ); diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts index bd66108364e..cf7a7c6f4e5 100644 --- a/libs/common/src/platform/sync/default-sync.service.ts +++ b/libs/common/src/platform/sync/default-sync.service.ts @@ -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(