Skip to content

Commit

Permalink
fix: #8418
Browse files Browse the repository at this point in the history
allow updating other profile fields when username isnt being changed
  • Loading branch information
barisusakli committed Sep 13, 2020
1 parent 4be693f commit 38d3982
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/user/profile.js
Expand Up @@ -86,7 +86,9 @@ module.exports = function (User) {
}
data.username = data.username.trim();
const userData = await User.getUserFields(uid, ['username', 'userslug']);
var userslug = utils.slugify(data.username);
if (userData.username === data.username) {
return;
}

if (data.username.length < meta.config.minimumUsernameLength) {
throw new Error('[[error:username-too-short]]');
Expand All @@ -96,6 +98,7 @@ module.exports = function (User) {
throw new Error('[[error:username-too-long]]');
}

const userslug = utils.slugify(data.username);
if (!utils.isUserNameValid(data.username) || !userslug) {
throw new Error('[[error:invalid-username]]');
}
Expand Down
16 changes: 16 additions & 0 deletions test/user.js
Expand Up @@ -900,6 +900,22 @@ describe('User', function () {
});
});

it('should not let setting an empty username', async function () {
await socketUser.changeUsernameEmail({ uid: uid }, { uid: uid, username: '', password: '123456' });
const username = await db.getObjectField('user:' + uid, 'username');
assert.strictEqual(username, 'updatedAgain');
});

it('should let updating profile if current username is above max length and it is not being changed', async function () {
const maxLength = meta.config.maximumUsernameLength + 1;
const longName = new Array(maxLength).fill('a').join('');
const uid = await User.create({ username: longName });
await socketUser.changeUsernameEmail({ uid: uid }, { uid: uid, username: longName, email: 'verylong@name.com' });
const userData = await db.getObject('user:' + uid);
assert.strictEqual(userData.username, longName);
assert.strictEqual(userData.email, 'verylong@name.com');
});

it('should not update a user\'s username if it did not change', function (done) {
socketUser.changeUsernameEmail({ uid: uid }, { uid: uid, username: 'updatedAgain', password: '123456' }, function (err) {
assert.ifError(err);
Expand Down

0 comments on commit 38d3982

Please sign in to comment.