Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1035,14 +1035,14 @@ export class HttpResponse extends Macroable {
redirect(path: string, forwardQueryString?: boolean, statusCode?: number): void
redirect(
path?: string,
forwardQueryString: boolean = false,
forwardQueryString?: boolean,
statusCode: number = ResponseStatus.Found
): Redirect | void {
const handler = new Redirect(this.request, this, this.#router, this.#qs, this.#config.redirect)
handler.ctx = this.ctx

if (forwardQueryString) {
handler.withQs()
if (forwardQueryString !== undefined) {
handler.withQs(forwardQueryString)
}

if (path === 'back') {
Expand Down
52 changes: 52 additions & 0 deletions tests/redirect.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,58 @@ test.group('Redirect', () => {
assert.equal(header.location, '/foo?username=romain')
})

test('redirect to given url without overriding global query string forwarding', async ({
assert,
}) => {
const { url } = await httpServer.create((req, res) => {
const response = new HttpResponseFactory()
.merge({
req,
res,
encryption,
router,
config: {
redirect: {
allowedHosts: [],
forwardQueryString: true,
},
},
})
.create()

response.redirect('/foo')
response.finish()
})

const { header } = await supertest(url).get('/?username=romain').redirects(1)
assert.equal(header.location, '/foo?username=romain')
})

test('redirect to given url can disable global query string forwarding', async ({ assert }) => {
const { url } = await httpServer.create((req, res) => {
const response = new HttpResponseFactory()
.merge({
req,
res,
encryption,
router,
config: {
redirect: {
allowedHosts: [],
forwardQueryString: true,
},
},
})
.create()

response.redirect('/foo', false)
response.finish()
})

const { header } = await supertest(url).get('/?username=romain').redirects(1)
assert.equal(header.location, '/foo')
})

test('redirect to given url and forward current query string', async ({ assert }) => {
const { url } = await httpServer.create((req, res) => {
const response = new HttpResponseFactory().merge({ req, res, encryption, router }).create()
Expand Down
Loading