From 97c2b15e298eb422ea45720700526b2b1c68b301 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Wed, 2 Oct 2024 15:20:06 +0400 Subject: [PATCH] fix: secret sharing view count --- .../secret-sharing/secret-sharing-service.ts | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/backend/src/services/secret-sharing/secret-sharing-service.ts b/backend/src/services/secret-sharing/secret-sharing-service.ts index 9f2404370..b427844d0 100644 --- a/backend/src/services/secret-sharing/secret-sharing-service.ts +++ b/backend/src/services/secret-sharing/secret-sharing-service.ts @@ -178,33 +178,17 @@ export const secretSharingServiceFactory = ({ }; }; - const $decrementSecretViewCount = async (sharedSecret: TSecretSharing, sharedSecretId: string) => { + const $decrementSecretViewCount = async (sharedSecret: TSecretSharing) => { const { expiresAfterViews } = sharedSecret; - const isUuid = isUuidV4(sharedSecretId); - if (expiresAfterViews) { // decrement view count if view count expiry set - - if (isUuid) { - await secretSharingDAL.updateById(sharedSecretId, { $decr: { expiresAfterViews: 1 } }); - } else { - await secretSharingDAL.update({ identifier: sharedSecretId }, { $decr: { expiresAfterViews: 1 } }); - } + await secretSharingDAL.updateById(sharedSecret.id, { $decr: { expiresAfterViews: 1 } }); } - if (isUuid) { - await secretSharingDAL.updateById(sharedSecretId, { - lastViewedAt: new Date() - }); - } else { - await secretSharingDAL.update( - { identifier: sharedSecretId }, - { - lastViewedAt: new Date() - } - ); - } + await secretSharingDAL.updateById(sharedSecret.id, { + lastViewedAt: new Date() + }); }; /** Get's password-less secret. validates all secret's requested (must be fresh). */ @@ -267,7 +251,7 @@ export const secretSharingServiceFactory = ({ } // decrement when we are sure the user will view secret. - await $decrementSecretViewCount(sharedSecret, sharedSecretId); + await $decrementSecretViewCount(sharedSecret); return { isPasswordProtected,