fix(binary): generate valid base64 for non-Buffer types

mongodb-js · May 18, 2018 · 44afbb8 · 44afbb8
1 parent fcedb3d
commit 44afbb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/bson/binary.js b/lib/bson/binary.js
@@ -10,7 +10,9 @@ function convert(integer) {
 }
 
 function toExtendedJSON(obj) {
-  var base64String = obj.buffer.toString('base64');
+  var base64String = Buffer.isBuffer(obj.buffer)
+    ? obj.buffer.toString('base64')
+    : Buffer.from(obj.buffer).toString('base64');
 
   return {
     $binary: {

diff --git a/test/extend_mongodb_tests.js b/test/extend_mongodb_tests.js
@@ -164,6 +164,9 @@ describe('Extended JSON', function() {
           _id: { $nin: [new ObjectID('591801a468f9e7024b6235ea')] }
         });
         expect(serialized).to.equal('{"_id":{"$nin":[{"$oid":"591801a468f9e7024b6235ea"}]}}');
+
+        serialized = extJSON.stringify(new Binary(new Uint8Array([1, 2, 3, 4, 5])));
+        expect(serialized).to.equal('{"$binary":{"base64":"AQIDBAU=","subType":"00"}}');
       });
 
       it('should correctly parse null values', function() {