From 1c20b9063b87032deb265e87abd4f3e32ee410b5 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Thu, 12 May 2022 12:47:01 +1000 Subject: [PATCH] Fix linting --- common/src/models/domain/account.ts | 1 - common/src/services/crypto.service.ts | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/src/models/domain/account.ts b/common/src/models/domain/account.ts index 0316f68e..75f789d1 100644 --- a/common/src/models/domain/account.ts +++ b/common/src/models/domain/account.ts @@ -15,7 +15,6 @@ import { CollectionView } from "../view/collectionView"; import { FolderView } from "../view/folderView"; import { SendView } from "../view/sendView"; -import { BaseEncryptedOrganizationKey } from "./account/encryptedKey"; import { EncString } from "./encString"; import { EnvironmentUrls } from "./environmentUrls"; import { GeneratedPasswordHistory } from "./generatedPasswordHistory"; diff --git a/common/src/services/crypto.service.ts b/common/src/services/crypto.service.ts index 83bb3c34..192cae5e 100644 --- a/common/src/services/crypto.service.ts +++ b/common/src/services/crypto.service.ts @@ -220,9 +220,8 @@ export class CryptoService implements CryptoServiceAbstraction { let setKey = false; - for (const orgId in encOrgKeyData) { - // eslint-disable-next-line - if (!encOrgKeyData.hasOwnProperty(orgId) || result.has(orgId)) { + for (const orgId in Object.keys(encOrgKeyData)) { + if (result.has(orgId)) { continue; }