Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/composables/src/composables/useUser/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,8 @@ CustomerCreateInput
changePassword: async (context: Context, params) => {
Logger.debug('[Magento] changing user password');
const { data, errors } = await context.$magento.api.changeCustomerPassword(params);

if (errors) {
Logger.error(errors);

throw new Error(errors.map((e) => e.message).join(','));
}

Expand Down
4 changes: 2 additions & 2 deletions packages/theme/components/MyAccount/PasswordResetForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ export default defineComponent({
resetValidationFn();
};

const onError = () => {
const onError = (msg) => {
sendNotification({
id: Symbol('password_not_updated'),
message: 'It was not possible to update your password.',
message: msg,
type: 'danger',
icon: 'cross',
persist: false,
Expand Down
17 changes: 9 additions & 8 deletions packages/theme/pages/MyAccount/MyProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ export default defineComponent({
load,
loading,
updateUser,
error,
} = useUser();

const formHandler = async (fn, onComplete, onError) => {
try {
const data = await fn();
if (!data) throw new Error('API Error');
await onComplete(data);
} catch (error) {
onError(error);
await fn();
if (error.value.changePassword !== null) {
onError(error.value.changePassword);
} else {
onComplete();
}
};

Expand All @@ -100,13 +100,14 @@ export default defineComponent({
onComplete,
onError,
);

const updatePassword = ({
form,
onComplete,
onError,
}) => formHandler(async () => changePassword({
currentPassword: form.value.currentPassword,
newPassword: form.value.newPassword,
current: form.value.currentPassword,
new: form.value.newPassword,
}), onComplete, onError);

onSSR(async () => {
Expand Down