diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js index 5262a012a..b75d85a1a 100644 --- a/src/components/moderation_tools/moderation_tools.js +++ b/src/components/moderation_tools/moderation_tools.js @@ -78,11 +78,11 @@ const ENTRIES = [ separator: true, }, { - check: '!action:disable_mfa', + check: 'action:disable_mfa', label: 'user_card.admin_menu.disable_mfa', }, { - check: '!action:require_password_change', + check: 'action:require_password_change', label: 'user_card.admin_menu.require_password_change', }, { @@ -507,21 +507,59 @@ const ModerationTools = { switch (group) { case 'action': { - if (name === 'delete') { - this.confirmDialogShow = true - this.confirmDialogTitle = this.$t( - 'user_card.admin_menu.confirm_modal.delete_title', - ) - this.confirmDialogDanger = true - this.confirmDialogContent = - 'user_card.admin_menu.confirm_modal.delete_content' - this.confirmDialogContent2 = - 'user_card.admin_menu.confirm_modal.delete_content_2' - this.confirmDialogConfirm = this.$t( - 'user_card.admin_menu.confirm_modal.delete', - ) + switch (name) { + case 'delete': { + this.confirmDialogShow = true + this.confirmDialogTitle = this.$t( + 'user_card.admin_menu.confirm_modal.delete_title', + ) + this.confirmDialogDanger = true + this.confirmDialogContent = + 'user_card.admin_menu.confirm_modal.delete_content' + this.confirmDialogContent2 = + 'user_card.admin_menu.confirm_modal.delete_content_2' + this.confirmDialogConfirm = this.$t( + 'user_card.admin_menu.confirm_modal.delete', + ) + break + } + case 'resend_confirmation': { + this.confirmDialogShow = true + this.confirmDialogTitle = this.$t( + 'user_card.admin_menu.confirm_modal.resend_confirmation_title', + ) + this.confirmDialogContent = + 'user_card.admin_menu.confirm_modal.resend_confirmation_content' + this.confirmDialogConfirm = this.$t( + 'user_card.admin_menu.confirm_modal.send', + ) + break + } + case 'disable_mfa': { + this.confirmDialogShow = true + this.confirmDialogTitle = this.$t( + 'user_card.admin_menu.confirm_modal.disable_mfa_title', + ) + this.confirmDialogContent = + 'user_card.admin_menu.confirm_modal.disable_mfa_content' + this.confirmDialogConfirm = this.$t( + 'settings.confirm' + ) + break + } + case 'require_password_change': { + this.confirmDialogShow = true + this.confirmDialogTitle = this.$t( + 'user_card.admin_menu.confirm_modal.require_password_change_title', + ) + this.confirmDialogContent = + 'user_card.admin_menu.confirm_modal.require_password_change_content' + this.confirmDialogConfirm = this.$t( + 'settings.confirm' + ) + break + } } - break } case 'state': { switch (name) { @@ -564,7 +602,7 @@ const ModerationTools = { //: this.$t('user_card.admin_menu.confirm_modal.revoke') break } - case 'suggest': { + case 'suggested': { this.confirmDialogTitle = this.$t( 'user_card.admin_menu.confirm_modal.suggest_title', ) diff --git a/src/i18n/en.json b/src/i18n/en.json index 011bef8c4..c602a2a03 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1788,7 +1788,7 @@ "revoke_admin": "Revoke Admin", "grant_moderator": "Grant Moderator", "revoke_moderator": "Revoke Moderator", - "activate_account": "Activate account", + "activate_account": "Activate", "deactivate_account": "Deactivate", "delete_account": "Delete", "suggest_account": "Add to suggested", @@ -1820,13 +1820,22 @@ "confirm_title": "Confirm users", "confirm_content": "Approve user {user}? | Approve {count} users?", "suggest_title": "Suggest users", - "add_suggest_content": "Add user {user} to suggested list? | Add {count} users to suggested list?", + "add_suggest_content": "Add user {user} to suggested users list? | Add {count} users to suggested users list?", + "remove_suggest_content": "Remove user {user} from suggested users list? | Add {count} users to suggested users list?", "rights_title": "Promote users", "grant_rights_content": "Grant user {user} {name} role? | Grant {count} users {name} role?", "revoke_rights_content": "Revoke {name} role from user {user}? | Revoke {name} from {count} users?", "tag_title": "Assign user policy", "assign_tag_content": "Assign {user} a {name} policy? | Assign {name} policy to {count} users?", "unassign_tag_content": "Unassign policy {name} from {user}? | Unassign policy {name} from {count} users?", + "resend_confirmation_title": "Email confirmation resend", + "resend_confirmation_content": "Resend confirmation email to {count} users?", + "disable_mfa_title": "Disable MFA", + "disable_mfa_content": "Disable Mult-Factor Authentication for {count} users?", + "require_password_change_title": "Force password change", + "require_password_change_content": "Force {count} users to change password on next login?", + "add": "Add", + "remove": "Remove", "delete": "Delete", "activate": "Activate", "deactivate": "Deactivate", @@ -1835,7 +1844,8 @@ "approve": "Approve", "confirm": "Confirm", "assign": "Assign", - "unassign": "Unassign" + "unassign": "Unassign", + "send": "Send" } }, "highlight_new": { diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 87e477a62..629f05c0c 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -1726,7 +1726,7 @@ const adminResendConfirmationEmail = ({ } const adminRequirePasswordChange = ({ - user: { screen_names: nicknames }, + screen_names: nicknames, credentials, }) => { const url = PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL @@ -1740,7 +1740,7 @@ const adminRequirePasswordChange = ({ }) } -const adminDisableMFA = ({ user: { screen_name: nickname }, credentials }) => { +const adminDisableMFA = ({ screen_name: nickname, credentials }) => { const url = PLEROMA_ADMIN_DISABLE_MFA_URL return promisedRequest({ url, diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js index d6bc4f9d3..590ff4bef 100644 --- a/src/stores/admin_settings.js +++ b/src/stores/admin_settings.js @@ -367,7 +367,9 @@ export const useAdminSettingsStore = defineStore('adminSettings', { }, // Singular only! disableMFA({ user }) { - return this.backendInteractor.adminDisableMFA(user) + const { screen_name } = user + + return this.backendInteractor.adminDisableMFA({ screen_name }) }, async setUsersTags({ users, tags, value }) { const screen_names = users.map((u) => u.screen_name)