diff --git a/keeperapi/package-lock.json b/keeperapi/package-lock.json index 6bdd435..285c4bb 100644 --- a/keeperapi/package-lock.json +++ b/keeperapi/package-lock.json @@ -1,12 +1,12 @@ { "name": "@keeper-security/keeperapi", - "version": "18.0.6", + "version": "18.0.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@keeper-security/keeperapi", - "version": "18.0.6", + "version": "18.0.7", "license": "ISC", "dependencies": { "@noble/post-quantum": "^0.5.2", diff --git a/keeperapi/package.json b/keeperapi/package.json index 5717a70..b67b7da 100644 --- a/keeperapi/package.json +++ b/keeperapi/package.json @@ -1,7 +1,7 @@ { "name": "@keeper-security/keeperapi", "description": "Keeper API Javascript SDK", - "version": "18.0.6", + "version": "18.0.7", "browser": "dist/browser/index.js", "main": "dist/index.cjs.js", "types": "dist/node/index.d.ts", diff --git a/keeperapi/src/browser/platform.ts b/keeperapi/src/browser/platform.ts index c5b962b..073df3e 100644 --- a/keeperapi/src/browser/platform.ts +++ b/keeperapi/src/browser/platform.ts @@ -613,13 +613,9 @@ export const browserPlatform: Platform = class { } static async importECCJsonWebKey(jwk: JsonWebKey, extractable = true): Promise { - return await crypto.subtle.importKey( - 'jwk', - jwk, - { name: 'ECDH', namedCurve: 'P-256' }, - extractable, - ['deriveBits'] - ) + return await crypto.subtle.importKey('jwk', jwk, { name: 'ECDH', namedCurve: 'P-256' }, extractable, [ + 'deriveBits', + ]) } static async ecdhComputeSharedSecret( diff --git a/keeperapi/src/vault.ts b/keeperapi/src/vault.ts index 9efb78f..c56c92c 100644 --- a/keeperapi/src/vault.ts +++ b/keeperapi/src/vault.ts @@ -1121,8 +1121,8 @@ const processKdRecordLinks = async (storage: VaultStorage, keeperDriveRecordLink parentRecordUid, }) } catch (e: any) { - console.error( - `[ks] The record link for ${childRecordUid} cannot be decrypted by ${parentRecordUid} (${e.message})` + logger.error( + `[kd] The record link for ${childRecordUid} cannot be decrypted by ${parentRecordUid} (${e.message})` ) } } @@ -1182,7 +1182,13 @@ const processKdFolderKeys = async (storage: VaultStorage, folderKeys?: Folder.IF if (!key.folderUid || !key.folderKey || !key.parentUid || isNil(key.encryptedBy)) continue const folderUid = webSafe64FromBytes(key.folderUid) const parentUid = webSafe64FromBytes(key.parentUid) - await platform.unwrapKey(key.folderKey, folderUid, parentUid, 'gcm', 'aes', storage) + try { + await platform.unwrapKey(key.folderKey, folderUid, parentUid, 'gcm', 'aes', storage) + } catch (e: any) { + logger.error( + `[kd] The folder key for ${folderUid} can't be decrypted by the parent key ${parentUid} (${e.message})` + ) + } } } @@ -1288,7 +1294,7 @@ const processKdFolders = async (storage: VaultStorage, keeperDriveFolders?: Fold inheritUserPermissions: toOptional(folder.inheritUserPermissions), }) } catch (err: any) { - console.error(`[ks] folder ${folderUid} cannot be decrypted (${err.message})`) + logger.error(`[kd] folder ${folderUid} cannot be decrypted (${err.message})`) } } } @@ -1423,7 +1429,7 @@ const processKdRecords = async ( isKeeperDriveData: true, }) } catch (err: any) { - console.error(`[kd] record ${recordUid} cannot be decrypted: ${err.message}`) + logger.error(`[kd] record ${recordUid} cannot be decrypted: ${err.message}`) } } }