Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 15:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-04-15 12:43:28 -04:00
parent 49583fe48b
commit a6a02fb773
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/middleware/user.js
View File

@@ -185,9 +185,8 @@ module.exports = function (middleware) {
if (!userslug) {
return next();
}
const path = req.path.replace(/^\/api/, '')
.replace('uid', 'user')
.replace(uid, function () { return userslug; });
const path = req.url.replace(/^\/api/, '')
.replace(`/uid/${uid}`, () => `/user/${userslug}`);
controllers.helpers.redirect(res, path);
});

14
test/controllers.js
View File

@@ -1050,8 +1050,18 @@ describe('Controllers', function () {
});
});
it('should 404 if user does not exist', function (done) {
request(nconf.get('url') + '/api/uid/123123', { json: true }, function (err, res) {
it('should redirect to userslug and keep query params', (done) => {
request(`${nconf.get('url')}/api/uid/${fooUid}/topics?foo=bar`, { json: true }, (err, res, body) => {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert.equal(res.headers['x-redirect'], '/user/foo/topics?foo=bar');
assert.equal(body, '/user/foo/topics?foo=bar');
done();
});
});
it('should 404 if user does not exist', (done) => {
request(`${nconf.get('url')}/api/uid/123123`, { json: true }, (err, res) => {
assert.ifError(err);
assert.equal(res.statusCode, 404);
done();