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

fix: add auth and headers for old collection

Browse Source
This commit is contained in:
nivedin
2023-12-09 14:10:16 +05:30
committed by Andrew Bastin
parent 16bbfec736
commit b6f3b24b9e
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts
View File

@@ -106,8 +106,13 @@ function exportedCollectionToHoppCollection(
): HoppCollection<HoppRESTRequest | HoppGQLRequest> {
if (collectionType == "REST") {
const restCollection = collection as ExportedUserCollectionREST
const data = restCollection.data ? JSON.parse(restCollection.data) : null
const data =
restCollection.data && restCollection.data != "null"
? JSON.parse(restCollection.data)
: {
auth: { authType: "inherit", authActive: false },
headers: [],
}
return {
id: restCollection.id,
v: 1,
@@ -142,12 +147,18 @@ function exportedCollectionToHoppCollection(
testScript,
})
),
auth: data.auth ?? { authType: "inherit", authActive: false },
headers: data.headers ?? [],
auth: data.auth,
headers: data.headers,
}
} else {
const gqlCollection = collection as ExportedUserCollectionGQL
const data = gqlCollection.data ? JSON.parse(gqlCollection.data) : null
const data =
gqlCollection.data && gqlCollection.data !== "null"
? JSON.parse(gqlCollection.data)
: {
auth: { authType: "inherit", authActive: false },
headers: [],
}
return {
id: gqlCollection.id,
@@ -298,9 +309,15 @@ function setupUserCollectionCreatedSubscription() {
})
} else {
// root collections won't have parentCollectionID
const data = res.right.userCollectionCreated.data
? JSON.parse(res.right.userCollectionCreated.data)
: null
const data =
res.right.userCollectionCreated.data &&
res.right.userCollectionCreated.data != "null"
? JSON.parse(res.right.userCollectionCreated.data)
: {
auth: { authType: "inherit", authActive: false },
headers: [],
}
runDispatchWithOutSyncing(() => {
collectionType == "GQL"
? addGraphqlCollection({
@@ -308,19 +325,16 @@ function setupUserCollectionCreatedSubscription() {
folders: [],
requests: [],
v: 1,
auth: data?.auth ?? { authType: "inherit", authActive: false },
headers: data?.headers ?? [],
auth: data.auth,
headers: data.headers,
})
: addRESTCollection({
name: res.right.userCollectionCreated.title,
folders: [],
requests: [],
v: 1,
auth: data?.auth ?? {
authType: "inherit",
authActive: false,
},
headers: data?.headers ?? [],
auth: data.auth,
headers: data?.headers,
})
const localIndex = collectionStore.value.state.length - 1