fix: use POST call for user creation in ACP

- Not entirely sure about error handling yet, more research needed
- Also added socket method deprecation utility method
v1.18.x
Julian Lam 5 years ago
parent bba2a4638c
commit 58043e07ba

@ -353,16 +353,15 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
password: password, password: password,
}; };
socket.emit('admin.user.createUser', user, function (err) { $.post(config.relative_path + '/api/v1/users', user).done(function () {
if (err) {
return errorEl.translateHtml('[[admin/manage/users:alerts.error-x, ' + err.message + ']]').removeClass('hide');
}
modal.modal('hide'); modal.modal('hide');
modal.on('hidden.bs.modal', function () { modal.on('hidden.bs.modal', function () {
ajaxify.refresh(); ajaxify.refresh();
}); });
app.alertSuccess('[[admin/manage/users:alerts.create-success]]'); app.alertSuccess('[[admin/manage/users:alerts.create-success]]');
}).fail(function () {
console.log(arguments);
// return errorEl.translateHtml('[[admin/manage/users:alerts.error-x, ' + err.message + ']]').removeClass('hide');
}); });
} }

@ -72,6 +72,9 @@ socket = window.socket;
socket.on('event:alert', function (params) { socket.on('event:alert', function (params) {
app.alert(params); app.alert(params);
}); });
socket.on('event:deprecated_call', function (data) {
console.warn('[socket.io] ', data.eventName, 'is now deprecated in favour of', data.replacement);
});
socket.removeAllListeners('event:nodebb.ready'); socket.removeAllListeners('event:nodebb.ready');
socket.on('event:nodebb.ready', function (data) { socket.on('event:nodebb.ready', function (data) {

@ -11,6 +11,7 @@ const meta = require('../../meta');
const plugins = require('../../plugins'); const plugins = require('../../plugins');
const translator = require('../../translator'); const translator = require('../../translator');
const flags = require('../../flags'); const flags = require('../../flags');
const sockets = require('..');
const User = module.exports; const User = module.exports;
@ -57,6 +58,8 @@ User.removeAdmins = async function (socket, uids) {
}; };
User.createUser = async function (socket, userData) { User.createUser = async function (socket, userData) {
sockets.warnDeprecated(socket, 'POST /api/v1/users');
if (!userData) { if (!userData) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }

@ -258,3 +258,10 @@ Sockets.reqFromSocket = function (socket, payload, event) {
headers: headers, headers: headers,
}; };
}; };
Sockets.warnDeprecated = (socket, replacement) => {
socket.emit('event:deprecated_call', {
eventName: socket.previousEvents[socket.previousEvents.length - 1],
replacement: replacement,
});
};

Loading…
Cancel
Save