DOCSP-7589: Update NodeJS examples in CSFLE to be more idiomatic (#569)

* DOCSP-7589 update NodeJS examples to be more idiomatic and use async await syntax

Author: Chris Cho

source/includes/steps-fle-configure-the-mongodb-client.yaml

@@ -18,7 +18,7 @@ content: |
 
         .. code-block:: javascript
 
-           const keyVaultNamespace = "encryption.__keyVault";
+           const keyVaultNamespace = 'encryption.__keyVault';
      .. tab::
         :tabid: python
 
@@ -96,7 +96,7 @@ content: |
            :emphasize-lines: 2
 
            const patientSchema = {
-             "medicalRecords.patients": jsonSchema,
+             'medicalRecords.patients': jsonSchema,
            }
      .. tab::
         :tabid: python
@@ -146,7 +146,7 @@ content: |
            :emphasize-lines: 2
 
            const extraOptions = {
-             mongocryptdSpawnPath: "/usr/local/bin/mongocryptd",
+             mongocryptdSpawnPath: '/usr/local/bin/mongocryptd',
            }
 
         .. admonition:: Encryption Binary Daemon

source/includes/steps-fle-convert-to-a-remote-master-key.yaml

@@ -64,10 +64,10 @@ content: |
         .. code-block:: javascript
 
            kmsProviders = {
-               aws: {
-                   accessKeyId:  "<IAM User Access Key ID>",
-                   secretAccessKey: "<IAM User Secret Access Key>",
-               }
+             aws: {
+               accessKeyId: '<IAM User Access Key ID>',
+               secretAccessKey: '<IAM User Secret Access Key>',
+             }
            }
      .. tab::
         :tabid: python
@@ -127,18 +127,18 @@ content: |
         .. code-block:: javascript
 
            const encryption = new ClientEncryption(client, {
-              keyVaultNamespace,
-              kmsProviders
+               keyVaultNamespace,
+               kmsProviders
            });
-           encryption.createDataKey("aws", {
+           const key = await encryption.createDataKey('aws', {
               masterKey: {
-                key: "<Master Key ARN>", // e.g. "arn:aws:kms:us-east-2:111122223333:alias/test-key"
-                region: "<Master Key AWS Region>", // e.g. "us-east-1"
+                key: '<Master Key ARN>', // e.g. 'arn:aws:kms:us-east-2:111122223333:alias/test-key'
+                region: '<Master Key AWS Region>', // e.g. 'us-east-1'
               }
-           }, (err, key) => {
-            const base64DataKeyId = key.toString('base64');
-            console.log("DataKeyId [base64]: ", base64DataKeyId);
            });
+
+           const base64DataKeyId = key.toString('base64');
+           console.log('DataKeyId [base64]: ', base64DataKeyId);
      .. tab::
         :tabid: python
 

source/includes/steps-fle-create-data-encryption-key.yaml

@@ -28,14 +28,10 @@ content: |
         :tabid: nodejs
 
         .. code-block:: javascript
-           :emphasize-lines: 5
+           :emphasize-lines: 2
 
-           const path = "./master-key.txt";
-           let localMasterKey;
-           fs.readFile(path, (err, data) => {
-             if (err) throw err;
-             localMasterKey = data;
-           });
+           const path = './master-key.txt';
+           const localMasterKey = fs.readFileSync(path);
      .. tab::
         :tabid: python
 
@@ -141,36 +137,34 @@ content: |
         :tabid: nodejs
 
         .. code-block:: javascript
-           :emphasize-lines: 10,11,13,14,16
+           :emphasize-lines: 12,14,15,17
 
-           const base64 = require("uuid-base64");
+           const base64 = require('uuid-base64');
 
-           const connectionString = "mongodb://localhost:27017";
-           const keyVaultNamespace = "encryption.__keyVault";
+           const connectionString = 'mongodb://localhost:27017';
+           const keyVaultNamespace = 'encryption.__keyVault';
            const client = new MongoClient(connectionString, {
              useNewUrlParser: true,
              useUnifiedTopology: true,
            });
 
-           client.connect()
-             .then((clientConnection) => {
+           async function main() {
+             try {
+               await client.connect();
                const encryption = new ClientEncryption(client, {
                  keyVaultNamespace,
                  kmsProviders,
                });
-               encryption.createDataKey("local", (err, key) => {
-                 if (err) {
-                   console.error(err);
-                 } else {
-                   const base64DataKeyId = key.toString("base64");
-                   const uuidDataKeyId = base64.decode(base64DataKeyId);
-                   console.log("DataKeyId [UUID]: ", uuidDataKeyId);
-                   console.log("DataKeyId [base64]: ", base64DataKeyId);
-                 }
-               });
-               // ...
-             });
-
+               const key = await encryption.createDataKey('local');
+               const base64DataKeyId = key.toString('base64');
+               const uuidDataKeyId = base64.decode(base64DataKeyId);
+               console.log('DataKeyId [UUID]: ', uuidDataKeyId);
+               console.log('DataKeyId [base64]: ', base64DataKeyId);
+             } finally {
+               await client.close();
+             }
+           }
+           main();
 
         .. note::
 
@@ -302,28 +296,31 @@ content: |
         .. code-block:: javascript
            :emphasize-lines: 4
 
-           const connectionString = "mongodb://localhost:27017/";
-           const keyVaultDb = "encryption";
-           const keyVaultCollection = "__keyVault";
-           const base64KeyId = "3k13WkSZSLy7kwAAP4HDyQ=="; // use the base64 data key id returned by createKey() in the prior step
+           const connectionString = 'mongodb://localhost:27017/';
+           const keyVaultDb = 'encryption';
+           const keyVaultCollection = '__keyVault';
+           const base64KeyId = '3k13WkSZSLy7kwAAP4HDyQ=='; // use the base64 data key id returned by createKey() in the prior step
 
            const client = new MongoClient(connectionString, {
              useNewUrlParser: true,
              useUnifiedTopology: true,
            });
 
-           client.connect()
-             .then((clientConnection) => {
-               const keyDB = clientConnection.db(keyVaultDb);
+           async function main() {
+             try {
+               await client.connect();
+               const keyDB = client.db(keyVaultDb);
                const keyColl = keyDB.collection(keyVaultCollection);
                const query = {
                  _id: base64KeyId,
                };
-               keyColl.findOne(query)
-                 .then((dataKey) => {
-                   console.log(dataKey);
-                 });
-             });
+               const dataKey = await keyColl.findOne(query);
+               console.log(dataKey);
+             } finally {
+               await client.close();
+             }
+           }
+           main();
 
         This code example should print a retrieved document that resembles the
         following:

source/use-cases/client-side-field-level-encryption-guide.txt

@@ -196,10 +196,6 @@ Additional Dependencies
              <https://www.npmjs.com/package/mongodb-client-encryption>`_
            - NodeJS wrapper for the ``libmongocrypt`` encryption library.
 
-         * - `secure-random
-             <https://www.npmjs.com/package/secure-random#nodejsbrowserify>`_
-           - Generate cryptographically strong random values.
-
          * - `uuid-base64
              <https://www.npmjs.com/package/uuid-base64#installation>`_
            - Convert between Base64 and hexadecimal UUIDs.
@@ -276,27 +272,21 @@ To begin development, MedcoMD engineers generate a locally-managed master key:
 
       .. code-block:: javascript
 
-        const fs = require("fs");
-        const secureRandom = require("secure-random");
-
-        const wstream = fs.createWriteStream("master-key.txt");
-        const data = secureRandom.randomUint8Array(96);
-        wstream.write(data);
-        wstream.end();
+        const fs = require('fs');
+        const crypto = require('crypto');
 
-      .. note::
-
-         This code includes a dependency on the ``secure-random``
-         npm package. See the `npmjs documentation on the secure-random
-         package <https://www.npmjs.com/package/secure-random>`_ for
-         installation instructions.
+        try {
+          fs.writeFileSync('master-key.txt', crypto.randomBytes(96));
+        } catch (err) {
+          console.error(err);
+        }
    .. tab::
       :tabid: python
 
       The following script generates a 96-byte locally-managed master key and
       saves it to a file called ``master-key.txt`` in the directory
       from which the script is executed.
-      
+
       .. code-block:: python
 
         import os
@@ -344,10 +334,10 @@ locally-managed master key.
       <https://raw.githubusercontent.com/mongodb/docs-assets/DOCSP-csfle-data-encryption-key/DataEncryptionKeyGenerator.js>`_.
 
       .. note::
-      
+
          The code linked above includes a dependency on the
          ``mongo-client-encryption`` npm package. See the `npmjs
-         documentation on the mongodb-client-encryption package 
+         documentation on the mongodb-client-encryption package
          <https://www.npmjs.com/package/mongodb-client-encryption>`_ for
          installation instructions.
    .. tab::
@@ -623,23 +613,21 @@ MedcoMD engineers write a function to create a new patient record:
 
       .. code-block:: javascript
 
-         function insertPatient(collection, name, ssn, bloodType, medicalRecords,  policyNumber, provider) {
-             collection.insertOne({
-                name: name,
-                ssn: ssn,
-                bloodType: bloodType,
-                medicalRecords: medicalRecords,
-                insurance: {
-                    policyNumber: policyNumber,
-                    provider: provider
-                }
-             })
-             .then((writeResult) => {
-                 console.log("writeResult:", writeResult);
-             })
-             .catch((writeError) => {
-                 console.log("writeError occurred:", writeError);
-             })
+         async function insertPatient(collection, name, ssn, bloodType, medicalRecords, policyNumber, provider) {
+           try {
+             const writeResult = await collection.insertOne({
+               name,
+               ssn,
+               bloodType,
+               medicalRecords,
+               insurance: {
+                 policyNumber,
+                 provider
+               }
+             });
+           } catch (writeError) {
+             console.error('writeError occurred:', writeError);
+           }
          }
    .. tab::
       :tabid: python