Node.js based forum software built for the modern web
refactor: allow changing admin pwds from cli
Barış Soner Uşaklı1033760e5bd4
diff --git a/src/cli/user.js b/src/cli/user.jsindex f2db7e4a58..4851f28c8b 100644--- a/src/cli/user.js+++ b/src/cli/user.js@@ -69,6 +69,7 @@ module.exports = () => {let db;let user;let groups;+let events;let privileges;let privHelpers;let utils;@@ -81,6 +82,7 @@ async function init() {user = require('../user');groups = require('../groups');+ events = require('../events');privileges = require('../privileges');privHelpers = require('../privileges/helpers');utils = require('../utils');@@ -217,11 +219,20 @@ ${pwGenerated ? ` Generated password: ${password}` : ''}`);const adminUid = await getAdminUidOrFail();if (password) {- await user.setUserField(uid, 'password', '');- await user.changePassword(adminUid, {- newPassword: password,- uid,+ user.isPasswordValid(password);+ const hashedPassword = await user.hashPassword(password);+ await user.setUserFields(uid, {+ password: hashedPassword,+ 'password:shaWrapped': 1,+ rss_token: utils.generateUUID(),+ }),+ await user.onPasswordChange(adminUid, uid);+ await events.log({+ type: 'password-change-from-cli',+ uid: adminUid,+ targetUid: uid,});+winston.info(`[userCmd/reset] ${password ? 'User password changed.' : ''}${pwGenerated ? ` Generated password: ${password}` : ''}`);}diff --git a/src/user/profile.js b/src/user/profile.jsindex b464871ab9..f9ebd85f7e 100644--- a/src/user/profile.js+++ b/src/user/profile.js@@ -392,18 +392,21 @@ module.exports = function (User) {}const hashedPassword = await User.hashPassword(data.newPassword);+ await User.setUserFields(data.uid, {+ password: hashedPassword,+ 'password:shaWrapped': 1,+ rss_token: utils.generateUUID(),+ }),+ await User.onPasswordChange(uid, data.uid);+ };++ User.onPasswordChange = async function (uid, targetUid) {await Promise.all([- User.setUserFields(data.uid, {- password: hashedPassword,- 'password:shaWrapped': 1,- rss_token: utils.generateUUID(),- }),- User.reset.cleanByUid(data.uid),- User.reset.updateExpiry(data.uid),- User.auth.revokeAllSessions(data.uid),- User.email.expireValidation(data.uid),+ User.reset.cleanByUid(targetUid),+ User.reset.updateExpiry(targetUid),+ User.auth.revokeAllSessions(targetUid),+ User.email.expireValidation(targetUid),]);-- plugins.hooks.fire('action:password.change', { uid: uid, targetUid: data.uid });+ plugins.hooks.fire('action:password.change', { uid, targetUid });};};