From b5623454dbcee08cdfcf240b18da25332ffbc148 Mon Sep 17 00:00:00 2001
From: Craig Allen <cjallen88@gmail.com>
Date: Wed, 27 Mar 2024 16:42:35 +0000
Subject: [PATCH] Fix name param (#20)

* Use URL parsing to get correct account details

* Housekeeping: await promises where appropriate

* Bump version
---
 containerize.js | 22 +++++++++++-----------
 manifest.json   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/containerize.js b/containerize.js
index 2f79938..320aa21 100644
--- a/containerize.js
+++ b/containerize.js
@@ -68,14 +68,14 @@ function listener(details) {
 
   let filter = browser.webRequest.filterResponseData(details.requestId);
 
-  let queryString = new URLSearchParams(details.url.split("?")[1]);
+  const queryString = new URL(details.url).searchParams;
   // Parse some params for container name
   let accountRole = queryString.get("role_name");
   let accountNumber = queryString.get("account_id");
 
   // pull subdomain for folks that might have multiple SSO
   // portals that have access to the same account and role names
-  let host = /:\/\/([^\/]+)/.exec(details.originUrl)[1];
+  const host = new URL(details.originUrl).host;
   let subdomain = host.split(".")[0];
 
   let params = {
@@ -123,19 +123,19 @@ function listener(details) {
 
         const container = await prepareContainer({ name });
 
+        // get index of tab we're about to remove, put ours at that spot
+        const tab = await browser.tabs.get(details.tabId);
+
         const createTabParams = {
           cookieStoreId: container.cookieStoreId,
           url: url,
-          pinned: false
+          pinned: false,
+          index: tab.index,
         };
 
-        // get index of tab we're about to remove, put ours at that spot
-        const tab = await browser.tabs.get(details.tabId);
-
-        createTabParams.index = tab.index;
-        browser.tabs.create(createTabParams);
+        await browser.tabs.create(createTabParams);
 
-        browser.tabs.remove(details.tabId);
+        await browser.tabs.remove(details.tabId);
       } else {
         filter.write(encoder.encode(str));
       }
@@ -281,9 +281,9 @@ async function samlListener(details) {
     index: tab.index,
   };
 
-  browser.tabs.create(createTabParams);
+  await browser.tabs.create(createTabParams);
 
-  browser.tabs.remove(details.tabId);
+  await browser.tabs.remove(details.tabId);
 
   return { cancel: true };
 }
diff --git a/manifest.json b/manifest.json
index c581932..932bb29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "AWS SSO Containers",
-  "version": "1.7",
+  "version": "1.8",
   "description": "Automatically places AWS SSO calls into containers.",
   "browser_specific_settings": {
     "gecko": {