orgnote-api 0.7.14 → 0.7.16

package/encryption/__tests__/encryption.spec.ts

@@ -3,6 +3,8 @@ import {
   decryptViaKeys,
   encryptViaPassword,
   decryptViaPassword,
+  NoKeysProvidedError,
+  NoPasswordProvidedError,
   IncorrectOrMissingPrivateKeyPasswordError,
 } from '../encryption';
 import { test, expect } from 'vitest';
@@ -122,7 +124,42 @@ YQ==
 
   try {
     await decryptViaPassword(encryptedMsg, 'password');
+  } catch (e) {
+    expect(e).toBeInstanceOf(NoKeysProvidedError);
+  }
+});
+
+test('Should raise IncorrectOrMissingPrivateKeyPasswordError error when incorrect armored key provided', async () => {
+  const password = 'test';
+  const encryptedMsg = `-----BEGIN PGP MESSAGE-----
+
+wy4ECQMI6KFWGqyVV+DgYl0qUEeTe1kAdjkoR4FxFJxx+6QiOP+sZ6h7bn//
+aGW80jwBXEQ7uTjT8akpOKiH7BIuhEUZIXh+vDveG0Uwf63s2dIklznAEo+E
+5iO5mEqoXWXg6nAvNxciA56dKuI=
+=B4Tc
+-----END PGP MESSAGE-----
+`;
+
+  try {
+    await decryptViaKeys(encryptedMsg, armoredPublicKey, privateKeyPassphrase);
   } catch (e) {
     expect(e).toBeInstanceOf(IncorrectOrMissingPrivateKeyPasswordError);
   }
 });
+
+test('Should raise NoPasswordProvidedError error when try to use keys instead of password', async () => {
+  const encryptedMsg = `-----BEGIN PGP MESSAGE-----
+
+wy4ECQMI6KFWGqyVV+DgYl0qUEeTe1kAdjkoR4FxFJxx+6QiOP+sZ6h7bn//
+aGW80jwBXEQ7uTjT8akpOKiH7BIuhEUZIXh+vDveG0Uwf63s2dIklznAEo+E
+5iO5mEqoXWXg6nAvNxciA56dKuI=
+=B4Tc
+-----END PGP MESSAGE-----
+`;
+
+  try {
+    await decryptViaKeys(encryptedMsg, armoredPrivateKey, privateKeyPassphrase);
+  } catch (e) {
+    expect(e).toBeInstanceOf(NoPasswordProvidedError);
+  }
+});

package/encryption/encryption.ts

@@ -11,6 +11,8 @@ import {
 export class IncorrectOrMissingPrivateKeyPasswordError extends Error {}
 export class ImpossibleToDecryptWithProvidedKeysError extends Error {}
 export class IncorrectEncryptionPasswordError extends Error {}
+export class NoKeysProvidedError extends Error {}
+export class NoPasswordProvidedError extends Error {}
 
 const noPrivateKeyPassphraseProvidedErrorMsg =
   'Error: Signing key is not decrypted.';
@@ -25,9 +27,15 @@ const decriptionFailedErrorMsg =
 const incorrectEncryptionPasswordErrorMsg =
   'Error decrypting message: Modification detected.';
 
-const noSymmetricallyEncryptedSessionKey =
+const noSymmetricallyEncryptedSessionKeyErrorMsg =
   'Error decrypting message: No symmetrically encrypted session key packet found.';
 
+const armoredTextNotTypePrivateKeyErrorMsg =
+  'Armored text not of type private key';
+
+const notPrivateKeyErrprMsg =
+  'Error decrypting message: No public key encrypted session key packet found.';
+
 export const encryptViaKeys = withCustomErrors(_encryptViaKeys);
 export const encryptViaPassword = withCustomErrors(_encryptViaPassword);
 export const decryptViaPassword = withCustomErrors(_decryptViaPassword);
@@ -139,7 +147,7 @@ function withCustomErrors<P extends unknown[], T>(
           incorrectPrivateKeyPassphraseErrorMsg,
           corruptedPrivateKeyErrorMsg,
           decryptionKeyIsNotDecryptedErrorMsg,
-          noSymmetricallyEncryptedSessionKey,
+          armoredTextNotTypePrivateKeyErrorMsg,
         ].includes(e.message)
       ) {
         throw new IncorrectOrMissingPrivateKeyPasswordError(e.message);
@@ -150,6 +158,14 @@ function withCustomErrors<P extends unknown[], T>(
       if (e.message === incorrectEncryptionPasswordErrorMsg) {
         throw new IncorrectEncryptionPasswordError();
       }
+      if (e.message === noSymmetricallyEncryptedSessionKeyErrorMsg) {
+        throw new NoKeysProvidedError();
+      }
+
+      if (e.message === notPrivateKeyErrprMsg) {
+        throw new NoPasswordProvidedError();
+      }
+
       throw e;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orgnote-api",
-  "version": "0.7.14",
+  "version": "0.7.16",
   "description": "Official API for creating extensions for OrgNote app",
   "type": "module",
   "main": "./index.ts",