Fixes Session timeout error #2896 and #2897 (#2898)

LycheeOrg · Jan 13, 2025 · 773a5e3 · 773a5e3
1 parent 52b4a74
commit 773a5e3
Show file tree

Hide file tree

Showing 35 changed files with 258 additions and 99 deletions.
diff --git a/app/Http/Controllers/VueController.php b/app/Http/Controllers/VueController.php
@@ -82,4 +82,4 @@ private function check(AbstractAlbum $album): bool
 
 		return $result ? true : throw new UnauthorizedException();
 	}
-}
+}
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -43,4 +43,20 @@ public function handle($request, \Closure $next): mixed
 
 		return parent::handle($request, $next);
 	}
+
+	/**
+	 * Determine if the HTTP request uses a ‘read’ verb.
+	 *
+	 * @param \Illuminate\Http\Request $request
+	 *
+	 * @return bool
+	 */
+	protected function isReading($request)
+	{
+		if (str_starts_with($request->route()->uri, 'api/v2')) {
+			return false;
+		}
+
+		return parent::isReading($request);
+	}
 }
diff --git a/lang/cz/dialogs.php b/lang/cz/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/de/dialogs.php b/lang/de/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/el/dialogs.php b/lang/el/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/en/dialogs.php b/lang/en/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/es/dialogs.php b/lang/es/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/fr/dialogs.php b/lang/fr/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/hu/dialogs.php b/lang/hu/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/it/dialogs.php b/lang/it/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/ja/dialogs.php b/lang/ja/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/nl/dialogs.php b/lang/nl/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/no/dialogs.php b/lang/no/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/pl/dialogs.php b/lang/pl/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/pt/dialogs.php b/lang/pt/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/ru/dialogs.php b/lang/ru/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/sk/dialogs.php b/lang/sk/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/sv/dialogs.php b/lang/sv/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/vi/dialogs.php b/lang/vi/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/zh_CN/dialogs.php b/lang/zh_CN/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/lang/zh_TW/dialogs.php b/lang/zh_TW/dialogs.php
@@ -206,4 +206,10 @@
 	'se' => [
 		'available' => 'Available in the Supporter Edition',
 	],
+	'session_expired' => [
+		'title' => 'Session expired',
+		'message' => 'Your session has expired.<br />Please reload the page.',
+		'reload' => 'Reload',
+		'go_to_gallery' => 'Go to the Gallery',
+	],
 ];
diff --git a/resources/js/components/drawers/PhotoEdit.vue b/resources/js/components/drawers/PhotoEdit.vue
@@ -116,14 +116,10 @@ function save() {
 		tags: tags.value ?? [],
 		license: license.value?.value ?? "none",
 		upload_date: uploadDate.value?.toISOString().slice(0, 16) + uploadTz.value,
-	})
-		.then((response) => {
-			toast.add({ severity: "success", summary: "Success", life: 3000 });
-			load(response.data);
-		})
-		.catch((error) => {
-			console.error(error);
-		});
+	}).then((response) => {
+		toast.add({ severity: "success", summary: "Success", life: 3000 });
+		load(response.data);
+	});
 }
 
 load(props.photo);

diff --git a/resources/js/components/forms/album/AlbumProperties.vue b/resources/js/components/forms/album/AlbumProperties.vue
@@ -429,14 +429,10 @@ function saveAlbum() {
 		album_timeline: albumTimeline.value?.value ?? null,
 		photo_timeline: photoTimeline.value?.value ?? null,
 	};
-	AlbumService.updateAlbum(data)
-		.then(() => {
-			toast.add({ severity: "success", summary: trans("toast.success"), life: 3000 });
-			AlbumService.clearCache(albumId.value);
-		})
-		.catch((error) => {
-			console.error(error);
-		});
+	AlbumService.updateAlbum(data).then(() => {
+		toast.add({ severity: "success", summary: trans("toast.success"), life: 3000 });
+		AlbumService.clearCache(albumId.value);
+	});
 }
 
 function saveTagAlbum() {
@@ -456,14 +452,10 @@ function saveTagAlbum() {
 		photo_layout: photoLayout.value?.value ?? null,
 		photo_timeline: photoTimeline.value?.value ?? null,
 	};
-	AlbumService.updateTag(data)
-		.then(() => {
-			toast.add({ severity: "success", summary: trans("toasts.success"), life: 3000 });
-			AlbumService.clearCache(albumId.value);
-		})
-		.catch((error) => {
-			console.error(error);
-		});
+	AlbumService.updateTag(data).then(() => {
+		toast.add({ severity: "success", summary: trans("toasts.success"), life: 3000 });
+		AlbumService.clearCache(albumId.value);
+	});
 }
 
 watch(

diff --git a/resources/js/components/forms/album/AlbumVisibility.vue b/resources/js/components/forms/album/AlbumVisibility.vue
@@ -131,19 +131,15 @@ function save() {
 		password: password.value,
 	};
 
-	AlbumService.updateProtectionPolicy(data)
-		.then(() => {
-			toast.add({ severity: "success", summary: trans("toasts.success"), detail: trans("dialogs.visibility.visibility_updated"), life: 3000 });
-			AlbumService.clearCache(albumId.value);
-			if (props.config.is_model_album) {
-				// @ts-expect-error
-				AlbumService.clearCache(props.album.parent_id);
-			} else {
-				AlbumService.clearAlbums();
-			}
-		})
-		.catch((error) => {
-			console.error(error);
-		});
+	AlbumService.updateProtectionPolicy(data).then(() => {
+		toast.add({ severity: "success", summary: trans("toasts.success"), detail: trans("dialogs.visibility.visibility_updated"), life: 3000 });
+		AlbumService.clearCache(albumId.value);
+		if (props.config.is_model_album) {
+			// @ts-expect-error
+			AlbumService.clearCache(props.album.parent_id);
+		} else {
+			AlbumService.clearAlbums();
+		}
+	});
 }
 </script>
diff --git a/resources/js/components/maintenance/MaintenanceFixTree.vue b/resources/js/components/maintenance/MaintenanceFixTree.vue
@@ -21,7 +21,7 @@
 				<ProgressSpinner v-if="loading" class="w-full"></ProgressSpinner>
 			</ScrollPanel>
 			<div class="flex gap-4 mt-1">
-				<Button as="router-link" to="/fixTree" v-if="fixable && !loading" severity="primary" class="w-full border-none">{{
+				<Button as="router-link" :to="{ name: 'tree' }" v-if="fixable && !loading" severity="primary" class="w-full border-none">{{
 					$t("maintenance.fix-tree.button")
 				}}</Button>
 			</div>

diff --git a/resources/js/components/modals/AboutLychee.vue b/resources/js/components/modals/AboutLychee.vue
@@ -73,13 +73,9 @@ const lycheeStore = useLycheeStateStore();
 
 const { is_se_enabled, is_se_info_hidden } = storeToRefs(lycheeStore);
 
-InitService.fetchVersion()
-	.then((data) => {
-		version.value = data.data;
-	})
-	.catch((error) => {
-		console.error(error);
-	});
+InitService.fetchVersion().then((data) => {
+	version.value = data.data;
+});
 
 function closeCallback() {
 	visible.value = false;

diff --git a/resources/js/components/modals/LoginModal.vue b/resources/js/components/modals/LoginModal.vue
@@ -32,7 +32,7 @@
 						<InputPassword id="password" v-model="password" @keydown.enter="login" autocomplete="current-password" />
 						<label class="" for="password">{{ $t("dialogs.login.password") }}</label>
 					</FloatLabel>
-					<Message v-if="invalidPassword" severity="error">{{ $t("dialog.login.unknonw_invalid") }}</Message>
+					<Message v-if="invalidPassword" severity="error">{{ $t("dialog.login.unknown_invalid") }}</Message>
 				</div>
 				<div class="px-9 text-muted-color text-right font-semibold">Lychee <span class="text-primary-500" v-if="is_se_enabled">SE</span></div>
 				<div class="flex items-center mt-9">
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,4 +82,4 @@ private function check(AbstractAlbum $album): bool @@
     		return $result ? true : throw new UnauthorizedException();
     	}
-    }
+    }