self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-24 08:52:28 +02:00
Code Issues Releases Activity

fix(web): don't log unauthorized errors (#1871)

Browse Source 
* fix(web): don't log unauthorized errors

* fix docker build error
This commit is contained in:
Michel Heusschen 2023-02-26 17:50:18 +01:00 committed by GitHub
parent 3d468c369c
commit e157a69d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/hooks.server.ts
View File

@ -4,10 +4,26 @@ 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) {
const apiError = err as AxiosError;
// Ignore 401 unauthorized errors and log all others.
if (apiError.response?.status !== 401) {
console.error('[ERROR] hooks.server.ts [handle]:', err);
}
}
}
const res = await resolve(event);

9
web/src/routes/+layout.server.ts
View File

@ -1,12 +1,5 @@
import type { LayoutServerLoad } from './$types';
export const load = (async ({ locals: { api } }) => {
try {
const { data: user } = await api.userApi.getMyUserInfo();
export const load = (async ({ locals: { user } }) => {
return { user };
} catch (e) {
console.error('[ERROR] layout.server.ts [LayoutServerLoad]: ');
return { user: undefined };
}
}) satisfies LayoutServerLoad;