diff --git a/src/composables/useCau.js b/src/composables/useCau.js index 29319bd9a..a71300464 100644 --- a/src/composables/useCau.js +++ b/src/composables/useCau.js @@ -11,6 +11,7 @@ export async function useCau(res, message) { const { config, headers, request, status, statusText, data } = res || {}; const { params, url, method, signal, headers: confHeaders } = config || {}; const { message: resMessage, code, name } = data?.error || {}; + delete confHeaders.Authorization; const additionalData = { path: location.hash, @@ -40,7 +41,7 @@ export async function useCau(res, message) { handler: async () => { const locale = i18n.global.t; const reason = ref( - code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : '' + code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : '', ); openConfirmationModal( locale('cau.title'), @@ -59,10 +60,9 @@ export async function useCau(res, message) { 'onUpdate:modelValue': (val) => (reason.value = val), label: locale('cau.inputLabel'), class: 'full-width', - required: true, autofocus: true, }, - } + }, ); }, }, diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue index ccf029e44..9e573b1bd 100644 --- a/src/pages/Account/Card/AccountDescriptorMenu.vue +++ b/src/pages/Account/Card/AccountDescriptorMenu.vue @@ -34,6 +34,12 @@ account.value.hasAccount = hasAccount.value; const entityId = computed(() => +route.params.id); const hasitManagementAccess = ref(); const hasSysadminAccess = ref(); +const isHimself = computed(() => user.value.id === account.value.id); +const url = computed(() => + isHimself.value + ? 'Accounts/change-password' + : `Accounts/${entityId.value}/setPassword` +); async function updateStatusAccount(active) { if (active) { @@ -106,11 +112,8 @@ onMounted(() => { :ask-old-pass="askOldPass" :submit-fn=" async (newPassword, oldPassword) => { - await axios.patch(`Accounts/change-password`, { - userId: entityId, - newPassword, - oldPassword, - }); + const body = isHimself ? { userId: entityId, oldPassword } : {}; + await axios.patch(url, { ...body, newPassword }); } " /> @@ -158,16 +161,10 @@ onMounted(() => { > {{ t('globals.delete') }} - - - {{ t('globals.changePass') }} + + + {{ isHimself ? t('globals.changePass') : t('globals.setPass') }} - {{ t('globals.setPass') }}