From 275c0d74cd68677622a5431505c5c870c473063d Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 29 Mar 2026 21:40:15 +0000
Subject: [PATCH] =Seems to be working, huzzah! Added some changes for on-this-page nav

---
 inc/rest/routes/LoginRoutes.php |  123 +++++++++++++++++++----------------------
 1 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/inc/rest/routes/LoginRoutes.php b/inc/rest/routes/LoginRoutes.php
index aa31fa0..10e448f 100644
--- a/inc/rest/routes/LoginRoutes.php
+++ b/inc/rest/routes/LoginRoutes.php
@@ -1,6 +1,7 @@
 <?php
 namespace JVBase\rest\routes;
 
+use JVBase\registrar\Registrar;
 use JVBase\rest\Rest;
 use JVBase\rest\Route;
 use JVBase\utility\Features;
@@ -39,7 +40,8 @@
 		Route::for('auth/status')
 			->get([$this, 'getAuthStatus'])
 			->auth('public')
-			->rateLimit(60, 60);
+			->rateLimit()
+			->register();
 
 		// Standard login
 		Route::for('auth/login')
@@ -51,7 +53,8 @@
 				'redirect_to' => 'string',
 			])
 			->auth('public')
-			->rateLimit(5, 300);
+			->rateLimit(5, 300)
+			->register();
 
 		// User registration
 		Route::for('auth/register')
@@ -64,7 +67,8 @@
 				'redirect_to' => 'string',
 			])
 			->auth('public')
-			->rateLimit(3, 3600);
+			->rateLimit(3, 3600)
+			->register();
 
 		// Request password reset
 		Route::for('auth/lostpassword')
@@ -73,7 +77,8 @@
 				'user_email' => 'email|required',
 			])
 			->auth('public')
-			->rateLimit(3, 3600);
+			->rateLimit(3, 3600)
+			->register();
 
 		// Reset password with token
 		Route::for('auth/resetpass')
@@ -85,7 +90,8 @@
 				'pass2' => 'string|required',
 			])
 			->auth('public')
-			->rateLimit(5, 300);
+			->rateLimit(5, 300)
+			->register();
 
 		// Magic link endpoint
 		if ($this->hasMagicLink) {
@@ -97,14 +103,16 @@
 					'redirect_to' => 'string',
 				])
 				->auth('public')
-				->rateLimit(5, 3600);
+				->rateLimit(5, 3600)
+				->register();
 		}
 
 		// Logout endpoint
 		Route::for('auth/logout')
 			->post([$this, 'handleLogout'])
 			->auth('logged_in')
-			->rateLimit(10, 60);
+			->rateLimit(10)
+			->register();
 	}
 
 	/**
@@ -112,36 +120,14 @@
 	 */
 	public function getAuthStatus(WP_REST_Request $request): WP_REST_Response
 	{
-		$user = wp_get_current_user();
-		$authenticated = $user->exists();
+		$data = $this->buildAuth();
+		$response = $this->success($data);
 
-		$response = [
-			'authenticated' => $authenticated,
-			'user' => false,
-			'nonces' => [
-				'wp_rest' => wp_create_nonce('wp_rest'),
-			],
-			'session_id' => session_id() ?: wp_generate_password(32, false),
-		];
+		// Add caching headers
+		$response->header('Cache-Control', 'private, max-age=300'); // 5 minutes
+		$response->header('Vary', 'Cookie'); // Important for nginx
 
-		if ($authenticated) {
-			// Validate session fingerprint
-			if (!$this->validateSessionFingerprint($user->ID, $request)) {
-				wp_logout();
-				$response['authenticated'] = false;
-				$response['session_invalid'] = true;
-			} else {
-				$response['user'] = [
-					'id' => $user->ID,
-					'name' => $user->display_name,
-					'email' => $user->user_email,
-					'roles' => $user->roles,
-					'link' => get_user_meta($user->ID, BASE . 'link', true),
-				];
-			}
-		}
-
-		return $this->success($response);
+		return $response;
 	}
 
 	/**
@@ -201,20 +187,7 @@
 		return $this->success([
 			'message' => 'Login successful',
 			'redirect' => $redirect,
-			'auth' => [
-				'authenticated' => true,
-				'user' => [
-					'id' => $user->ID,
-					'name' => $user->display_name,
-					'email' => $user->user_email,
-					'roles' => $user->roles,
-					'link' => get_user_meta($user->ID, BASE . 'link', true),
-				],
-				'nonces' => [
-					'wp_rest' => wp_create_nonce('wp_rest'),
-				],
-				'session_id' => session_id() ?: wp_generate_password(32, false),
-			]
+			'auth' => $this->buildAuth($user->ID)
 		]);
 	}
 
@@ -368,7 +341,7 @@
 					'error' => $key->get_error_message(),
 				]);
 			} else {
-				$this->sendPasswordResetEmail($user, $key);
+				$success = JVB()->email()->sendPasswordResetEmail($user, $key);
 			}
 		}
 
@@ -738,23 +711,41 @@
 		}
 	}
 
-	/**
-	 * Send password reset email (fallback if magic links not available)
-	 */
-	protected function sendPasswordResetEmail(WP_User $user, string $key): bool
+	protected function buildAuth(?int $user = null): array
 	{
-		$reset_url = network_site_url(
-			"wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login),
-			'login'
-		);
+		if (is_user_logged_in()) {
+			$user = ($user) ?: get_current_user_id();
+			return [
+				'authenticated' => true,
+				'user' => $user,
+				'nonces' => $this->getUserNonces($user)
+			];
+		}
 
-		$subject = 'Password Reset Request';
-		$message = sprintf(
-			"Hello %s,\n\nYou requested a password reset. Click the link below to reset your password:\n\n%s\n\nIf you didn't request this, please ignore this email.",
-			$user->display_name,
-			$reset_url
-		);
-
-		return wp_mail($user->user_email, $subject, $message);
+		return [
+			'authenticated' => false,
+			'user' => false,
+			'nonces' => [
+				'wp_rest' => wp_create_nonce('wp_rest')
+			]
+		];
+	}
+	protected function getUserNonces(int $userID):array {
+		$nonces = [
+			'wp_rest'	=> wp_create_nonce('wp_rest'),
+		];
+		if (Features::forSite()->has('dashboard')) {
+			$nonces['dash'] = wp_create_nonce('dash-'.$userID);
+		}
+		if (Features::forSite()->has('favourites')) {
+			$nonces['favourites'] = wp_create_nonce('favourites-'.$userID);
+		}
+		if (!empty(Registrar::getFeatured('karma'))) {
+			$nonces['votes'] = wp_create_nonce('votes-'.$userID);
+		}
+		if (Features::forSite()->has('notifications')) {
+			$nonces['notifications'] = wp_create_nonce('notifications-'.$userID);
+		}
+		return $nonces;
 	}
 }

--
Gitblit v1.10.0