make method

Author: baileympearson

lib/schema.js

@@ -893,9 +893,9 @@ Schema.prototype.add = function add(obj, prefix) {
  * @api private
  */
 Schema.prototype._addEncryptedField = function _addEncryptedField(path, fieldConfig) {
-  const type = this.path(path).instance.toLowerCase();
-  if (!this.path(path).supportsAutoEncryption) {
-    throw new Error('Invalid BSON type for FLE: `' + type + '`');
+  const type = this.path(path).autoEncryptionBSONType();
+  if (type == null) {
+    throw new Error(`Invalid BSON type for FLE field: '${path}'`);
   }
 
   this.encryptedFields[path] = clone(fieldConfig);

lib/schema/array.js

@@ -127,8 +127,6 @@ function SchemaArray(key, cast, options, schemaOptions) {
     defaultFn.$runBeforeSetters = !fn;
     this.default(defaultFn);
   }
-
-  this.supportsAutoEncryption = true;
 }
 
 /**
@@ -720,6 +718,10 @@ SchemaArray.prototype.toJSONSchema = function toJSONSchema(options) {
   };
 };
 
+SchemaArray.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'array';
+};
+
 /*!
  * Module exports.
  */

lib/schema/bigint.js

@@ -20,8 +20,6 @@ const createJSONSchemaTypeDefinition = require('../helpers/createJSONSchemaTypeD
 
 function SchemaBigInt(path, options) {
   SchemaType.call(this, path, options, 'BigInt');
-
-  this.supportsAutoEncryption = true;
 }
 
 /**
@@ -256,6 +254,10 @@ SchemaBigInt.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('string', 'long', options?.useBsonType, isRequired);
 };
 
+SchemaBigInt.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'int64';
+};
+
 /*!
  * Module exports.
  */

lib/schema/boolean.js

@@ -21,7 +21,7 @@ const createJSONSchemaTypeDefinition = require('../helpers/createJSONSchemaTypeD
 function SchemaBoolean(path, options) {
   SchemaType.call(this, path, options, 'Boolean');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -306,6 +306,10 @@ SchemaBoolean.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('boolean', 'bool', options?.useBsonType, isRequired);
 };
 
+SchemaBoolean.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'boolean';
+};
+
 /*!
  * Module exports.
  */

lib/schema/buffer.js

@@ -26,7 +26,7 @@ const CastError = SchemaType.CastError;
 function SchemaBuffer(key, options) {
   SchemaType.call(this, key, options, 'Buffer');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -316,6 +316,10 @@ SchemaBuffer.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('string', 'binData', options?.useBsonType, isRequired);
 };
 
+SchemaBuffer.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'binary';
+};
+
 /*!
  * Module exports.
  */

lib/schema/date.js

@@ -26,7 +26,7 @@ const CastError = SchemaType.CastError;
 function SchemaDate(key, options) {
   SchemaType.call(this, key, options, 'Date');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -442,6 +442,10 @@ SchemaDate.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('string', 'date', options?.useBsonType, isRequired);
 };
 
+SchemaDate.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'date';
+};
+
 /*!
  * Module exports.
  */

lib/schema/decimal128.js

@@ -22,7 +22,7 @@ const isBsonType = require('../helpers/isBsonType');
 function SchemaDecimal128(key, options) {
   SchemaType.call(this, key, options, 'Decimal128');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -237,6 +237,10 @@ SchemaDecimal128.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('string', 'decimal', options?.useBsonType, isRequired);
 };
 
+SchemaDecimal128.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'decimal128';
+};
+
 /*!
  * Module exports.
  */

lib/schema/double.js

@@ -21,7 +21,7 @@ const createJSONSchemaTypeDefinition = require('../helpers/createJSONSchemaTypeD
 function SchemaDouble(path, options) {
   SchemaType.call(this, path, options, 'Double');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -220,6 +220,10 @@ SchemaDouble.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('number', 'double', options?.useBsonType, isRequired);
 };
 
+SchemaDouble.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'double';
+};
+
 /*!
  * Module exports.
  */

lib/schema/int32.js

@@ -22,7 +22,7 @@ const handleBitwiseOperator = require('./operators/bitwise');
 function SchemaInt32(path, options) {
   SchemaType.call(this, path, options, 'Int32');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -262,6 +262,10 @@ SchemaInt32.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('number', 'int', options?.useBsonType, isRequired);
 };
 
+SchemaInt32.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'int32';
+};
+
 
 /*!
  * Module exports.

lib/schema/objectId.js

@@ -36,7 +36,7 @@ function SchemaObjectId(key, options) {
   }
   SchemaType.call(this, key, options, 'ObjectId');
 
-  this.supportsAutoEncryption = true;
+
 }
 
 /**
@@ -306,6 +306,10 @@ SchemaObjectId.prototype.toJSONSchema = function toJSONSchema(options) {
   return createJSONSchemaTypeDefinition('string', 'objectId', options?.useBsonType, isRequired);
 };
 
+SchemaObjectId.prototype.autoEncryptionBSONType = function autoEncryptionBSONType() {
+  return 'objectid';
+};
+
 /*!
  * Module exports.
  */