fix: use base uri from the referrer header and not query string

Author: thetutlage

npm-audit.html

@@ -55,7 +55,7 @@ <h5 class="card-title">
                 <div class="card">
                     <div class="card-body">
                         <h5 class="card-title">
-                            July 23rd 2020, 5:46:38 am
+                            July 23rd 2020, 7:09:43 am
                         </h5>
                         <p class="card-text">Last updated</p>
                     </div>

src/Redirect/index.ts

@@ -17,9 +17,23 @@ import { IncomingMessage } from 'http'
 import { RedirectContract, ResponseContract } from '@ioc:Adonis/Core/Response'
 import { RouterContract, MakeUrlOptions } from '@ioc:Adonis/Core/Route'
 
+/**
+ * Exposes the API to construct redirect routes
+ */
 export class Redirect implements RedirectContract {
+	/**
+	 * A boolean to forward the existing query string
+	 */
 	private forwardQueryString = false
+
+	/**
+	 * The status code for the redirect
+	 */
 	private statusCode = 302
+
+	/**
+	 * A custom query string to forward
+	 */
 	private queryString: { [key: string]: any } = {}
 
 	constructor(
@@ -61,32 +75,34 @@ export class Redirect implements RedirectContract {
 	 * Redirect to the previous path.
 	 */
 	public back() {
-		const url = (this.request.headers['referer'] ||
-			this.request.headers['referrer'] ||
-			'/') as string
+		let url = this.request.headers['referer'] || this.request.headers['referrer'] || '/'
+		url = Array.isArray(url) ? url[0] : url
 
-		return this.toPath(url)
+		/**
+		 * Remove query string from the referrer
+		 */
+		return this.toPath(url.split('?')[0])
 	}
 
 	/**
 	 * Redirect the request using a route identifier.
 	 */
 	public toRoute(routeIdentifier: string, urlOptions?: MakeUrlOptions, domain?: string) {
-		const route = this.router.lookup(routeIdentifier, domain)
+		// const route = this.router.lookup(routeIdentifier, domain)
 
-		if (!route) {
+		const url = this.router.makeUrl(routeIdentifier, urlOptions, domain)
+		if (!url) {
 			throw new Error(`Unable to lookup route for "${routeIdentifier}" identifier`)
 		}
 
-		const url = this.router.makeUrl(routeIdentifier, urlOptions, domain) as string
 		return this.toPath(url)
 	}
 
 	/**
 	 * Redirect the request using a path.
 	 */
 	public toPath(url: string) {
-		let query
+		let query: any
 
 		// Extract the current QueryString if we want to forward it.
 		if (this.forwardQueryString) {

test/redirect.spec.ts

@@ -132,15 +132,19 @@ test.group('Redirect', () => {
 		assert.equal(header.location, '/foo')
 	})
 
-	test('redirect back to referer', async (assert) => {
+	test('redirect back to referrer when query string', async (assert) => {
 		const server = createServer((req, res) => {
 			const response = new Response(req, res, encryption, responseConfig, router)
-			response.redirect('back')
+			response.redirect().withQs({ name: 'virk' }).back()
 			response.finish()
 		})
 
-		const { header } = await supertest(server).get('/').set('referer', '/foo').redirects(1)
-		assert.equal(header.location, '/foo')
+		const { header } = await supertest(server)
+			.get('/')
+			.set('referer', '/foo?name=virk')
+			.redirects(1)
+
+		assert.equal(header.location, '/foo?name=virk')
 	})
 
 	test('redirect back to root (/) when referrer header is not set', async (assert) => {