|
@@ -422,7 +422,7 @@ module.exports = function(crowi, app) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
actions.user.remove = function(req, res) {
|
|
actions.user.remove = function(req, res) {
|
|
|
- var id = req.params.id;
|
|
|
|
|
|
|
+ const id = req.params.id;
|
|
|
let username = '';
|
|
let username = '';
|
|
|
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
@@ -443,17 +443,10 @@ module.exports = function(crowi, app) {
|
|
|
})
|
|
})
|
|
|
.then((userData) => {
|
|
.then((userData) => {
|
|
|
// remove all External Accounts
|
|
// remove all External Accounts
|
|
|
- ExternalAccount.remove({user: userData})
|
|
|
|
|
- .then((err) => {
|
|
|
|
|
- if (err) {
|
|
|
|
|
- throw new Error(err.message);
|
|
|
|
|
- }
|
|
|
|
|
- return userData;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ return ExternalAccount.remove({user: userData}).then(() => userData);
|
|
|
})
|
|
})
|
|
|
.then((userData) => {
|
|
.then((userData) => {
|
|
|
- return Page.removePageByPath(`/user/${username}`)
|
|
|
|
|
- .then(() => userData);
|
|
|
|
|
|
|
+ return Page.removePageByPath(`/user/${username}`).then(() => userData);
|
|
|
})
|
|
})
|
|
|
.then((userData) => {
|
|
.then((userData) => {
|
|
|
req.flash('successMessage', `${username} さんのアカウントを削除しました`);
|
|
req.flash('successMessage', `${username} さんのアカウントを削除しました`);
|