From c348d35c7ecb6c74f71cf90b982412f267c5d807 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 10 Feb 2026 02:19:05 +0000
Subject: [PATCH] =minor fixes to schema system

---
 assets/js/concise/AuthManager.js |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/assets/js/concise/AuthManager.js b/assets/js/concise/AuthManager.js
index dfad8bf..0e7f175 100644
--- a/assets/js/concise/AuthManager.js
+++ b/assets/js/concise/AuthManager.js
@@ -29,21 +29,12 @@
 	 */
 	async init() {
 		if (this.isAuthenticating) {
-			// Wait for existing auth to complete
-			return new Promise(resolve => {
-				const checkAuth = setInterval(() => {
-					if (this.initialized) {
-						clearInterval(checkAuth);
-						resolve();
-					}
-				}, 50);
-			});
+			return this.ready();
 		}
 
 		this.isAuthenticating = true;
 
 		try {
-			// Check if we have cached auth and cookie hasn't changed
 			const cached = this.getCachedAuth();
 			if (cached) {
 				this.setAuthData(cached);
@@ -53,7 +44,6 @@
 				return;
 			}
 
-			// Fetch fresh auth data
 			await this.fetchAuth();
 
 		} catch (error) {
@@ -66,6 +56,53 @@
 	}
 
 	/**
+	 * Refresh nonce if authentication fails
+	 */
+	async refreshNonce(action = 'wp_rest') {
+		try {
+			await this.fetchAuth();
+			return this.getNonce(action);
+		} catch (error) {
+			console.error('Failed to refresh nonce:', error);
+			return null;
+		}
+	}
+
+	/**
+	 * Fetch with automatic nonce refresh on auth failure
+	 * Use this for all authenticated API requests
+	 */
+	async fetch(url, options = {}) {
+		const attempt = async (retryCount = 0) => {
+			const headers = {
+				'Content-Type': 'application/json',
+				...options.headers,
+				'X-WP-Nonce': this.getNonce()
+			};
+
+			const response = await fetch(url, {
+				...options,
+				credentials: 'same-origin',
+				headers
+			});
+
+			// If auth failed and we haven't retried yet, refresh and try once more
+			if ((response.status === 403 || response.status === 401) && retryCount === 0) {
+				const result = await response.clone().json();
+				if (resconsole.logult.code === 'rest_cookie_invalid_nonce' || result.message?.includes('Cookie check')) {
+					('Nonce invalid, refreshing auth...');
+					await this.refresh();
+					return attempt(1); // Retry once
+				}
+			}
+
+			return response;
+		};
+
+		return attempt();
+	}
+
+	/**
 	 * Fetch authentication status from API
 	 */
 	async fetchAuth() {

--
Gitblit v1.10.0