diff --git a/web/src/lib/utils/auth.ts b/web/src/lib/utils/auth.ts index c22b706631..feb875e5ec 100644 --- a/web/src/lib/utils/auth.ts +++ b/web/src/lib/utils/auth.ts @@ -59,11 +59,11 @@ export const authenticate = async (url: URL, options?: AuthOptions) => { } if (!user) { - redirect(302, `${AppRoute.AUTH_LOGIN}?continue=${encodeURIComponent(url.pathname + url.search)}`); + redirect(307, `${AppRoute.AUTH_LOGIN}?continue=${encodeURIComponent(url.pathname + url.search)}`); } if (adminRoute && !user.isAdmin) { - redirect(302, AppRoute.PHOTOS); + redirect(307, AppRoute.PHOTOS); } }; diff --git a/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.ts index e9ae8c0dbe..f8a5484915 100644 --- a/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.ts +++ b/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.ts @@ -10,7 +10,7 @@ export const load = (async ({ url }) => { const { isElevated, pinCode } = await getAuthStatus(); if (!isElevated || !pinCode) { - redirect(302, `${AppRoute.AUTH_PIN_PROMPT}?continue=${encodeURIComponent(url.pathname + url.search)}`); + redirect(307, `${AppRoute.AUTH_PIN_PROMPT}?continue=${encodeURIComponent(url.pathname + url.search)}`); } const $t = await getFormatter(); diff --git a/web/src/routes/(user)/shared-links/(list)/[id]/+layout.ts b/web/src/routes/(user)/shared-links/(list)/[id]/+layout.ts index c3f62e36c3..df1209e0c4 100644 --- a/web/src/routes/(user)/shared-links/(list)/[id]/+layout.ts +++ b/web/src/routes/(user)/shared-links/(list)/[id]/+layout.ts @@ -9,12 +9,12 @@ export const load = (async ({ params, url }) => { await authenticate(url); if (!UUID_REGEX.test(params.id)) { - redirect(302, AppRoute.SHARED_LINKS); + redirect(307, AppRoute.SHARED_LINKS); } const [sharedLink] = await getAllSharedLinks({ id: params.id }); if (!sharedLink) { - redirect(302, AppRoute.SHARED_LINKS); + redirect(307, AppRoute.SHARED_LINKS); } const $t = await getFormatter(); diff --git a/web/src/routes/(user)/utilities/geolocation/photos/[photoId]/+page.ts b/web/src/routes/(user)/utilities/geolocation/photos/[photoId]/+page.ts index 17fd84097f..cc601adfcc 100644 --- a/web/src/routes/(user)/utilities/geolocation/photos/[photoId]/+page.ts +++ b/web/src/routes/(user)/utilities/geolocation/photos/[photoId]/+page.ts @@ -4,5 +4,5 @@ import type { PageLoad } from './$types'; export const load = (({ params }) => { const photoId = params.photoId; - return redirect(302, `${AppRoute.PHOTOS}/${photoId}`); + return redirect(307, `${AppRoute.PHOTOS}/${photoId}`); }) satisfies PageLoad; diff --git a/web/src/routes/+page.ts b/web/src/routes/+page.ts index 5ff4f58bf6..058a49982a 100644 --- a/web/src/routes/+page.ts +++ b/web/src/routes/+page.ts @@ -14,22 +14,22 @@ export const load = (async ({ fetch }) => { await init(fetch); if (serverConfigManager.value.maintenanceMode) { - redirect(302, AppRoute.MAINTENANCE); + redirect(307, AppRoute.MAINTENANCE); } const authenticated = await loadUser(); if (authenticated) { - redirect(302, AppRoute.PHOTOS); + redirect(307, AppRoute.PHOTOS); } if (serverConfigManager.value.isInitialized) { // Redirect to login page if there exists an admin account (i.e. server is initialized) - redirect(302, AppRoute.AUTH_LOGIN); + redirect(307, AppRoute.AUTH_LOGIN); } // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (redirectError: any) { - if (redirectError?.status === 302) { + if (redirectError?.status === 307) { throw redirectError; } } diff --git a/web/src/routes/admin/+page.ts b/web/src/routes/admin/+page.ts index db95540bdf..28dac3389e 100644 --- a/web/src/routes/admin/+page.ts +++ b/web/src/routes/admin/+page.ts @@ -3,5 +3,5 @@ import { redirect } from '@sveltejs/kit'; import type { PageLoad } from './$types'; export const load = (() => { - redirect(302, AppRoute.ADMIN_SETTINGS); + redirect(307, AppRoute.ADMIN_SETTINGS); }) satisfies PageLoad; diff --git a/web/src/routes/admin/library-management/[id]/+layout.ts b/web/src/routes/admin/library-management/[id]/+layout.ts index d465d92c45..c07c9281e9 100644 --- a/web/src/routes/admin/library-management/[id]/+layout.ts +++ b/web/src/routes/admin/library-management/[id]/+layout.ts @@ -13,7 +13,7 @@ export const load = (async ({ params: { id }, url }) => { try { library = await getLibrary({ id }); } catch { - redirect(302, AppRoute.ADMIN_LIBRARIES); + redirect(307, AppRoute.ADMIN_LIBRARIES); } const statistics = await getLibraryStatistics({ id }); diff --git a/web/src/routes/admin/queues/[name]/+page.ts b/web/src/routes/admin/queues/[name]/+page.ts index 3c111abf7c..9fe5c1ae5a 100644 --- a/web/src/routes/admin/queues/[name]/+page.ts +++ b/web/src/routes/admin/queues/[name]/+page.ts @@ -12,7 +12,7 @@ export const load = (async ({ params, url }) => { const name = fromQueueSlug(params.name); if (!name) { - redirect(302, AppRoute.ADMIN_QUEUES); + redirect(307, AppRoute.ADMIN_QUEUES); } const [queue, failedJobs] = await Promise.all([ diff --git a/web/src/routes/admin/users/[id]/+layout.ts b/web/src/routes/admin/users/[id]/+layout.ts index 32c41b0aca..64d31da58e 100644 --- a/web/src/routes/admin/users/[id]/+layout.ts +++ b/web/src/routes/admin/users/[id]/+layout.ts @@ -10,12 +10,12 @@ export const load = (async ({ params, url }) => { await requestServerInfo(); if (!UUID_REGEX.test(params.id)) { - redirect(302, AppRoute.ADMIN_USERS); + redirect(307, AppRoute.ADMIN_USERS); } const [user] = await searchUsersAdmin({ id: params.id, withDeleted: true }).catch(() => []); if (!user) { - redirect(302, AppRoute.ADMIN_USERS); + redirect(307, AppRoute.ADMIN_USERS); } const [userPreferences, userStatistics, userSessions] = await Promise.all([ diff --git a/web/src/routes/auth/change-password/+page.ts b/web/src/routes/auth/change-password/+page.ts index c4331b73cc..3ceb355688 100644 --- a/web/src/routes/auth/change-password/+page.ts +++ b/web/src/routes/auth/change-password/+page.ts @@ -9,7 +9,7 @@ import type { PageLoad } from './$types'; export const load = (async ({ url }) => { await authenticate(url); if (!get(user).shouldChangePassword) { - redirect(302, AppRoute.PHOTOS); + redirect(307, AppRoute.PHOTOS); } const $t = await getFormatter(); diff --git a/web/src/routes/auth/login/+page.ts b/web/src/routes/auth/login/+page.ts index 5577ab1a7e..4062c824f5 100644 --- a/web/src/routes/auth/login/+page.ts +++ b/web/src/routes/auth/login/+page.ts @@ -9,7 +9,7 @@ export const load = (async ({ parent, url }) => { if (!serverConfigManager.value.isInitialized) { // Admin not registered - redirect(302, AppRoute.AUTH_REGISTER); + redirect(307, AppRoute.AUTH_REGISTER); } const $t = await getFormatter(); diff --git a/web/src/routes/auth/register/+page.ts b/web/src/routes/auth/register/+page.ts index 344a37738c..0f9d6c7f0b 100644 --- a/web/src/routes/auth/register/+page.ts +++ b/web/src/routes/auth/register/+page.ts @@ -8,7 +8,7 @@ export const load = (async ({ parent }) => { await parent(); if (serverConfigManager.value.isInitialized) { // Admin has been registered, redirect to login - redirect(302, AppRoute.AUTH_LOGIN); + redirect(307, AppRoute.AUTH_LOGIN); } const $t = await getFormatter(); diff --git a/web/src/routes/link/+page.ts b/web/src/routes/link/+page.ts index 1bd0f4c856..dce027be2c 100644 --- a/web/src/routes/link/+page.ts +++ b/web/src/routes/link/+page.ts @@ -14,17 +14,17 @@ export const load = (({ url }) => { const target = queryParams.get('target') as LinkTarget; switch (target) { case LinkTarget.HOME: { - return redirect(302, AppRoute.PHOTOS); + return redirect(307, AppRoute.PHOTOS); } case LinkTarget.UNSUBSCRIBE: { - return redirect(302, `${AppRoute.USER_SETTINGS}?isOpen=notifications`); + return redirect(307, `${AppRoute.USER_SETTINGS}?isOpen=notifications`); } case LinkTarget.VIEW_ASSET: { const id = queryParams.get('id'); if (id) { - return redirect(302, `${AppRoute.PHOTOS}/${id}`); + return redirect(307, `${AppRoute.PHOTOS}/${id}`); } break; } @@ -42,12 +42,12 @@ export const load = (({ url }) => { redirectUrl.searchParams.append('activationKey', activationKey); } - return redirect(302, redirectUrl); + return redirect(307, redirectUrl); } break; } } - return redirect(302, AppRoute.PHOTOS); + return redirect(307, AppRoute.PHOTOS); }) satisfies PageLoad;