From fff721dd185f5b97f7ae7a6e64189e55887ff590 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 05 Jul 2026 18:36:57 +0000
Subject: [PATCH] =Cleaning up the Square integration (still a bit more to do yet). Also majorly overhauled /rest/ files to ignore a rest request 'user' paramater, and rely on get_current_user_id() instead.
---
assets/js/concise/AuthManager.js | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/assets/js/concise/AuthManager.js b/assets/js/concise/AuthManager.js
index ab70c92..29946d2 100644
--- a/assets/js/concise/AuthManager.js
+++ b/assets/js/concise/AuthManager.js
@@ -50,6 +50,7 @@
}
}
+
/**
* Refresh nonce if authentication fails
*/
@@ -77,11 +78,22 @@
'X-WP-Nonce': this.getNonce()
};
- const response = await fetch(url, {
+ if (!isFormData && typeof options.body === 'object' && !Object.hasOwn(options.body, 'user')) {
+ options.body.user = this.getUser();
+ }
+
+ let obj = {
...options,
credentials: 'same-origin',
headers
- });
+ };
+
+ if (!isFormData && typeof obj.body === 'object') {
+
+ obj.body = JSON.stringify(obj.body);
+ }
+
+ const response = await fetch(url, obj);
if ((response.status === 403 || response.status === 401) && retryCount === 0) {
const result = await response.clone().json();
@@ -127,6 +139,7 @@
this.authenticated = authData.authenticated || false;
this.user = authData.user || false;
this.nonces = authData.nonces || {};
+ console.log(this.nonces);
// Session expired — was logged in, now isn't
if (wasAuthenticated && !this.authenticated) {
@@ -230,6 +243,21 @@
});
}
+ getHeader(action) {
+ switch (action) {
+ case 'dash':
+ return {
+ 'X-Action-Nonce': this.getNonce('dash')
+ };
+ case 'default':
+ return {
+ 'X-WP-Nonce': this.getNonce()
+ };
+ default:
+ return {};
+ }
+ }
+
}
// Initialize global instance
--
Gitblit v1.10.0