force redirection if accessing urls where being logged is required

LycheeOrg · Dec 26, 2024 · de15a87 · de15a87
1 parent 8cc5f42
commit de15a87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/app/Http/Middleware/LoginRequired.php b/app/Http/Middleware/LoginRequired.php
@@ -19,6 +19,7 @@ class LoginRequired
 {
 	public const ROOT = 'root';
 	public const ALBUM = 'album';
+	public const ALWAYS = 'always';
 
 	/**
 	 * Handle an incoming request.
@@ -35,7 +36,7 @@ class LoginRequired
 	 */
 	public function handle(Request $request, \Closure $next, string $requiredStatus): mixed
 	{
-		if (in_array($requiredStatus, [self::ALBUM, self::ROOT], true) === false) {
+		if (in_array($requiredStatus, [self::ALBUM, self::ROOT, self::ALWAYS], true) === false) {
 			throw new LycheeInvalidArgumentException($requiredStatus . ' is not a valid login requirement.');
 		}
 
@@ -44,6 +45,10 @@ public function handle(Request $request, \Closure $next, string $requiredStatus)
 			return $next($request);
 		}
 
+		if ($requiredStatus === self::ALWAYS) {
+			return redirect()->route('gallery');
+		}
+
 		if (!Configs::getValueAsBool('login_required')) {
 			// Login is not required. Proceed.
 			return $next($request);

diff --git a/routes/web_v2.php b/routes/web_v2.php
@@ -35,17 +35,17 @@
 Route::get('/search/{albumId}', [VueController::class, 'view'])->middleware(['migration:complete']);
 Route::get('/search/{albumId}/{photoId}', [VueController::class, 'view'])->middleware(['migration:complete']);
 
-Route::get('/profile', [VueController::class, 'view'])->name('profile')->middleware(['migration:complete']);
-Route::get('/users', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/sharing', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/jobs', [VueController::class, 'view'])->middleware(['migration:complete']);
+Route::get('/profile', [VueController::class, 'view'])->name('profile')->middleware(['migration:complete', 'login_required:always']);
+Route::get('/users', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/sharing', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/jobs', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
 Route::get('/diagnostics', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/statistics', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/maintenance', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/users', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/settings', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/permissions', [VueController::class, 'view'])->middleware(['migration:complete']);
-Route::get('/fixTree', [VueController::class, 'view'])->middleware(['migration:complete']);
+Route::get('/statistics', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/maintenance', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/users', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/settings', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/permissions', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
+Route::get('/fixTree', [VueController::class, 'view'])->middleware(['migration:complete', 'login_required:always']);
 
 Route::match(['get', 'post'], '/migrate', [Admin\UpdateController::class, 'migrate'])
 	->name('migrate')