fixes to url parsing (#99)

* fixes to url parsing * make it a little more intelligent to pass tests
bitwarden · Apr 29, 2020 · 0092aac · 0092aac
1 parent 5e24e39
commit 0092aac
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/misc/utils.ts b/src/misc/utils.ts
@@ -281,14 +281,14 @@ export class Utils {
             return null;
         }
 
-        const hasProtocol = uriString.indexOf('://') > -1;
-        if (!hasProtocol && uriString.indexOf('.') > -1) {
-            uriString = 'http://' + uriString;
-        } else if (!hasProtocol) {
-            return null;
+        let url = Utils.getUrlObject(uriString);
+        if (url == null) {
+            const hasHttpProtocol = uriString.indexOf('http://') === 0 || uriString.indexOf('https://') === 0;
+            if (!hasHttpProtocol && uriString.indexOf('.') > -1) {
+                url = Utils.getUrlObject('http://' + uriString);
+            }
         }
-
-        return Utils.getUrlObject(uriString);
+        return url;
     }
 
     private static getUrlObject(uriString: string): URL {
@@ -298,6 +298,12 @@ export class Utils {
             } else if (typeof URL === 'function') {
                 return new URL(uriString);
             } else if (window != null) {
+                const hasProtocol = uriString.indexOf('://') > -1;
+                if (!hasProtocol && uriString.indexOf('.') > -1) {
+                    uriString = 'http://' + uriString;
+                } else if (!hasProtocol) {
+                    return null;
+                }
                 const anchor = window.document.createElement('a');
                 anchor.href = uriString;
                 return anchor as any;