mirror of
https://github.com/immich-app/immich.git
synced 2024-12-25 10:43:13 +02:00
fix(web): don't log unauthorized errors
This commit is contained in:
parent
09a1d56bf3
commit
7fc2987a77
@ -4,10 +4,24 @@ import { env } from '$env/dynamic/public';
|
||||
import { ImmichApi } from './api/api';
|
||||
|
||||
export const handle = (async ({ event, resolve }) => {
|
||||
event.locals.api = new ImmichApi({
|
||||
basePath: env.PUBLIC_IMMICH_SERVER_URL || 'http://immich-server:3001',
|
||||
accessToken: event.cookies.get('immich_access_token')
|
||||
});
|
||||
const basePath = env.PUBLIC_IMMICH_SERVER_URL || 'http://immich-server:3001';
|
||||
const accessToken = event.cookies.get('immich_access_token');
|
||||
const api = new ImmichApi({ basePath, accessToken });
|
||||
|
||||
// API instance that should be used for all server-side requests.
|
||||
event.locals.api = api;
|
||||
|
||||
if (accessToken) {
|
||||
try {
|
||||
const { data: user } = await api.userApi.getMyUserInfo();
|
||||
event.locals.user = user;
|
||||
} catch (err) {
|
||||
// Ignore 401 unauthorized errors and log all others.
|
||||
if (err instanceof AxiosError && err.response?.status !== 401) {
|
||||
console.error('[ERROR] hooks.server.ts [handle]:', err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const res = await resolve(event);
|
||||
|
||||
|
@ -1,12 +1,5 @@
|
||||
import type { LayoutServerLoad } from './$types';
|
||||
|
||||
export const load = (async ({ locals: { api } }) => {
|
||||
try {
|
||||
const { data: user } = await api.userApi.getMyUserInfo();
|
||||
|
||||
return { user };
|
||||
} catch (e) {
|
||||
console.error('[ERROR] layout.server.ts [LayoutServerLoad]: ');
|
||||
return { user: undefined };
|
||||
}
|
||||
export const load = (async ({ locals: { user } }) => {
|
||||
return { user };
|
||||
}) satisfies LayoutServerLoad;
|
||||
|
Loading…
Reference in New Issue
Block a user