refactor: validate that id satisfies the ObjectIdLike type def of id and add test for invalid id type

Author: Grace Chong

src/objectid.ts

@@ -56,8 +56,14 @@ export class ObjectId {
       if (typeof id === 'object' && id && 'id' in id) {
         if ('toHexString' in id && typeof id.toHexString === 'function') {
           this[kId] = Buffer.from(id.toHexString(), 'hex');
+        } else if (typeof id.id === 'string') {
+          this[kId] = Buffer.from(id.id);
         } else {
-          this[kId] = typeof id.id === 'string' ? Buffer.from(id.id) : id.id;
+          try {
+            this[kId] = ensureBuffer(id.id);
+          } catch {
+            throw new BSONTypeError('Argument passed in must be a Buffer or string of 12 bytes or a string of 24 hex characters');
+          }
         }
       } else if (id == null || typeof id === 'number') {
         // The most common use case (blank id, new objectId instance)

test/node/object_id_tests.js

@@ -48,6 +48,14 @@ describe('ObjectId', function () {
     expect(() => new ObjectId(objectIdLike)).to.throw(TypeError);
   });
 
+  it('should throw error if object without string or buffer id is passed in', function () {
+    var objectIdLike = {
+      id: 5
+    };
+
+    expect(() => new ObjectId(objectIdLike)).to.throw(TypeError);
+  });
+
   it('should correctly create ObjectId from number', function () {
     expect(() => new ObjectId(42)).to.not.throw();
     expect(() => new ObjectId(0x2a)).to.not.throw();