test and fix

Author: baileympearson

addon/mongocrypt.cc

@@ -565,6 +565,10 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
 
     Object options = info.Length() > 1 ? info[1].ToObject() : Object::New(info.Env());
 
+    if (!options.Has("expressionMode") || !options.Get("expressionMode").IsBoolean()) {
+        throw TypeError::New(Env(), "option `expressionMode` is required.");    
+    }
+
     if (!options.Get("keyId").IsUndefined()) {
         Uint8Array keyId = Uint8ArrayFromValue(options["keyId"], "keyId");
 
@@ -627,9 +631,6 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
     std::unique_ptr<mongocrypt_binary_t, MongoCryptBinaryDeleter> binaryValue(
         Uint8ArrayToBinary(valueBuffer));
 
-    if (!options.Has("expressionMode") || !options.Get("expressionMode").IsBoolean()) {
-        throw TypeError::New(Env(), "`rangeOptions` must be provided if `algorithm` is set to Range");    
-    }
     const bool isExpressionMode = options.Get("expressionMode").ToBoolean();
 
     const bool status =

test/bindings.test.ts

@@ -19,15 +19,15 @@ describe('MongoCryptConstructor', () => {
   const mc = new MongoCrypt({
     kmsProviders: serialize({ aws: {} }),
     cryptoCallbacks: {
-      aes256CbcEncryptHook: () => {},
-      aes256CbcDecryptHook: () => {},
-      aes256CtrEncryptHook: () => {},
-      aes256CtrDecryptHook: () => {},
+      aes256CbcEncryptHook: () => { },
+      aes256CbcDecryptHook: () => { },
+      aes256CtrEncryptHook: () => { },
+      aes256CtrDecryptHook: () => { },
       randomHook,
-      hmacSha512Hook: () => {},
-      hmacSha256Hook: () => {},
-      sha256Hook: () => {},
-      signRsaSha256Hook: () => {}
+      hmacSha512Hook: () => { },
+      hmacSha256Hook: () => { },
+      sha256Hook: () => { },
+      signRsaSha256Hook: () => { }
     }
   });
 
@@ -41,17 +41,17 @@ describe('MongoCryptConstructor', () => {
         kmsProviders: serialize({ aws: {} }),
         schemaMap: serialize({}),
         encryptedFieldsMap: serialize({}),
-        logger: () => {},
+        logger: () => { },
         cryptoCallbacks: {
-          aes256CbcEncryptHook: () => {},
-          aes256CbcDecryptHook: () => {},
-          aes256CtrEncryptHook: () => {},
-          aes256CtrDecryptHook: () => {},
+          aes256CbcEncryptHook: () => { },
+          aes256CbcDecryptHook: () => { },
+          aes256CtrEncryptHook: () => { },
+          aes256CtrDecryptHook: () => { },
           randomHook,
-          hmacSha512Hook: () => {},
-          hmacSha256Hook: () => {},
-          sha256Hook: () => {},
-          signRsaSha256Hook: () => {}
+          hmacSha512Hook: () => { },
+          hmacSha256Hook: () => { },
+          sha256Hook: () => { },
+          signRsaSha256Hook: () => { }
         },
 
         bypassQueryAnalysis: false
@@ -387,6 +387,21 @@ describe('MongoCryptConstructor', () => {
         ).to.be.instanceOf(MongoCryptContextCtor);
       });
     });
+
+
+    describe('options.expressionMode', function () {
+      it('throws if `expressionMode` is not defined', function () {
+        expect(() =>
+          mc.makeExplicitEncryptionContext(value, {
+            // minimum required arguments from libmongocrypt
+            keyId: keyId.buffer,
+            algorithm: 'Unindexed'
+          })
+        )
+          .to.throw(/option `expressionMode` is required./)
+          .to.be.instanceOf(TypeError);
+      });
+    })
   });
 });