Merge branch 'main' into feature/improving-public-key-fingerprint

# Conflicts:
#	lib/mcapi/utils/utils.js

Author: rossphelan

dist/client-encryption-nodejs.min.js

@@ -13,14 +13,20 @@ const c = require("../utils/constants");
 function FieldLevelCrypto(config) {
   isValidConfig.call(this, config);
 
+  //Load public/private keys from text
+  if(config.useCertificateContent){
+    this.encryptionCertificate = utils.readPublicCertificateContent(config);
+    this.privateKey = utils.getPrivateKeyFromContent(config);
+   }
   // Load public certificate (for encryption)
-  this.encryptionCertificate = utils.readPublicCertificate(
-    config.encryptionCertificate
-  );
-
-  // Load private key (for decryption)
-  this.privateKey = utils.getPrivateKey(config);
+  else{
+    this.encryptionCertificate = utils.readPublicCertificate(
+      config.encryptionCertificate
+    );
 
+    // Load private key (for decryption)
+    this.privateKey = utils.getPrivateKey(config);
+  }
   this.encoding = config.dataEncoding;
 
   this.publicKeyFingerprint =

lib/mcapi/crypto/field-level-crypto.js

@@ -426,6 +426,16 @@ module.exports.addEncryptedDataToBody = function(encryptedData, path, encryptedV
   return body;
 };
 
+module.exports.readPublicCertificateContent = function (config) {
+  if (!config.encryptionCertificate || config.encryptionCertificate.length <= 1) {
+    throw new Error("Public certificate content is not valid");
+  }
+    return forge.pki.certificateFromPem(config.encryptionCertificate);
+}
 
-
-
+module.exports.getPrivateKeyFromContent = function(config) {
+  if (config.privateKey) {
+    return forge.pki.privateKeyFromPem(config.privateKey);
+  }
+  return null;
+}