refactor(token_auth)

RSS-Bridge · Jan 3, 2025 · 0c051b7 · 0c051b7
1 parent e1a8d0e
commit 0c051b7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/middlewares/TokenAuthenticationMiddleware.php b/middlewares/TokenAuthenticationMiddleware.php
@@ -10,20 +10,24 @@ public function __invoke(Request $request, $next): Response
             return $next($request);
         }
 
-        // Add token as request attribute
-        $request = $request->withAttribute('token', $request->get('token'));
+        $token = $request->get('token');
 
-        if (! $request->getAttribute('token')) {
+        if (! $token) {
             return new Response(render(__DIR__ . '/../templates/token.html.php', [
-                'message' => 'Missing token',
+                'message'   => 'Missing token',
+                'token'     => '',
             ]), 401);
         }
-        if (! hash_equals(Configuration::getConfig('authentication', 'token'), $request->getAttribute('token'))) {
+
+        if (! hash_equals(Configuration::getConfig('authentication', 'token'), $token)) {
             return new Response(render(__DIR__ . '/../templates/token.html.php', [
-                'message' => 'Invalid token',
+                'message'   => 'Invalid token',
+                'token'     => $token,
             ]), 401);
         }
 
+        $request = $request->withAttribute('token', $token);
+
         return $next($request);
     }
 }
diff --git a/templates/token.html.php b/templates/token.html.php
@@ -13,8 +13,8 @@
     <?= e($message) ?>
 </p>
 
-<form action="" method="get">
+<form action="" method="get" autocomplete="off">
     <label for="token">Token:</label>
-    <input type="password" name="token" id="token" placeholder="token">
+    <input type="text" name="token" id="token" placeholder="token" value="<?= e($token) ?>">
     <input type="submit" value="OK">
 </form>