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

fix: fix url getting overridden when query params are present (#3130)

Browse Source
This commit is contained in:
Akash K
2023-06-09 21:53:55 +05:30
committed by GitHub
parent 24c6bce02d
commit 270f796683
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/hoppscotch-common/src/helpers/RESTExtURLParams.ts
View File

@@ -6,14 +6,18 @@ import { isJSONContentType } from "./utils/contenttypes"
* Handles translations for all the hopp.io REST Shareable URL params * Handles translations for all the hopp.io REST Shareable URL params
*/ */
export function translateExtURLParams( export function translateExtURLParams(
urlParams: Record<string, any> urlParams: Record<string, any>,
initialReq?: HoppRESTRequest
): HoppRESTRequest { ): HoppRESTRequest {
if (urlParams.v) return parseV1ExtURL(urlParams) if (urlParams.v) return parseV1ExtURL(urlParams, initialReq)
else return parseV0ExtURL(urlParams) else return parseV0ExtURL(urlParams, initialReq)
} }
function parseV0ExtURL(urlParams: Record<string, any>): HoppRESTRequest { function parseV0ExtURL(
const resolvedReq = getDefaultRESTRequest() urlParams: Record<string, any>,
initialReq?: HoppRESTRequest
): HoppRESTRequest {
const resolvedReq = initialReq ?? getDefaultRESTRequest()
if (urlParams.method && typeof urlParams.method === "string") { if (urlParams.method && typeof urlParams.method === "string") {
resolvedReq.method = urlParams.method resolvedReq.method = urlParams.method
@@ -89,8 +93,11 @@ function parseV0ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
return resolvedReq return resolvedReq
} }
function parseV1ExtURL(urlParams: Record<string, any>): HoppRESTRequest { function parseV1ExtURL(
const resolvedReq = getDefaultRESTRequest() urlParams: Record<string, any>,
initialReq?: HoppRESTRequest
): HoppRESTRequest {
const resolvedReq = initialReq ?? getDefaultRESTRequest()
if (urlParams.headers && typeof urlParams.headers === "string") { if (urlParams.headers && typeof urlParams.headers === "string") {
resolvedReq.headers = JSON.parse(urlParams.headers) resolvedReq.headers = JSON.parse(urlParams.headers)

5
packages/hoppscotch-common/src/pages/index.vue
View File

@@ -154,8 +154,11 @@ function bindRequestToURLParams() {
// If query params are empty, or contains code or error param (these are from Oauth Redirect) // If query params are empty, or contains code or error param (these are from Oauth Redirect)
// We skip URL params parsing // We skip URL params parsing
if (Object.keys(query).length === 0 || query.code || query.error) return if (Object.keys(query).length === 0 || query.code || query.error) return
const request = currentActiveTab.value.document.request
currentActiveTab.value.document.request = safelyExtractRESTRequest( currentActiveTab.value.document.request = safelyExtractRESTRequest(
translateExtURLParams(query), translateExtURLParams(query, request),
getDefaultRESTRequest() getDefaultRESTRequest()
) )
}) })