From ea8de655d7aafd8398494cf73eadeb3e36f93d2f Mon Sep 17 00:00:00 2001
From: nivedin <nivedinp@gmail.com>
Date: Mon, 4 Dec 2023 12:51:32 +0530
Subject: [PATCH] chore: root collection auth issue and ui update

---
 .../src/components/http/Headers.vue               |  2 +-
 .../hoppscotch-common/src/newstore/collections.ts | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/http/Headers.vue b/packages/hoppscotch-common/src/components/http/Headers.vue
index 2e1c0ee2e..f7ce8caeb 100644
--- a/packages/hoppscotch-common/src/components/http/Headers.vue
+++ b/packages/hoppscotch-common/src/components/http/Headers.vue
@@ -249,7 +249,7 @@
               :icon="masking && header.source === 'auth' ? IconEye : IconEyeOff"
               @click="toggleMask()"
             />
-            <span class="aspect-square w-[2.05rem]"></span>
+            <span v-else class="aspect-square w-[2.05rem]"></span>
             <span>
               <HoppButtonSecondary
                 v-tippy="{ theme: 'tooltip' }"
diff --git a/packages/hoppscotch-common/src/newstore/collections.ts b/packages/hoppscotch-common/src/newstore/collections.ts
index c9100e926..d4f386b75 100644
--- a/packages/hoppscotch-common/src/newstore/collections.ts
+++ b/packages/hoppscotch-common/src/newstore/collections.ts
@@ -102,14 +102,25 @@ export function cascaseParentCollectionForHeaderAuth(
 
     const isRootCollection = path.length === 1
 
-    // Check if authType is not 'inherit'
-    if (parentFolderAuth?.authType !== "inherit" || isRootCollection) {
+    if (parentFolderAuth?.authType === "inherit" && isRootCollection) {
+      auth = {
+        parentID: parentFolder.id ?? folderPath,
+        parentName: parentFolder.name,
+        inheritedAuth: {
+          authType: "none",
+          authActive: true,
+        },
+      }
+    }
+
+    if (parentFolderAuth?.authType !== "inherit") {
       auth = {
         parentID: parentFolder.id ?? folderPath,
         parentName: parentFolder.name,
         inheritedAuth: parentFolderAuth,
       }
     }
+
     // Update headers, overwriting duplicates by key
     if (parentFolderHeaders) {
       const activeHeaders = parentFolderHeaders.filter((h) => h.active)