btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: root collection auth issue and ui update

Browse Source
This commit is contained in:
nivedin
2023-12-04 12:51:32 +05:30
committed by Andrew Bastin
parent 369d01a399
commit ea8de655d7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-common/src/components/http/Headers.vue
View File

@@ -249,7 +249,7 @@
:icon="masking && header.source === 'auth' ? IconEye : IconEyeOff" :icon="masking && header.source === 'auth' ? IconEye : IconEyeOff"
@click="toggleMask()" @click="toggleMask()"
/> />
<span class="aspect-square w-[2.05rem]"></span> <span v-else class="aspect-square w-[2.05rem]"></span>
<span> <span>
<HoppButtonSecondary <HoppButtonSecondary
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"

15
packages/hoppscotch-common/src/newstore/collections.ts
View File

@@ -102,14 +102,25 @@ export function cascaseParentCollectionForHeaderAuth(
const isRootCollection = path.length === 1 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 = { auth = {
parentID: parentFolder.id ?? folderPath, parentID: parentFolder.id ?? folderPath,
parentName: parentFolder.name, parentName: parentFolder.name,
inheritedAuth: parentFolderAuth, inheritedAuth: parentFolderAuth,
} }
} }
// Update headers, overwriting duplicates by key // Update headers, overwriting duplicates by key
if (parentFolderHeaders) { if (parentFolderHeaders) {
const activeHeaders = parentFolderHeaders.filter((h) => h.active) const activeHeaders = parentFolderHeaders.filter((h) => h.active)