krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent user from blocking himself - fixes #9097 (#9194)

Browse Source 
* Added check - user can't block himself

* removed exclusive test
This commit is contained in:
borisabramovich86
2017-10-18 23:26:01 +03:00
committed by Sabe Jones
parent 444f393f3a
commit 15626b8ae1
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/common/ops/blockUser.test.js
View File

@@ -25,6 +25,15 @@ describe('shared.ops.blockUser', () => {
} }
}); });
it('validates user can\'t block himself', (done) => {
try {
blockUser(user, { params: { uuid: user._id } });
} catch (error) {
expect(error.message).to.eql(i18n.t('blockYourself'));
done();
}
});
it('blocks user', () => { it('blocks user', () => {
let [result] = blockUser(user, { params: { uuid: blockedUser._id } }); let [result] = blockUser(user, { params: { uuid: blockedUser._id } });
expect(user.inbox.blocks).to.eql([blockedUser._id]); expect(user.inbox.blocks).to.eql([blockedUser._id]);

1
website/common/locales/en_GB/contrib.json
View File

@@ -52,6 +52,7 @@
"pageMustBeNumber": "req.query.page must be a number", "pageMustBeNumber": "req.query.page must be a number",
"userNotFound": "User not found.", "userNotFound": "User not found.",
"invalidUUID": "UUID must be valid", "invalidUUID": "UUID must be valid",
"blockYourself": "You can't block yourself!",
"title": "Title", "title": "Title",
"moreDetails": "More details (1-7)", "moreDetails": "More details (1-7)",
"moreDetails2": "more details (8-9)", "moreDetails2": "more details (8-9)",

1
website/common/script/ops/blockUser.js
View File

@@ -6,6 +6,7 @@ import {
module.exports = function blockUser (user, req = {}) { module.exports = function blockUser (user, req = {}) {
if (!validator.isUUID(req.params.uuid)) throw new BadRequest(i18n.t('invalidUUID', req.language)); if (!validator.isUUID(req.params.uuid)) throw new BadRequest(i18n.t('invalidUUID', req.language));
if (req.params.uuid === user._id) throw new BadRequest(i18n.t('blockYourself', req.language));
let i = user.inbox.blocks.indexOf(req.params.uuid); let i = user.inbox.blocks.indexOf(req.params.uuid);
if (i === -1) { if (i === -1) {