hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
remove socket.emit('user.deleteAccount')
remove socket.emit('user.follow')
remove socket.emit('user.unfollow')
remove socket.emit('user.saveSettings')
isekai-main
Barış Soner Uşaklı 3 years ago
parent 5e2281c350
commit 1f063058f0
3 changed files with 34 additions and 72 deletions
Show Stats Download Patch File Download Diff File

3
src/meta/index.js
Unescape Escape View File

@ -27,6 +27,9 @@ Meta.languages = require('./languages');
/* Assorted */
Meta.userOrGroupExists = async function (slug) {
if (!slug) {
throw new Error('[[error:invalid-data]]');
}
const user = require('../user');
const groups = require('../groups');
slug = slugify(slug);

33
src/socket.io/user.js
Unescape Escape View File

@ -5,7 +5,6 @@ const winston = require('winston');
const sleep = util.promisify(setTimeout);
const api = require('../api');
const user = require('../user');
const topics = require('../topics');
const messaging = require('../messaging');
@ -17,7 +16,6 @@ const db = require('../database');
const userController = require('../controllers/user');
const privileges = require('../privileges');
const utils = require('../utils');
const sockets = require('.');
const SocketUser = module.exports;
@ -26,21 +24,6 @@ require('./user/status')(SocketUser);
require('./user/picture')(SocketUser);
require('./user/registration')(SocketUser);
SocketUser.exists = async function (socket, data) {
sockets.warnDeprecated(socket, 'HEAD /api/v3/users/bySlug/:userslug *AND* HEAD /api/v3/groups/:slug');
if (!data || !data.username) {
throw new Error('[[error:invalid-data]]');
}
return await meta.userOrGroupExists(data.username);
};
SocketUser.deleteAccount = async function (socket, data) {
sockets.warnDeprecated(socket, 'DELETE /api/v3/users/:uid/account');
data.uid = socket.uid;
await api.users.deleteAccount(socket, data);
};
SocketUser.emailConfirm = async function (socket) {
if (!socket.uid) {
throw new Error('[[error:no-privileges]]');
@ -118,22 +101,6 @@ SocketUser.isFollowing = async function (socket, data) {
return await user.isFollowing(socket.uid, data.uid);
};
SocketUser.follow = async function (socket, data) {
sockets.warnDeprecated(socket, 'POST /api/v3/users/follow');
await api.users.follow(socket, data);
};
SocketUser.unfollow = async function (socket, data) {
sockets.warnDeprecated(socket, 'DELETE /api/v3/users/unfollow');
await api.users.unfollow(socket, data);
};
SocketUser.saveSettings = async function (socket, data) {
sockets.warnDeprecated(socket, 'PUT /api/v3/users/:uid/settings');
const settings = await api.users.updateSettings(socket, data);
return settings;
};
SocketUser.getUnreadCount = async function (socket) {
if (!socket.uid) {
return 0;

70
test/user.js
Unescape Escape View File

@ -1653,14 +1653,14 @@ describe('User', () => {
let delUid;
it('should fail with invalid data', (done) => {
socketUser.exists({ uid: testUid }, null, (err) => {
meta.userOrGroupExists(null, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should return true if user/group exists', (done) => {
socketUser.exists({ uid: testUid }, { username: 'registered-users' }, (err, exists) => {
meta.userOrGroupExists('registered-users', (err, exists) => {
assert.ifError(err);
assert(exists);
done();
@ -1668,7 +1668,7 @@ describe('User', () => {
});
it('should return true if user/group exists', (done) => {
socketUser.exists({ uid: testUid }, { username: 'John Smith' }, (err, exists) => {
meta.userOrGroupExists('John Smith', (err, exists) => {
assert.ifError(err);
assert(exists);
done();
@ -1676,7 +1676,7 @@ describe('User', () => {
});
it('should return false if user/group does not exists', (done) => {
socketUser.exists({ uid: testUid }, { username: 'doesnot exist' }, (err, exists) => {
meta.userOrGroupExists('doesnot exist', (err, exists) => {
assert.ifError(err);
assert(!exists);
done();
@ -1700,8 +1700,8 @@ describe('User', () => {
assert(result.url);
meta.config['profile:keepAllUserImages'] = 0;
await socketUser.deleteAccount({ uid: delUid }, {});
const exists = await socketUser.exists({ uid: testUid }, { username: 'willbedeleted' });
await apiUser.deleteAccount({ uid: delUid }, { uid: delUid });
const exists = await meta.userOrGroupExists('willbedeleted');
assert(!exists);
});
@ -1715,32 +1715,32 @@ describe('User', () => {
it('should fail to delete user with wrong password', async () => {
const uid = await User.create({ username: 'willbedeletedpwd', password: '123456' });
let err;
try {
await socketUser.deleteAccount({ uid: uid }, { password: '654321' });
} catch (_err) {
err = _err;
await apiUser.deleteAccount({ uid: uid }, { uid: uid, password: '654321' });
assert(false);
} catch (err) {
assert.strictEqual(err.message, '[[error:invalid-password]]');
}
assert.strictEqual(err.message, '[[error:invalid-password]]');
});
it('should delete user with correct password', async () => {
const uid = await User.create({ username: 'willbedeletedcorrectpwd', password: '123456' });
await socketUser.deleteAccount({ uid: uid }, { password: '123456' });
await apiUser.deleteAccount({ uid: uid }, { uid: uid, password: '123456' });
const exists = await User.exists(uid);
assert(!exists);
});
it('should fail to delete user if account deletion is not allowed', async () => {
const oldValue = meta.config.allowAccountDeletion;
meta.config.allowAccountDeletion = 0;
const oldValue = meta.config.allowAccountDelete;
meta.config.allowAccountDelete = 0;
const uid = await User.create({ username: 'tobedeleted' });
try {
await socketUser.deleteAccount({ uid: uid }, {});
await apiUser.deleteAccount({ uid: uid }, { uid: uid });
assert(false);
} catch (err) {
assert.equal(err.message, '[[error:no-privileges]]');
assert.strictEqual(err.message, '[[error:account-deletion-disabled]]');
}
meta.config.allowAccountDeletion = oldValue;
meta.config.allowAccountDelete = oldValue;
});
it('should send email confirm', async () => {
@ -1780,7 +1780,7 @@ describe('User', () => {
});
});
it('should save user settings', (done) => {
it('should save user settings', async () => {
const data = {
uid: testUid,
settings: {
@ -1800,17 +1800,12 @@ describe('User', () => {
followTopicsOnReply: 1,
},
};
socketUser.saveSettings({ uid: testUid }, data, (err) => {
assert.ifError(err);
User.getSettings(testUid, (err, data) => {
assert.ifError(err);
assert.equal(data.usePagination, true);
done();
});
});
await apiUser.updateSettings({ uid: testUid }, data);
const userSettings = await User.getSettings(testUid);
assert.strictEqual(userSettings.usePagination, true);
});
it('should properly escape homePageRoute', (done) => {
it('should properly escape homePageRoute', async () => {
const data = {
uid: testUid,
settings: {
@ -1830,18 +1825,13 @@ describe('User', () => {
followTopicsOnReply: 1,
},
};
socketUser.saveSettings({ uid: testUid }, data, (err) => {
assert.ifError(err);
User.getSettings(testUid, (err, data) => {
assert.ifError(err);
assert.strictEqual(data.homePageRoute, 'category/6/testing-ground');
done();
});
});
await apiUser.updateSettings({ uid: testUid }, data);
const userSettings = await User.getSettings(testUid);
assert.strictEqual(userSettings.homePageRoute, 'category/6/testing-ground');
});
it('should error if language is invalid', (done) => {
it('should error if language is invalid', async () => {
const data = {
uid: testUid,
settings: {
@ -1850,10 +1840,12 @@ describe('User', () => {
postsPerPage: '5',
},
};
socketUser.saveSettings({ uid: testUid }, data, (err) => {
try {
await apiUser.updateSettings({ uid: testUid }, data);
assert(false);
} catch (err) {
assert.equal(err.message, '[[error:invalid-language]]');
done();
});
}
});
it('should set moderation note', (done) => {

Write Preview
Loading…
Cancel
Save