fix: add doc validation to ensure $id is not undefined

cheminfo · Jun 17, 2022 · 2b71925 · 2b71925
1 parent 49087dc
commit 2b71925
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/design/validateDocUpdate.js b/src/design/validateDocUpdate.js
@@ -113,6 +113,9 @@ module.exports = function (newDoc, oldDoc, userCtx) {
     validateDates(newDoc, oldDoc);
   } else if (newDoc.$type === 'entry') {
     validateOwners(newDoc);
+    if (newDoc.$id === undefined) {
+      throw { forbidden: '$id must be defined' };
+    }
     validateDates(newDoc, oldDoc);
     if (oldDoc) {
       if (Array.isArray(newDoc.$id) && Array.isArray(oldDoc.$id)) {

diff --git a/test/unit/design/validateDocUpdate.js b/test/unit/design/validateDocUpdate.js
@@ -16,6 +16,11 @@ describe('validate_doc_update', () => {
   });
   describe('$type: entry', () => {
     test('id', () => {
+      assert(
+        addOwners(addDate({ $type: 'entry' })),
+        null,
+        '$id must be defined',
+      );
       assert(
         addOwners(addDate({ $type: 'entry', $id: 'abc' })),
         addOwners(addDate({ $type: 'entry', $id: 'xyz' })),

diff --git a/test/unit/entry.js b/test/unit/entry.js
@@ -365,6 +365,15 @@ describe('entry creation and editions', () => {
     expect(entry1.info.isNew).toBe(true);
     expect(entry2.info.isNew).toBe(true);
   });
+
+  test('$id is null by default', async () => {
+    const entry = await couch.insertEntry({ $content: 'A' }, 'a@a.com');
+    expect(entry.action).toEqual('created');
+
+    const dbEntry = await couch.getEntry(entry.info.id, 'a@a.com');
+    expect(dbEntry.$id).toBe(null);
+    expect(dbEntry.$content).toBe('A');
+  });
 });
 
 describe('entry rights', () => {