orgnote-api 0.7.15 → 0.7.17

package/encryption/__tests__/__snapshots__/note-encryption.spec.ts.snap

@@ -82,6 +82,28 @@ exports[`Should encrypt note with empty encrypted property 1`] = `
 }
 `;
 
+exports[`Should not decrypt note without provided encrypted type 1`] = `
+{
+  "author": {
+    "email": "test@mail.com",
+    "id": "1",
+    "name": "John Doe",
+  },
+  "content": "#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?",
+  "encrypted": undefined,
+  "id": "id",
+  "meta": {
+    "description": "Awesome description",
+    "images": [],
+    "published": false,
+    "title": "My note title",
+  },
+}
+`;
+
 exports[`Should not encrypt public note 1`] = `
 {
   "author": {

package/encryption/__tests__/encryption.spec.ts

@@ -3,8 +3,8 @@ import {
   decryptViaKeys,
   encryptViaPassword,
   decryptViaPassword,
-  NoKeysProvided,
-  NoPasswordProvided,
+  NoKeysProvidedError,
+  NoPasswordProvidedError,
   IncorrectOrMissingPrivateKeyPasswordError,
 } from '../encryption';
 import { test, expect } from 'vitest';
@@ -125,7 +125,7 @@ YQ==
   try {
     await decryptViaPassword(encryptedMsg, 'password');
   } catch (e) {
-    expect(e).toBeInstanceOf(NoKeysProvided);
+    expect(e).toBeInstanceOf(NoKeysProvidedError);
   }
 });
 
@@ -147,7 +147,7 @@ aGW80jwBXEQ7uTjT8akpOKiH7BIuhEUZIXh+vDveG0Uwf63s2dIklznAEo+E
   }
 });
 
-test('Should raise NoPasswordProvided error when try to use keys instead of password', async () => {
+test('Should raise NoPasswordProvidedError error when try to use keys instead of password', async () => {
   const encryptedMsg = `-----BEGIN PGP MESSAGE-----
 
 wy4ECQMI6KFWGqyVV+DgYl0qUEeTe1kAdjkoR4FxFJxx+6QiOP+sZ6h7bn//
@@ -160,6 +160,6 @@ aGW80jwBXEQ7uTjT8akpOKiH7BIuhEUZIXh+vDveG0Uwf63s2dIklznAEo+E
   try {
     await decryptViaKeys(encryptedMsg, armoredPrivateKey, privateKeyPassphrase);
   } catch (e) {
-    expect(e).toBeInstanceOf(NoPasswordProvided);
+    expect(e).toBeInstanceOf(NoPasswordProvidedError);
   }
 });

package/encryption/__tests__/note-encryption.spec.ts

@@ -229,3 +229,33 @@ test('Should encrypt note with empty encrypted property', async () => {
   delete encryptedNote.content;
   expect(encryptedNote).toMatchSnapshot();
 });
+
+test('Should not decrypt note without provided encrypted type', async () => {
+  const content = `#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?`;
+  const note: Note = {
+    id: 'id',
+    meta: {
+      title: 'My note title',
+      images: [],
+      published: false,
+      description: 'Awesome description',
+    },
+    encrypted: undefined,
+    content,
+    author: {
+      id: '1',
+      name: 'John Doe',
+      email: 'test@mail.com',
+    },
+  };
+
+  const decryptedNote = await decryptNote(note, {
+    type: 'gpgPassword',
+    password: '123',
+  });
+
+  expect(decryptedNote).toMatchSnapshot();
+});

package/encryption/encryption.ts

@@ -11,8 +11,8 @@ import {
 export class IncorrectOrMissingPrivateKeyPasswordError extends Error {}
 export class ImpossibleToDecryptWithProvidedKeysError extends Error {}
 export class IncorrectEncryptionPasswordError extends Error {}
-export class NoKeysProvided extends Error {}
-export class NoPasswordProvided extends Error {}
+export class NoKeysProvidedError extends Error {}
+export class NoPasswordProvidedError extends Error {}
 
 const noPrivateKeyPassphraseProvidedErrorMsg =
   'Error: Signing key is not decrypted.';
@@ -159,11 +159,11 @@ function withCustomErrors<P extends unknown[], T>(
         throw new IncorrectEncryptionPasswordError();
       }
       if (e.message === noSymmetricallyEncryptedSessionKeyErrorMsg) {
-        throw new NoKeysProvided();
+        throw new NoKeysProvidedError();
       }
 
       if (e.message === notPrivateKeyErrprMsg) {
-        throw new NoPasswordProvided();
+        throw new NoPasswordProvidedError();
       }
 
       throw e;

package/encryption/note-encryption.ts

@@ -80,6 +80,7 @@ export async function decryptNote<T extends AbstractEncryptedNote>(
 ): Promise<T> {
   if (
     note.meta.published ||
+    !note.encrypted ||
     !encryptionParams.type ||
     encryptionParams.type === ModelsPublicNoteEncryptedEnum.Disabled
   ) {

package/package.json

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