Add support for password function to native

brianc · May 3, 2022 · a542253 · a542253
1 parent f5e87ac
commit a542253
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/packages/pg/lib/connection-parameters.js b/packages/pg/lib/connection-parameters.js
@@ -124,9 +124,25 @@ class ConnectionParameters {
   }
 
   getLibpqConnectionString(cb) {
-    var params = []
-    add(params, this, 'user')
-    add(params, this, 'password')
+    if (typeof this.password === 'function') {
+      const pw = this.password();
+      if (typeof pw === 'string') {
+        return this._getLibpqConnectionString(cb, pw);
+      }
+      pw.then(pwString => this._getLibpqConnectionString(cb, pwString));
+      return;
+    }
+    this._getLibpqConnectionString(cb);
+  }
+
+  _getLibpqConnectionString(cb, pw) {
+    var params = [];
+    add(params, this, 'user');
+    if (pw != null) {
+      params.push('password=' + quoteParamValue(pw))
+    } else {
+      add(params, this, 'password');
+    }
     add(params, this, 'port')
     add(params, this, 'application_name')
     add(params, this, 'fallback_application_name')

diff --git a/packages/pg/test/unit/connection-parameters/creation-tests.js b/packages/pg/test/unit/connection-parameters/creation-tests.js
@@ -184,6 +184,30 @@ suite.testAsync('builds simple string', async function () {
   })
 })
 
+suite.testAsync('builds simple string with pw function', async function () {
+  var config = {
+    user: 'brian',
+    password: () => 'xyz',
+    port: 888,
+    host: 'localhost',
+    database: 'bam',
+  }
+  var subject = new ConnectionParameters(config)
+  const dnsHost = await getDNSHost(config.host)
+  return new Promise((resolve) => {
+    subject.getLibpqConnectionString(function (err, constring) {
+      assert(!err)
+      var parts = constring.split(' ')
+      checkForPart(parts, "user='brian'")
+      checkForPart(parts, "password='xyz'")
+      checkForPart(parts, "port='888'")
+      checkForPart(parts, `hostaddr='${dnsHost}'`)
+      checkForPart(parts, "dbname='bam'")
+      resolve()
+    })
+  })
+})
+
 suite.test('builds dns string', async function () {
   var config = {
     user: 'brian',