orgnote-api 0.7.10 → 0.7.12

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

@@ -65,3 +65,69 @@ exports[`Should encrypt note via keys 1`] = `
   },
 }
 `;
+
+exports[`Should not encrypt note with disabled encryption 1`] = `
+{
+  "author": {
+    "email": "test@mail.com",
+    "id": "1",
+    "name": "John Doe",
+  },
+  "content": "#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?",
+  "encrypted": null,
+  "id": "id",
+  "meta": {
+    "description": "Awesome description",
+    "images": [],
+    "published": false,
+    "title": "My note title",
+  },
+}
+`;
+
+exports[`Should not encrypt public note 1`] = `
+{
+  "author": {
+    "email": "test@mail.com",
+    "id": "1",
+    "name": "John Doe",
+  },
+  "content": "#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?",
+  "encrypted": "gpgPassword",
+  "id": "id",
+  "meta": {
+    "description": "Awesome description",
+    "images": [],
+    "published": true,
+    "title": "My note title",
+  },
+}
+`;
+
+exports[`Should not encrypt publick note 1`] = `
+{
+  "author": {
+    "email": "test@mail.com",
+    "id": "1",
+    "name": "John Doe",
+  },
+  "content": "#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?",
+  "encrypted": "gpgPassword",
+  "id": "id",
+  "meta": {
+    "description": "Awesome description",
+    "images": [],
+    "published": true,
+    "title": "My note title",
+  },
+}
+`;

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

@@ -9,12 +9,14 @@ import {
 
 test('Should encrypt note content via password', async () => {
   const content = `#+ID: qweqwe
+
 #+TITLE: Hello worlld
 
 * Hello?`;
 
   const note: Note = {
     id: 'id',
+    encrypted: 'gpgPassword',
     meta: {
       title: 'My note title',
       images: [],
@@ -44,6 +46,7 @@ test('Should encrypt note content via password', async () => {
 test('Should decrypt note content via password', async () => {
   const note: Note = {
     id: 'id',
+    encrypted: 'gpgPassword',
     meta: {
       title: 'My note title',
       images: [],
@@ -76,6 +79,7 @@ test('Should encrypt note via keys', async () => {
 
   const note: Note = {
     id: 'id',
+    encrypted: 'gpgKeys',
     meta: {
       title: 'My note title for encryption via keys',
       images: [],
@@ -107,6 +111,7 @@ test('Should encrypt note via keys', async () => {
 test('Should decrypt note via provided keys', async () => {
   const note: Note = {
     id: 'id',
+    encrypted: 'gpgKeys',
     meta: {
       title: 'My note title for decryption via keys',
       images: [],
@@ -155,3 +160,71 @@ yEN8xpFUs7A9xryVZOosp9Sfe3IbBkO99sAQ7jV4EoMYk3/GKA==
 
   expect(decryptedNote).toMatchSnapshot();
 });
+
+test('Should not encrypt public note', async () => {
+  const content = `#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?`;
+
+  const note: Note = {
+    id: 'id',
+    encrypted: 'gpgPassword',
+    meta: {
+      title: 'My note title',
+      images: [],
+      published: true,
+      description: 'Awesome description',
+    },
+    content,
+    author: {
+      id: '1',
+      name: 'John Doe',
+      email: 'test@mail.com',
+    },
+  };
+
+  const encryptedNote = await encryptNote(note, {
+    type: 'gpgPassword',
+    password: '123',
+  });
+
+  expect(encryptedNote.content.startsWith('-----BEGIN PGP MESSAGE-----')).toBe(
+    false
+  );
+  expect(encryptedNote).toMatchSnapshot();
+});
+
+test('Should not encrypt note with disabled encryption', async () => {
+  const content = `#+ID: qweqwe
+#+TITLE: Hello worlld
+
+* Hello?`;
+
+  const note: Note = {
+    id: 'id',
+    encrypted: null,
+    meta: {
+      title: 'My note title',
+      images: [],
+      published: false,
+      description: 'Awesome description',
+    },
+    content,
+    author: {
+      id: '1',
+      name: 'John Doe',
+      email: 'test@mail.com',
+    },
+  };
+
+  const encryptedNote = await encryptNote(note, {
+    type: 'gpgPassword',
+    password: '123',
+  });
+
+  expect(encryptedNote.content.startsWith('-----BEGIN PGP MESSAGE-----')).toBe(
+    false
+  );
+  expect(encryptedNote).toMatchSnapshot();
+});

package/encryption/note-encryption.ts

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

package/package.json

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