High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): cancel uploads on logout (#21760)
Jason Rasmussene52cc259d568
diff --git a/web/src/lib/managers/upload-manager.svelte.ts b/web/src/lib/managers/upload-manager.svelte.tsindex 0ff2b0c214..61c6d73b53 100644--- a/web/src/lib/managers/upload-manager.svelte.ts+++ b/web/src/lib/managers/upload-manager.svelte.ts@@ -1,11 +1,16 @@import { eventManager } from '$lib/managers/event-manager.svelte';+import { uploadAssetsStore } from '$lib/stores/upload';import { getSupportedMediaTypes, type ServerMediaTypesResponseDto } from '@immich/sdk';class UploadManager {mediaTypes = $state<ServerMediaTypesResponseDto>({ image: [], sidecar: [], video: [] });constructor() {- eventManager.on('app.init', () => void this.#loadExtensions());+ eventManager.on('app.init', () => void this.#loadExtensions()).on('auth.logout', () => void this.reset());+ }++ reset() {+ uploadAssetsStore.reset();}async #loadExtensions() {diff --git a/web/src/lib/utils/file-uploader.ts b/web/src/lib/utils/file-uploader.tsindex 5f519f9d8e..c572ec1760 100644--- a/web/src/lib/utils/file-uploader.ts+++ b/web/src/lib/utils/file-uploader.ts@@ -2,6 +2,7 @@ import { authManager } from '$lib/managers/auth-manager.svelte';import { uploadManager } from '$lib/managers/upload-manager.svelte';import { UploadState } from '$lib/models/upload-asset';import { uploadAssetsStore } from '$lib/stores/upload';+import { user } from '$lib/stores/user.store';import { uploadRequest } from '$lib/utils';import { addAssetsToAlbum } from '$lib/utils/asset-utils';import { ExecutorQueue } from '$lib/utils/executor-queue';@@ -231,6 +232,11 @@ async function fileUploader({return responseData.id;} catch (error) {+ // ignore errors if the user logs out during uploads+ if (!get(user)) {+ return;+ }+const errorMessage = handleError(error, $t('errors.unable_to_upload_file'));uploadAssetsStore.track('error');uploadAssetsStore.updateItem(deviceAssetId, { state: UploadState.ERROR, error: errorMessage });