fix(normaliseUrlDomain): allow custom url scheme

ezyostudio · Jun 3, 2024 · f6c37a6 · f6c37a6
1 parent dc0badb
commit f6c37a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/lib/build/normalisedURLDomain.js b/lib/build/normalisedURLDomain.js
diff --git a/lib/ts/normalisedURLDomain.ts b/lib/ts/normalisedURLDomain.ts
@@ -27,7 +27,7 @@ export default class NormalisedURLDomain {
     };
 }
 
-function normaliseURLDomainOrThrowError(input: string, ignoreProtocol = false): string {
+function normaliseURLDomainOrThrowError(input: string): string {
     input = input.trim().toLowerCase();
 
     // if the input starts with a . (eg: .domain.tld)
@@ -36,7 +36,7 @@ function normaliseURLDomainOrThrowError(input: string, ignoreProtocol = false):
     }
 
     // if the input dosen't start with a protocol add a default one;
-    if (input.match(/^[^:]:\/\//)) {
+    if (!input.match(/^[^:]+:\/\//)) {
         if (input.startsWith("localhost") || isAnIpAddress(input)) {
             input = "http://" + input;
         } else {
@@ -47,15 +47,7 @@ function normaliseURLDomainOrThrowError(input: string, ignoreProtocol = false):
     try {
         const urlObj = new URL(input);
 
-        if (ignoreProtocol) {
-            if (urlObj.hostname.startsWith("localhost") || isAnIpAddress(urlObj.hostname)) {
-                return "http://" + urlObj.host;
-            } else {
-                return "https://" + urlObj.host;
-            }
-        } else {
-            return urlObj.protocol + "//" + urlObj.host;
-        }
+        return urlObj.protocol + "//" + urlObj.host;
     } catch {
         throw Error("Please provide a valid domain name");
     }