diff --git a/web/src/lib/components/user-settings-page/change-password-settings.svelte b/web/src/lib/components/user-settings-page/change-password-settings.svelte index 42d91074888..6e17f2e7dba 100644 --- a/web/src/lib/components/user-settings-page/change-password-settings.svelte +++ b/web/src/lib/components/user-settings-page/change-password-settings.svelte @@ -3,11 +3,11 @@ notificationController, NotificationType, } from '$lib/components/shared-components/notification/notification'; - import { type ApiError } from '$lib/utils'; import { changePassword } from '@immich/sdk'; import { fade } from 'svelte/transition'; import SettingInputField, { SettingInputFieldType } from '../admin-page/settings/setting-input-field.svelte'; import Button from '../elements/buttons/button.svelte'; + import type { HttpError } from '@sveltejs/kit'; let password = ''; let newPassword = ''; @@ -28,7 +28,7 @@ } catch (error) { console.error('Error [user-profile] [changePassword]', error); notificationController.show({ - message: (error as ApiError)?.response?.data?.message || 'Unable to change password', + message: (error as HttpError)?.body?.message || 'Unable to change password', type: NotificationType.Error, }); } diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts index c879fd90a56..c7c528052f9 100644 --- a/web/src/lib/utils.ts +++ b/web/src/lib/utils.ts @@ -14,7 +14,6 @@ import { type UserResponseDto, } from '@immich/sdk'; import { common } from '@immich/sdk/axios'; -import type { AxiosError } from 'axios'; import { get } from 'svelte/store'; interface UpdateParamAction { @@ -135,8 +134,6 @@ export const getAssetJobMessage = (job: AssetJobName) => { return messages[job]; }; -export type ApiError = AxiosError<{ message: string }>; - export const copyToClipboard = async (secret: string) => { try { await navigator.clipboard.writeText(secret); diff --git a/web/src/lib/utils/handle-error.ts b/web/src/lib/utils/handle-error.ts index bdf98e6fabb..be0c6d9802a 100644 --- a/web/src/lib/utils/handle-error.ts +++ b/web/src/lib/utils/handle-error.ts @@ -1,9 +1,9 @@ -import type { ApiError } from '$lib/utils'; import axios from 'axios'; import { notificationController, NotificationType } from '../components/shared-components/notification/notification'; +import type { HttpError } from '@sveltejs/kit'; export async function getServerErrorMessage(error: unknown) { - let data = (error as ApiError)?.response?.data; + let data = (error as HttpError)?.body; if (data instanceof Blob) { const response = await data.text(); try {