Skip to content

fix: build request URL via string concatenation instead of assigning to URL.search #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omar-diop wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: build request URL via string concatenation instead of assigning to URL.search #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ export class Client {

req.params = req.params ?? {}
req.params['api-key'] = bearer
let eventSourceUrl = remoteURL.toString()
if (req.params) {
remoteURL.search = new URLSearchParams(req.params).toString()
const separator = eventSourceUrl.includes('?') ? '&' : '?'
eventSourceUrl = `${eventSourceUrl}${separator}${new URLSearchParams(req.params).toString()}`
}

return new EventSource(remoteURL)
return new EventSource(eventSourceUrl)
}

async getResponse({
Expand Down Expand Up @@ -203,11 +205,14 @@ export class Client {
requestObject.body = JSON.stringify(body)
}

let requestUrl = remoteURL.toString()
if (params) {
remoteURL.search = new URLSearchParams(params).toString()
const searchString = new URLSearchParams(params).toString()
const separator = requestUrl.includes('?') ? '&' : '?'
requestUrl = `${requestUrl}${separator}${searchString}`
}

const response = await fetch(remoteURL, requestObject)
const response = await fetch(requestUrl, requestObject)

if (response.status === 401) {
throw new Error(
Expand All @@ -217,7 +222,7 @@ export class Client {
if (response.status === 400) {
const errorText = await response.text()
throw new Error(
`Bad Request: ${errorText} (path: ${remoteURL.toString()})`,
`Bad Request: ${errorText} (path: ${requestUrl})`,
)
}
return response
Expand Down