fix(NODE-5548): revert to truthiness check and drop encoding from readFile call

W-A-James · W-A-James · commit d166fb657fa0 · 2023-08-16T11:51:15.000-04:00
diff --git a/src/mongo_client.ts b/src/mongo_client.ts
@@ -435,11 +435,11 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
 
     if (options.tls) {
       if (typeof options.tlsCAFile === 'string') {
-        options.ca ??= await fs.readFile(options.tlsCAFile, { encoding: 'utf8' });
+        options.ca ??= await fs.readFile(options.tlsCAFile);
       }
       if (typeof options.tlsCertificateKeyFile === 'string') {
-        if (typeof options.key !== 'string' || typeof options.cert !== 'string') {
-          const contents = await fs.readFile(options.tlsCertificateKeyFile, { encoding: 'utf8' });
+        if (!options.key || !options.cert) {
+          const contents = await fs.readFile(options.tlsCertificateKeyFile);
           options.key ??= contents;
           options.cert ??= contents;
         }

Original file line number	Diff line number	Diff line change
`@@ -435,11 +435,11 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {`
`435`	`435`
`436`	`436`	`if (options.tls) {`
`437`	`437`	`if (typeof options.tlsCAFile === 'string') {`
`438`		`- options.ca ??= await fs.readFile(options.tlsCAFile, { encoding: 'utf8' });`
	`438`	`+ options.ca ??= await fs.readFile(options.tlsCAFile);`
`439`	`439`	`}`
`440`	`440`	`if (typeof options.tlsCertificateKeyFile === 'string') {`
`441`		`- if (typeof options.key !== 'string' \|\| typeof options.cert !== 'string') {`
`442`		`- const contents = await fs.readFile(options.tlsCertificateKeyFile, { encoding: 'utf8' });`
	`441`	`+ if (!options.key \|\| !options.cert) {`
	`442`	`+ const contents = await fs.readFile(options.tlsCertificateKeyFile);`
`443`	`443`	`options.key ??= contents;`
`444`	`444`	`options.cert ??= contents;`
`445`	`445`	`}`