fix(background): Fix adding custom integrations URLs (#1861)

toggl · Oct 13, 2020 · b35f36b · b35f36b
1 parent e313cc1
commit b35f36b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/src/scripts/background.js b/src/scripts/background.js
@@ -2227,30 +2227,16 @@ window.TogglButton = {
   },
 
   extractDomain: async function (url, checkLogin = true) {
-    let domain;
     if (checkLogin && !TogglButton.$user) {
       return false;
     }
-    // find & remove protocol (http, ftp, etc.) and get domain
-    if (url.indexOf('://') > -1) {
-      domain = url.split('/')[2];
-    } else {
-      domain = url.split('/')[0];
-    }
-
-    // remove www if needed
-    // domain = domain.replace("www.", "");
-
-    // remove /* from the end
-    domain = domain.split('/*')[0];
 
-    // find & remove port number
-    domain = domain.split(':')[0];
+    const hostname = new URL(url).hostname.replace('www.', '');
+    const file = await db.getOriginFileName(hostname);
 
-    const file = await db.getOriginFileName(domain);
     return {
       file: file,
-      origins: ['*://' + domain + '/*']
+      origins: ['*://' + hostname + '/*']
     };
   },
 

diff --git a/src/scripts/settings.js b/src/scripts/settings.js
@@ -487,7 +487,7 @@ const Settings = {
     }
 
     Settings.$newPermission.value = text;
-    const domain = '*://' + Settings.$newPermission.value + '/';
+    const domain = '*://*.' + Settings.$newPermission.value + '/';
     const permission = { origins: [domain] };
 
     browser.permissions.request(permission)