fix lints and refactor

Author: baileympearson

addon/mongocrypt.cc

@@ -558,17 +558,28 @@ Value MongoCrypt::MakeEncryptionContext(const CallbackInfo& info) {
 }
 
 Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
-    std::unique_ptr<mongocrypt_ctx_t, MongoCryptContextDeleter> context(
-        mongocrypt_ctx_new(_mongo_crypt.get()));
-
     Uint8Array valueBuffer = Uint8ArrayFromValue(info[0], "value");
 
     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.");    
+        throw TypeError::New(Env(), "option `expressionMode` is required.");
     }
 
+    bool expression_mode = options.Get("expressionMode").ToBoolean();
+    auto context_init_function = expression_mode ? mongocrypt_ctx_explicit_encrypt_expression_init
+                                                 : mongocrypt_ctx_explicit_encrypt_init;
+
+    return MakeExplicitEncryptionContextInternal(context_init_function, valueBuffer, options);
+}
+
+Value MongoCrypt::MakeExplicitEncryptionContextInternal(bool (*init_fn)(mongocrypt_ctx_t*,
+                                                                        mongocrypt_binary_t*),
+                                                        const Uint8Array& valueBuffer,
+                                                        const Object& options) {
+    std::unique_ptr<mongocrypt_ctx_t, MongoCryptContextDeleter> context(
+        mongocrypt_ctx_new(_mongo_crypt.get()));
+
     if (!options.Get("keyId").IsUndefined()) {
         Uint8Array keyId = Uint8ArrayFromValue(options["keyId"], "keyId");
 
@@ -631,12 +642,7 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
     std::unique_ptr<mongocrypt_binary_t, MongoCryptBinaryDeleter> binaryValue(
         Uint8ArrayToBinary(valueBuffer));
 
-    const bool isExpressionMode = options.Get("expressionMode").ToBoolean();
-
-    const bool status =
-        isExpressionMode
-            ? mongocrypt_ctx_explicit_encrypt_expression_init(context.get(), binaryValue.get())
-            : mongocrypt_ctx_explicit_encrypt_init(context.get(), binaryValue.get());
+    const bool status = init_fn(context.get(), binaryValue.get());
 
     if (!status) {
         throw TypeError::New(Env(), errorStringFromStatus(context.get()));

addon/mongocrypt.h

@@ -48,6 +48,10 @@ class MongoCrypt : public Napi::ObjectWrap<MongoCrypt> {
     Napi::Value MakeExplicitDecryptionContext(const Napi::CallbackInfo& info);
     Napi::Value MakeDataKeyContext(const Napi::CallbackInfo& info);
     Napi::Value MakeRewrapManyDataKeyContext(const Napi::CallbackInfo& info);
+    Napi::Value MakeExplicitEncryptionContextInternal(bool (*init_fn)(mongocrypt_ctx_t*,
+                                                                      mongocrypt_binary_t*),
+                                                      const Napi::Uint8Array& value,
+                                                      const Napi::Object& options);
 
     Napi::Value Status(const Napi::CallbackInfo& info);
     Napi::Value CryptSharedLibVersionInfo(const Napi::CallbackInfo& info);

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
@@ -388,7 +388,6 @@ describe('MongoCryptConstructor', () => {
       });
     });
 
-
     describe('options.expressionMode', function () {
       it('throws if `expressionMode` is not defined', function () {
         expect(() =>
@@ -401,7 +400,7 @@ describe('MongoCryptConstructor', () => {
           .to.throw(/option `expressionMode` is required./)
           .to.be.instanceOf(TypeError);
       });
-    })
+    });
   });
 });