Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

breaking: remove socket.emit('user.changePicture')

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-12-12 11:53:00 -05:00
parent 0d694c781c
commit 6d95684bc8
2 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/socket.io/user/picture.js
View File

@@ -3,19 +3,7 @@
const user = require('../../user'); const user = require('../../user');
const plugins = require('../../plugins'); const plugins = require('../../plugins');
const websockets = require('../index');
const api = require('../../api');
module.exports = function (SocketUser) { module.exports = function (SocketUser) {
SocketUser.changePicture = async function (socket, data) {
if (!socket.uid) {
throw new Error('[[error:invalid-uid]]');
}
websockets.warnDeprecated(socket, 'PUT /api/v3/users/:uid/picture');
await api.users.changePicture(socket, data);
};
SocketUser.removeUploadedPicture = async function (socket, data) { SocketUser.removeUploadedPicture = async function (socket, data) {
if (!socket.uid || !data || !data.uid) { if (!socket.uid || !data || !data.uid) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');

52
test/user.js
View File

@@ -1057,15 +1057,10 @@ describe('User', () => {
}); });
}); });
it('should change user picture', (done) => { it('should change user picture', async () => {
socketUser.changePicture({ uid: uid }, { type: 'default', uid: uid }, (err) => { await apiUser.changePicture({ uid: uid }, { type: 'default', uid: uid });
assert.ifError(err); const picture = await User.getUserField(uid, 'picture');
User.getUserField(uid, 'picture', (err, picture) => { assert.equal(picture, '');
assert.ifError(err);
assert.equal(picture, '');
done();
});
});
}); });
it('should let you set an external image', async () => { it('should let you set an external image', async () => {
@@ -1090,32 +1085,29 @@ describe('User', () => {
assert.strictEqual(picture, validator.escape('https://example.org/picture.jpg')); assert.strictEqual(picture, validator.escape('https://example.org/picture.jpg'));
}); });
it('should fail to change user picture with invalid data', (done) => { it('should fail to change user picture with invalid data', async () => {
socketUser.changePicture({ uid: uid }, null, (err) => { try {
await apiUser.changePicture({ uid: uid }, null);
assert(false);
} catch (err) {
assert.equal(err.message, '[[error:invalid-data]]'); assert.equal(err.message, '[[error:invalid-data]]');
done(); }
});
}); });
it('should fail to change user picture with invalid uid', (done) => { it('should fail to change user picture with invalid uid', async () => {
socketUser.changePicture({ uid: 0 }, null, (err) => { try {
assert.equal(err.message, '[[error:invalid-uid]]'); await apiUser.changePicture({ uid: 0 }, { uid: 1 });
done(); assert(false);
}); } catch (err) {
assert.equal(err.message, '[[error:no-privileges]]');
}
}); });
it('should set user picture to uploaded', (done) => { it('should set user picture to uploaded', async () => {
User.setUserField(uid, 'uploadedpicture', '/test', (err) => { await User.setUserField(uid, 'uploadedpicture', '/test');
assert.ifError(err); await apiUser.changePicture({ uid: uid }, { type: 'uploaded', uid: uid });
socketUser.changePicture({ uid: uid }, { type: 'uploaded', uid: uid }, (err) => { const picture = await User.getUserField(uid, 'picture');
assert.ifError(err); assert.equal(picture, `${nconf.get('relative_path')}/test`);
User.getUserField(uid, 'picture', (err, picture) => {
assert.ifError(err);
assert.equal(picture, `${nconf.get('relative_path')}/test`);
done();
});
});
});
}); });
it('should return error if profile image uploads disabled', (done) => { it('should return error if profile image uploads disabled', (done) => {