fix(core): dsn parse for endpoint with default standard port (#542)

Author: oluceps

packages/common/src/__test__/dsn.test.ts

@@ -41,8 +41,7 @@ describe('parseMinioDSN', () => {
     })
   })
 
-  // TODO: fix this
-  it.skip('correctly parses a minio DSN with https', () => {
+  it('correctly parses a minio DSN with https', () => {
     const dsn = parseMinioDSN('https://my-minio.example.com:443')
 
     expect(dsn).toEqual({
@@ -52,8 +51,24 @@ describe('parseMinioDSN', () => {
     })
   })
 
-  it('throws an error if port is missing', () => {
-    expect(() => parseMinioDSN('https://my-minio.example.com')).toThrow('Invalid Minio DSN')
+  it('correctly parses a minio DSN with https and standard port', () => {
+    const dsn = parseMinioDSN('https://my-minio.example.com')
+
+    expect(dsn).toEqual({
+      endPoint: 'my-minio.example.com',
+      port: 443,
+      useSSL: true,
+    })
+  })
+
+  it('correctly parses a minio DSN with http and standard port', () => {
+    const dsn = parseMinioDSN('http://my-minio.example.com')
+
+    expect(dsn).toEqual({
+      endPoint: 'my-minio.example.com',
+      port: 80,
+      useSSL: false,
+    })
   })
 
   it('throws an error if hostname is missing', () => {

packages/common/src/dsn.ts

@@ -11,19 +11,24 @@ interface MinioConnectionOptions {
 }
 
 export function parseMinioDSN(dsn: string): MinioConnectionOptions {
+  const HTTPS_DEFAULT_PORT = 443
+  const HTTP_DEFAULT_PORT = 80
+
   const url = new URL(dsn)
 
   const endPoint = url.hostname
-  const port = Number(url.port)
   const useSSL = url.protocol === 'https:'
 
-  if (!port || !endPoint) {
-    throw new Error('Invalid Minio DSN')
+  let port = Number(url.port)
+
+  // Cannot obtain port (0 or NaN), fill with default port of protocol
+  if (port === 0) {
+    port = useSSL ? HTTPS_DEFAULT_PORT : HTTP_DEFAULT_PORT
   }
 
-  return {
-    endPoint,
-    port,
-    useSSL,
+  if (!endPoint) {
+    throw new Error('Invalid Minio DSN')
   }
+
+  return { endPoint, port, useSSL }
 }