Skip to content
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.

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

response.redirect: extract special-cased back, fixes #904 #1115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ delegate(proto, 'response')
.method('set')
.method('append')
.method('flushHeaders')
.method('back')
.access('status')
.access('message')
.access('body')
Expand Down
25 changes: 24 additions & 1 deletion lib/response.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const extname = require('path').extname;
const vary = require('vary');
const only = require('only');
const util = require('util');
const deprecate = require('depd')('koa');

/**
* Prototype.
Expand Down Expand Up @@ -259,7 +260,11 @@ module.exports = {

redirect(url, alt) {
// location
if ('back' == url) url = this.ctx.get('Referrer') || alt || '/';
if ('back' == url) {
deprecate('Special-cased string "back" through redirect will be removed in v3, ' +
'consider migrating usage to ctx.back() instead.');
fl0w marked this conversation as resolved.
Show resolved Hide resolved
url = this.ctx.get('Referrer') || alt || '/';
}
this.set('Location', url);

// status
Expand All @@ -278,6 +283,24 @@ module.exports = {
this.body = `Redirecting to ${url}.`;
},

/**
* Perform a special-cased "back" to provide Referrer support.
* When Referrer is not present, `alt` or "/" is used.
*
* Examples:
*
* ctx.back()
* ctx.back('/index.html')
*
* @param {String} [alt]
* @api public
*/

back(alt) {
const url = this.ctx.get('Referrer') || alt || '/';
this.redirect(url);
},

/**
* Set Content-Disposition header to "attachment" with optional `filename`.
*
Expand Down
33 changes: 33 additions & 0 deletions test/response/back.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

'use strict';

const assert = require('assert');
const context = require('../helpers/context');

describe('ctx.back([alt])', () => {
it('should redirect to Referrer', () => {
const ctx = context();
ctx.req.headers.referrer = '/login';
ctx.back();
assert.equal(ctx.response.header.location, '/login');
});

it('should redirect to Referer', () => {
const ctx = context();
ctx.req.headers.referer = '/login';
ctx.back();
assert.equal(ctx.response.header.location, '/login');
});

it('should default to alt', () => {
const ctx = context();
ctx.back('/index.html');
assert.equal(ctx.response.header.location, '/index.html');
});

it('should default redirect to /', () => {
const ctx = context();
ctx.back();
assert.equal(ctx.response.header.location, '/');
});
});