From 577f8ccbbf5b8750347c6e412f477c63ab96fc58 Mon Sep 17 00:00:00 2001
From: Tiago Madeira <tiago@plasmic.app>
Date: Mon, 15 Jan 2024 14:04:34 -0300
Subject: [PATCH] Remove pg-connection-string from the client

Change-Id: Ie1e9f41be18810a13acf9b5799057257f0f299d1
GitOrigin-RevId: 5a856144576a4f42c48e937bd8b5037b37a68e46
---
 .../components/modals/DataSourceModal.tsx     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/platform/wab/src/wab/client/components/modals/DataSourceModal.tsx b/platform/wab/src/wab/client/components/modals/DataSourceModal.tsx
index 86f9cab9fac..7735ff271fb 100644
--- a/platform/wab/src/wab/client/components/modals/DataSourceModal.tsx
+++ b/platform/wab/src/wab/client/components/modals/DataSourceModal.tsx
@@ -36,7 +36,6 @@ import { DATA_SOURCE_CAP, DATA_SOURCE_LOWER } from "@/wab/shared/Labels";
 import { Alert, Form, FormInstance, Input, notification } from "antd";
 import jsonrepair from "jsonrepair";
 import { isEqual, noop } from "lodash";
-import { parse } from "pg-connection-string";
 import React from "react";
 import { Modal } from "src/wab/client/components/widgets/Modal";
 import useSWR, { useSWRConfig } from "swr";
@@ -66,6 +65,20 @@ function isDataSourceAlias(x: unknown): x is DataSourceAlias {
   return typeof x === "object" && x !== null && "aliasFor" in x;
 }
 
+// https://www.npmjs.com/package/pg-connection-string has a broader
+// support for connection strings, but it can't run on the browser
+// as of 2024-01-15.
+function parseConnectionString(connectionString: string) {
+  const url = new URL(connectionString.replace(/^[a-z]*:\/\//, "ftp://"));
+  return {
+    host: url.hostname,
+    port: url.port,
+    user: url.username,
+    password: url.password,
+    database: url.pathname.replace(/^\//, ""),
+  };
+}
+
 const DATA_SOURCE_ALIASES: DataSourceAlias[] = [
   {
     id: "supabase",
@@ -850,20 +863,7 @@ function PostgresConnectionStringImportButton(props: {
           if (!connectionString) {
             return;
           }
-          // pg-connection-string 2.6.2 does not work in the browser because
-          // of browser's URL constructor behavior. In the browser,
-          // `new URL("postgres://user:pass@host:123/base")` is not well
-          // understood. The following line is a workaround to make it work.
-          // We just replace the existing protocol (pg, postgres, postgresql,
-          // ...) with `ftp` - that way the browser will parse it correctly.
-          // In the future, when pg-connection-string is fixed/updated, we
-          // should be able to just parse `connectionString`. The issue is
-          // filed to: https://github.com/brianc/node-postgres/issues/3126
-          const hackyConnectionString = connectionString.replace(
-            /^[a-z]*:\/\//,
-            "ftp://"
-          );
-          const connectionOptions = parse(hackyConnectionString);
+          const connectionOptions = parseConnectionString(connectionString);
 
           form.setFieldsValue({
             credentials: {