diff --git a/src/components/settings_modal/admin_tabs/admin_card.js b/src/components/settings_modal/admin_tabs/admin_card.js index 34231c0aa..6c9ed46db 100644 --- a/src/components/settings_modal/admin_tabs/admin_card.js +++ b/src/components/settings_modal/admin_tabs/admin_card.js @@ -140,7 +140,7 @@ const AdminCard = { fetchStatuses (store, opts) { const u = this.$store.getters.findUser(this.userDetails.id) const res = store.dispatch('adminListStatuses', { user: u, opts: { pageSize: opts.pageSize, godmode: true, withReblogs: true}}) - return Promise.resolve(res.then(r => r.activities)) + return res.then(r => r.activities) } } } diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue index 68c377f09..bea1f83dc 100644 --- a/src/components/settings_modal/admin_tabs/admin_card.vue +++ b/src/components/settings_modal/admin_tabs/admin_card.vue @@ -133,13 +133,47 @@ :fetch-page="(store, opts) => fetchStatuses(store, opts)" > diff --git a/src/components/settings_modal/admin_tabs/admin_status_card.js b/src/components/settings_modal/admin_tabs/admin_status_card.js index 3aec8cf8e..aa7a5f2ef 100644 --- a/src/components/settings_modal/admin_tabs/admin_status_card.js +++ b/src/components/settings_modal/admin_tabs/admin_status_card.js @@ -25,6 +25,22 @@ const AdminStatusCard = { }, changeVisibility (v) { this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.statusDetails.id, visibility: v }}).then(res => parseStatus(res)).then(s => this.statusCache = s) + }, + // show popup + confirmSelection(box) { + this.$refs[box].show() + this.$refs.dropdown.hidePopover() + }, + // do the thing + selectionConfirmed(action, opts) { + const restricted = [] + const s = this.$refs.userList.getSelected() + s.forEach(u => { + if (restricted.includes(action) !== false || u.id !== this.$store.state.users.currentUser.id) { + this.$store.dispatch(action, { id: this.statusDetails.id, ...(opts || {}) }) + } + }) + this.reset() } }, components: { diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js index 5d27f7e4d..3486122e5 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.js +++ b/src/components/settings_modal/admin_tabs/users_tab.js @@ -86,123 +86,21 @@ const UsersTab = { reset () { this.$refs.userList.reset() }, - activateSelection () { - this.$refs.confirmActivate.show() + // show popup + confirmSelection(box) { + this.$refs[box].show() this.$refs.dropdown.hidePopover() }, - activateSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminActivateUser', this.$store.getters.findUser(u.id))) - this.reset() - }, - deactivateSelection () { - this.$refs.confirmDeactivate.show() - this.$refs.dropdown.hidePopover() - }, - deactivateSelectionConfirmed () { + // do the thing + selectionConfirmed(action) { + const restricted = [] const s = this.$refs.userList.getSelected() s.forEach(u => { - // avoid deactivating yourself - if (u.id !== this.$store.state.users.currentUser.id) { - this.$store.dispatch('adminDeactivateUser', this.$store.getters.findUser(u.id)) + if (restricted.includes(action) !== false || u.id !== this.$store.state.users.currentUser.id) { + this.$store.dispatch(action, this.$store.getters.findUser(u.id)) } }) this.reset() - }, - deleteSelection () { - this.$refs.confirmDelete.show() - this.$refs.dropdown.hidePopover() - }, - deleteSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => { - // avoid deleting yourself - if (u.id !== this.$store.state.users.currentUser.id) { - this.$store.dispatch('adminDeleteUser', this.$store.getters.findUser(u.id)) - } - }) - this.reset() - }, - grantAdminSelection () { - this.$refs.confirmGrantAdmin.show() - this.$refs.dropdown.hidePopover() - }, - grantAdminSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminAddUserToAdminGroup', this.$store.getters.findUser(u.id))) - this.reset() - }, - revokeAdminSelection () { - this.$refs.confirmRevokeAdminSelection.show() - this.$refs.dropdown.hidePopover() - }, - revokeAdminSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => { - // avoid shooting yourself in the foot - if (u.id !== this.$store.state.users.currentUser.id) { - this.$store.dispatch('adminRemoveUserToAdminGroup', this.$store.getters.findUser(u.id)) - } - }) - this.reset() - }, - grantModeratorSelection () { - this.$refs.confirmGrantModeratorSelection.show() - this.$refs.dropdown.hidePopover() - }, - grantModeratorSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminAddUserToModeratorGroup', this.$store.getters.findUser(u.id))) - this.reset() - }, - revokeModeratorSelection () { - this.$refs.confirmRevokeModeratorSelection.show() - this.$refs.dropdown.hidePopover() - }, - revokeModeratorSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => { - // you know the drill - if (u.id !== this.$store.state.users.currentUser.id) { - this.$store.dispatch('adminRemoveUserToModeratorGroup', this.$store.getters.findUser(u.id)) - } - }) - this.reset() - }, - approveSelection () { - this.$refs.confirmApproveSelection.show() - this.$refs.dropdown.hidePopover() - }, - approveSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminApproveUser', this.$store.getters.findUser(u.id))) - this.reset() - }, - confirmUserSelection () { - this.$refs.confirmSelection - }, - confirmUserSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminConfirmUser', this.$store.getters.findUser(u.id))) - this.reset() - }, - resendEmailSelection () { - this.$refs.resendEmailSelection.show() - this.$refs.dropdown.hidePopover() - }, - resendEmailSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminResendConfirmationEmail', this.$store.getters.findUser(u.id))) - this.reset() - }, - requirePasswordChangeSelection () { - this.$refs.requirePasswordChangeSelection.show() - this.$refs.dropdown.hidePopover() - }, - requirePasswordChangeSelectionConfirmed () { - const s = this.$refs.userList.getSelected() - s.forEach(u => this.$store.dispatch('adminRequirePasswordChange', this.$store.getters.findUser(u.id))) - this.reset() } }, mounted () { diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue index ffc980cd7..54d77989b 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.vue +++ b/src/components/settings_modal/admin_tabs/users_tab.vue @@ -136,7 +136,7 @@
@@ -144,7 +144,7 @@
@@ -152,7 +152,7 @@
@@ -160,7 +160,7 @@
@@ -168,7 +168,7 @@
@@ -176,7 +176,7 @@
@@ -184,7 +184,7 @@
@@ -192,7 +192,7 @@
@@ -200,7 +200,7 @@
@@ -208,11 +208,27 @@
+
+
+
+
+ +
@@ -227,70 +243,84 @@ :title="$t('admin_dash.users.bulk_actions.activate')" :cancel-text="$t('admin_dash.users.bulk_actions.no')" :confirm-text="$t('admin_dash.users.bulk_actions.yes')" - @callback="activateSelectedConfirmed" + @callback="selectionConfirmed('adminActivateUser')" /> + +
diff --git a/src/i18n/en.json b/src/i18n/en.json index 6b5630a07..a90ed8200 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1173,7 +1173,9 @@ "revoke_moderator": "Revoke Moderator Privileges From Selected Users?", "approve": "Approve Selected Users?", "confirm": "Confirm Selected Users?", - "require_password_change": "Require Password Change For Selected Users?" + "require_password_change": "Require Password Change For Selected Users?", + "resend_confirmation_email": "Resend Confirmation Email For Selected Users?", + "disable_mfa": "Disable MFA For Selected Users?" }, "activate": "Activate", "deactivate": "Deactivate", @@ -1186,6 +1188,7 @@ "confirm_user": "Confirm", "resend_confirmation_email": "Resend Confirmation Email", "require_password_change": "Require Password Change", + "disable_mfa": "Disable MFA", "delete": "Delete", "loading_user": "Loading user...", "delete_user": "Delete User", diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js index 70210a1eb..25d0a1f84 100644 --- a/src/modules/adminSettings.js +++ b/src/modules/adminSettings.js @@ -114,6 +114,9 @@ const adminSettingsStorage = { adminChangeStatusScope (store, { opts }) { return store.rootState.api.backendInteractor.adminChangeStatusScope({ opts }) }, + adminDisableMFA (store, { opts }) { + return store.rootState.api.backendInteractor.adminDisableMFA({ opts }) + }, loadFrontendsStuff ({ rootState, commit }) { rootState.api.backendInteractor.fetchAvailableFrontends() .then(frontends => commit('setAvailableFrontends', { frontends })) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 56b324635..31ea7acf5 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -146,6 +146,7 @@ const PLEROMA_ADMIN_APPROVE_URL = '/api/v1/pleroma/admin/users/approve' const PLEROMA_ADMIN_LIST_STATUSES_URL = (id, pageSize, godmode, withReblogs) => `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&godmode=${godmode}&with_reblogs=${withReblogs}` const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) => `/api/v1/pleroma/admin/statuses/${id}` const PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL = '/api/v1/pleroma/admin/users/force_password_reset' +const PLEROMA_ADMIN_DISABLE_MFA_URL = '/api/v1/pleroma/admin/users/disable_mfa' const PLEROMA_EMOJI_RELOAD_URL = '/api/pleroma/admin/reload_emoji' const PLEROMA_EMOJI_IMPORT_FS_URL = '/api/pleroma/emoji/packs/import' const PLEROMA_EMOJI_PACKS_URL = (page, pageSize) => `/api/v1/pleroma/emoji/packs?page=${page}&page_size=${pageSize}` @@ -1600,6 +1601,18 @@ const adminRequirePasswordChange = ({ user: { screen_name: nickname }, credentia }) } +const adminDisableMFA = ({ user : { screen_name: nickname }, credentials }) => { + const url = PLEROMA_ADMIN_DISABLE_MFA_URL + return promisedRequest({ + url, + credentials, + method: 'PUT', + payload: { + nickname + } + }) +} + const announcementToPayload = ({ content, startsAt, endsAt, allDay }) => { const payload = { content } @@ -2282,7 +2295,8 @@ const apiService = { adminApproveUser, adminListStatuses, adminChangeStatusScope, - adminRequirePasswordChange + adminRequirePasswordChange, + adminDisableMFA } export default apiService