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.
---
inc/rest/routes/ContentTermsRoutes.php | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/inc/rest/routes/ContentTermsRoutes.php b/inc/rest/routes/ContentTermsRoutes.php
index d28cb60..08fda0d 100644
--- a/inc/rest/routes/ContentTermsRoutes.php
+++ b/inc/rest/routes/ContentTermsRoutes.php
@@ -7,7 +7,7 @@
use JVBase\rest\Rest;
use JVBase\rest\Route;
use JVBase\rest\PermissionHandler;
-use JVBase\utility\Features;
+use JVBase\base\Site;
use JVBase\managers\CustomTable;
use WP_REST_Request;
use WP_REST_Response;
@@ -55,7 +55,7 @@
{
$registry = JVB()->queue()->registry();
$executor = new ContentTermExecutor();
- $taxonomies = Registrar::getFeatured('is_content', 'term');
+ $taxonomies = Registrar::withFeature('is_content', 'term');
foreach($taxonomies as $taxonomy) {
$registry->register("{$taxonomy}_update", new TypeConfig(
@@ -197,7 +197,7 @@
*/
public function checkTermPermission(WP_REST_Request $request): bool
{
- $userID = $request->get_param('user') ?? get_current_user_id();
+ $userID = get_current_user_id();
$termID = (int)$request->get_param('term_id');
if (!$this->checkUser($userID) || !term_exists($termID, jvbCheckBase($this->taxonomy))) {
@@ -210,10 +210,10 @@
public function checkOwnerPermission(WP_REST_Request $request): bool
{
- $userID = $request->get_param('user') ?? get_current_user_id();
+ $userID = get_current_user_id();
$termID = (int)$request->get_param('term_id');
- if (!$this->checkUser($userID) || !term_exists($termID, jvbCheckBase($this->taxonomy))) {
+ if (!term_exists($termID, jvbCheckBase($this->taxonomy))) {
return false;
}
@@ -227,7 +227,7 @@
public function updateSettings(WP_REST_Request $request): WP_REST_Response
{
$termID = (int)$request->get_param('term_id');
- $userID = $request->get_param('user');
+ $userID = get_current_user_id();
$data = $request->get_params();
unset($data['user'], $data['term_id']);
@@ -301,14 +301,10 @@
public function manageMember(WP_REST_Request $request): WP_REST_Response
{
$action = $request->get_param('action');
- $userID = $request->get_param('user');
+ $userID = get_current_user_id();
$termID = (int)$request->get_param('term_id');
$targetUserID = (int)$request->get_param('target_user');
- if (!$this->checkUser($targetUserID)) {
- return $this->error('Invalid target user');
- }
-
// Queue the operation
$op = JVB()->queue()->add(
"{$this->taxonomy}_member_{$action}",
@@ -367,7 +363,7 @@
public function handleRequest(WP_REST_Request $request): WP_REST_Response
{
$action = $request->get_param('action');
- $userID = $request->get_param('user');
+ $userID = get_current_user_id();
$termID = (int)$request->get_param('term_id');
return match($action) {
--
Gitblit v1.10.0