minor refactor

adelsz · Feb 27, 2023 · c10095d · c10095d
1 parent efd1a63
commit c10095d
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/packages/query/src/actions.ts b/packages/query/src/actions.ts
@@ -109,15 +109,13 @@ export async function startup(
         throw new Error('SASL: No final SASL data returned');
       }
     } else if ('salt' in result) {
+      // hash password for md5 auth
       password = generateHash(options.user, password, result.salt);
-      await queue.send(messages.passwordMessage, { password });
-      await queue.reply(messages.authenticationOk);
-      await queue.reply(messages.readyForQuery);
-    } else {
-      await queue.send(messages.passwordMessage, { password });
-      await queue.reply(messages.authenticationOk);
-      await queue.reply(messages.readyForQuery);
     }
+    // handles both cleartext and md5 password auth
+    await queue.send(messages.passwordMessage, { password });
+    await queue.reply(messages.authenticationOk);
+    await queue.reply(messages.readyForQuery);
   } catch (e) {
     // tslint:disable-next-line:no-console
     console.error(`Connection failed: ${(e as any).message}`);