adapt crypto callback tests for 6.1

mongodb · Aug 14, 2024 · e16b674 · e16b674
1 parent 4a975a7
commit e16b674
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/client-side-encryption/client_encryption.ts b/src/client-side-encryption/client_encryption.ts
@@ -123,7 +123,7 @@ export class ClientEncryption {
 
     const mongoCryptOptions: MongoCryptOptions = {
       ...options,
-      cryptoCallbacks,
+      cryptoCallbacks: options.cryptoCallbacks ?? cryptoCallbacks,
       kmsProviders: !Buffer.isBuffer(this._kmsProviders)
         ? (serialize(this._kmsProviders) as Buffer)
         : this._kmsProviders
@@ -814,6 +814,9 @@ export interface ClientEncryptionOptions {
    * TLS options for kms providers to use.
    */
   tlsOptions?: CSFLEKMSTlsOptions;
+
+  /** @internal */
+  cryptoCallbacks?: typeof cryptoCallbacks
 }
 
 /**

diff --git a/test/integration/node-specific/crypto_callbacks.test.ts b/test/integration/node-specific/crypto_callbacks.test.ts
@@ -38,7 +38,6 @@ describe('cryptoCallbacks', function () {
   beforeEach(function () {
     if (SKIP_AWS_TESTS) {
       this.currentTest?.skip();
-      return;
     }
 
     sandbox = sinon.createSandbox();
@@ -91,7 +90,8 @@ describe('cryptoCallbacks', function () {
 
     const encryption = new ClientEncryption(client, {
       keyVaultNamespace: 'test.encryption',
-      kmsProviders
+      kmsProviders,
+      cryptoCallbacks
     });
 
     assertCertainHooksCalled();
@@ -125,7 +125,8 @@ describe('cryptoCallbacks', function () {
 
         const encryption = new ClientEncryption(client, {
           keyVaultNamespace: 'test.encryption',
-          kmsProviders
+          kmsProviders,
+          cryptoCallbacks
         });
 
         const result = await (async () => {
@@ -155,7 +156,9 @@ describe('cryptoCallbacks', function () {
 
         const encryption = new ClientEncryption(client, {
           keyVaultNamespace: 'test.encryption',
-          kmsProviders
+          kmsProviders,
+          cryptoCallbacks
+
         });
 
         const result = await encryption.createDataKey('aws', dataKeyOptions).catch(error => error);
@@ -169,7 +172,8 @@ describe('cryptoCallbacks', function () {
 
       const encryption = new ClientEncryption(client, {
         keyVaultNamespace: 'test.encryption',
-        kmsProviders
+        kmsProviders,
+        cryptoCallbacks
       });
 
       const result = await encryption.createDataKey('aws', dataKeyOptions).catch(error => error);