orgnote-api 0.10.1 → 0.10.3

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

@@ -6,7 +6,8 @@ exports[`Should decrypt note content via password 1`] = `
 #+TITLE: Hello worlld
 
 * Hello?",
-  "encrypted": "gpgPassword",
+  "encrypted": false,
+  "encryptionType": "gpgPassword",
   "id": "id",
   "meta": {
     "headings": [
@@ -27,7 +28,8 @@ exports[`Should decrypt note via provided keys 1`] = `
 #+TITLE: Hello worlld
 
 * Hello?",
-  "encrypted": "gpgKeys",
+  "encrypted": false,
+  "encryptionType": "gpgKeys",
   "id": "id",
   "meta": {
     "headings": [
@@ -49,7 +51,8 @@ exports[`Should encrypt note content via password 1`] = `
     "id": "1",
     "name": "John Doe",
   },
-  "encrypted": "gpgPassword",
+  "encrypted": true,
+  "encryptionType": "gpgPassword",
   "id": "id",
   "meta": {
     "id": undefined,
@@ -65,7 +68,8 @@ exports[`Should encrypt note via keys 1`] = `
     "id": "1",
     "name": "John Doe",
   },
-  "encrypted": "gpgKeys",
+  "encrypted": true,
+  "encryptionType": "gpgKeys",
   "id": "id",
   "meta": {
     "id": undefined,
@@ -81,7 +85,7 @@ exports[`Should encrypt note with empty encrypted property 1`] = `
     "id": "1",
     "name": "John Doe",
   },
-  "encrypted": "gpgPassword",
+  "encrypted": true,
   "id": "id",
   "meta": {
     "id": undefined,
@@ -101,7 +105,7 @@ exports[`Should not decrypt note without provided encrypted type 1`] = `
 #+TITLE: Hello worlld
 
 * Hello?",
-  "encrypted": undefined,
+  "encrypted": false,
   "id": "id",
   "meta": {
     "description": "Awesome description",
@@ -123,7 +127,8 @@ exports[`Should not encrypt public note 1`] = `
 #+TITLE: Hello worlld
 
 * Hello?",
-  "encrypted": "gpgPassword",
+  "encrypted": false,
+  "encryptionType": "gpgPassword",
   "id": "id",
   "meta": {
     "description": "Awesome description",

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

@@ -16,7 +16,7 @@ test('Should encrypt note content via password', async () => {
 
   const note: Note = {
     id: 'id',
-    encrypted: 'gpgPassword',
+    encryptionType: 'gpgPassword',
     meta: {
       title: 'My note title',
       images: [],
@@ -46,7 +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',
+    encryptionType: 'gpgPassword',
     meta: {
       title: 'My note title',
       images: [],
@@ -79,7 +79,7 @@ test('Should encrypt note via keys', async () => {
 
   const note: Note = {
     id: 'id',
-    encrypted: 'gpgKeys',
+    encryptionType: 'gpgKeys',
     meta: {
       title: 'My note title for encryption via keys',
       images: [],
@@ -111,7 +111,7 @@ test('Should encrypt note via keys', async () => {
 test('Should decrypt note via provided keys', async () => {
   const note: Note = {
     id: 'id',
-    encrypted: 'gpgKeys',
+    encryptionType: 'gpgKeys',
     meta: {
       title: 'My note title for decryption via keys',
       images: [],
@@ -169,7 +169,7 @@ test('Should not encrypt public note', async () => {
 
   const note: Note = {
     id: 'id',
-    encrypted: 'gpgPassword',
+    encryptionType: 'gpgPassword',
     meta: {
       title: 'My note title',
       images: [],
@@ -271,6 +271,7 @@ test('Should decrypt note and note meta', async () => {
   const note: Note = {
     id: 'id',
     meta: { ...meta },
+    encryptionType: 'gpgPassword',
     content: `#+TITLE: My note title
 #+DESCRIPTION: Awesome description
 #+PUBLISHED: false

package/encryption/note-encryption.ts

@@ -27,6 +27,7 @@ export async function encryptNote<T extends AbstractEncryptedNote>(
   note: T,
   encryptionParams: OrgNoteEncryption
 ): Promise<T> {
+  note.encrypted = false;
   if (
     !encryptionParams.type ||
     encryptionParams.type === ModelsPublicNoteEncryptionTypeEnum.Disabled ||
@@ -37,15 +38,18 @@ export async function encryptNote<T extends AbstractEncryptedNote>(
 
   note.meta = { id: note.meta.id, published: note.meta.published };
 
-  if (encryptionParams.type === ModelsPublicNoteEncryptionTypeEnum.GpgKeys) {
-    return await encryptNoteViaKeys(
-      note,
-      encryptionParams.publicKey,
-      encryptionParams.privateKey,
-      encryptionParams.privateKeyPassphrase
-    );
-  }
-  return await encryptNoteViaPassword(note, encryptionParams.password);
+  const encryptedNote =
+    encryptionParams.type === ModelsPublicNoteEncryptionTypeEnum.GpgKeys
+      ? await encryptNoteViaKeys(
+          note,
+          encryptionParams.publicKey,
+          encryptionParams.privateKey,
+          encryptionParams.privateKeyPassphrase
+        )
+      : await encryptNoteViaPassword(note, encryptionParams.password);
+
+  encryptedNote.encrypted = true;
+  return encryptedNote;
 }
 export async function encryptNoteViaPassword<T extends AbstractEncryptedNote>(
   note: T,
@@ -85,12 +89,14 @@ export async function decryptNote<T extends AbstractEncryptedNote>(
 ): Promise<T> {
   if (
     note.meta.published ||
-    !note.encrypted ||
+    !note.encryptionType ||
     !encryptionParams.type ||
     encryptionParams.type === ModelsPublicNoteEncryptionTypeEnum.Disabled
   ) {
+    note.encrypted = false;
     return note;
   }
+  note.encrypted = true;
   const decryptedNote =
     encryptionParams.type === ModelsPublicNoteEncryptionTypeEnum.GpgKeys
       ? await decryptNoteViaKeys(
@@ -104,6 +110,7 @@ export async function decryptNote<T extends AbstractEncryptedNote>(
 
   return {
     ...decryptedNote,
+    encrypted: false,
     meta: parsed.meta,
   };
 }

package/models/note.ts

@@ -16,11 +16,11 @@ export interface NotePreview {
   isMy: ModelsPublicNote['isMy'];
   author?: ModelsPublicUser;
   bookmarked?: boolean;
-  contentEncrypted?: boolean;
+  encrypted?: boolean;
 }
 
 export interface Note extends ModelsPublicNote {
   deleted?: Date;
   bookmarked?: boolean;
-  contentEncrypted?: boolean;
+  encrypted?: boolean;
 }

package/package.json

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