feat(postgressql-session-storage): make connection string extensible …

…with any pg config Signed-off-by: Octanium <[email protected]>
Shopify · Nov 8, 2023 · 462b039 · 462b039
1 parent 794cdb9
commit 462b039
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/packages/shopify-app-session-storage-postgresql/src/postgres-connection.ts b/packages/shopify-app-session-storage-postgresql/src/postgres-connection.ts
@@ -1,14 +1,26 @@
-import pg from 'pg';
+import pg, {type PoolConfig} from 'pg';
 import {RdbmsConnection} from '@shopify/shopify-app-session-storage';
 
 export class PostgresConnection implements RdbmsConnection {
   sessionStorageIdentifier: string;
   private ready: Promise<void>;
   private pool: pg.Pool;
-  private dbUrl: URL;
+  private config: PoolConfig;
 
-  constructor(dbUrl: string, sessionStorageIdentifier: string) {
-    this.dbUrl = new URL(dbUrl);
+  constructor(config: string | PoolConfig, sessionStorageIdentifier: string) {
+    if (typeof config === 'string') {
+      const dbUrl = new URL(config);
+
+      this.config = {
+        host: dbUrl.hostname,
+        user: decodeURIComponent(dbUrl.username),
+        password: decodeURIComponent(dbUrl.password),
+        database: decodeURIComponent(dbUrl.pathname.slice(1)),
+        port: Number(dbUrl.port),
+      };
+    } else {
+      this.config = config;
+    }
     this.ready = this.init();
     this.sessionStorageIdentifier = sessionStorageIdentifier;
   }
@@ -60,7 +72,7 @@ export class PostgresConnection implements RdbmsConnection {
   }
 
   public getDatabase(): string | undefined {
-    return decodeURIComponent(this.dbUrl.pathname.slice(1));
+    return this.config.database;
   }
 
   async hasTable(tablename: string): Promise<boolean> {
@@ -83,12 +95,6 @@ export class PostgresConnection implements RdbmsConnection {
   }
 
   private async init(): Promise<void> {
-    this.pool = new pg.Pool({
-      host: this.dbUrl.hostname,
-      user: decodeURIComponent(this.dbUrl.username),
-      password: decodeURIComponent(this.dbUrl.password),
-      database: this.getDatabase(),
-      port: Number(this.dbUrl.port),
-    });
+    this.pool = new pg.Pool(this.config);
   }
 }
diff --git a/packages/shopify-app-session-storage-postgresql/src/postgresql.ts b/packages/shopify-app-session-storage-postgresql/src/postgresql.ts
@@ -7,6 +7,7 @@ import {
 import {migrationList} from './migrations';
 import {PostgresConnection} from './postgres-connection';
 import {PostgresSessionStorageMigrator} from './postgres-migrator';
+import type {PoolConfig} from 'pg';
 
 export interface PostgreSQLSessionStorageOptions
   extends RdbmsSessionStorageOptions {
@@ -47,12 +48,12 @@ export class PostgreSQLSessionStorage implements SessionStorage {
   private migrator: PostgresSessionStorageMigrator;
 
   constructor(
-    dbUrl: URL | string,
+    config: string | URL | PoolConfig,
     opts: Partial<PostgreSQLSessionStorageOptions> = {},
   ) {
     this.options = {...defaultPostgreSQLSessionStorageOptions, ...opts};
     this.internalInit = this.init(
-      typeof dbUrl === 'string' ? dbUrl : dbUrl.toString(),
+      config instanceof URL ? config.toString() : config,
     );
     this.migrator = new PostgresSessionStorageMigrator(
       this.client,
@@ -144,8 +145,8 @@ export class PostgreSQLSessionStorage implements SessionStorage {
     return this.client.disconnect();
   }
 
-  private async init(dbUrl: string) {
-    this.client = new PostgresConnection(dbUrl, this.options.sessionTableName);
+  private async init(config: string | PoolConfig) {
+    this.client = new PostgresConnection(config, this.options.sessionTableName);
     await this.connectClient();
     await this.createTable();
   }