Skip to content

BUGFIX. Изменения в auth/decorators.ts. Для корректной работы AuthApi.getMe() #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dmatrushka19 merged 2 commits into from
Apr 29, 2026
Merged

BUGFIX. Изменения в auth/decorators.ts. Для корректной работы AuthApi.getMe() #349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294ef11
изменения в auth/decorators.ts. Для корректной работы AuthApi.getMe()…
Dmatrushka19 Apr 29, 2026
ec98788
вернул корректную обработку ошибок
Dmatrushka19 Apr 29, 2026
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
18 changes: 11 additions & 7 deletions src/api/controllers/auth/decorators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,24 @@ export function scoped<F extends Func>(

export function showErrorToast<F extends Func>(
method: F
): Func<Promise<ReturnType<F>>, Parameters<F>> {
): Func<Promise<Awaited<ReturnType<F>> | undefined>, Parameters<F>> {
return async (...args: any[]) => {
const toastStore = useToastStore();

try {
const { error, response } = await method(...args);
if (error) {
throw error;
} else {
return response;
const result = await method(...args);

if (result?.error) {
throw result.error;
}

return result;
} catch (err: any) {
const error = err?.detail?.[0] ?? err;

if (error) {
toastStore.push({
title: error.ru ?? error.msg ?? error,
title: error?.ru ?? error?.msg ?? error?.message ?? String(error),
type: ToastType.Error,
});
} else {
Expand All @@ -60,6 +63,7 @@ export function showErrorToast<F extends Func>(
type: ToastType.Error,
});
}

return undefined;
}
};
Expand Down
Loading