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/NotificationsRoutes.php | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/inc/rest/routes/NotificationsRoutes.php b/inc/rest/routes/NotificationsRoutes.php
index ee85aeb..b3c2e05 100644
--- a/inc/rest/routes/NotificationsRoutes.php
+++ b/inc/rest/routes/NotificationsRoutes.php
@@ -3,6 +3,7 @@
use JVBase\managers\Cache;
use JVBase\managers\CustomTable;
+use JVBase\registrar\Registrar;
use JVBase\rest\Rest;
use JVBase\rest\Route;
use WP_REST_Request;
@@ -133,7 +134,7 @@
public function init(): void
{
$this->manager = JVB()->notification();
- $this->notification_types = $this->manager->getNotificationTypes();
+ $this->notification_types = $this->manager->getNotificationTypes(true);
}
/**
@@ -145,7 +146,6 @@
Route::for('notifications')
->get([$this, 'getNotifications'])
->args([
- 'user' => 'integer|required',
'type' => 'string',
'status' => 'string|enum:unread,read,actioned,dismissed',
'limit' => 'integer|default:20|min:1|max:100',
@@ -159,7 +159,6 @@
Route::for('notifications/read')
->post([$this, 'markRead'])
->args([
- 'user' => 'integer|required',
'notification_id' => 'integer|required',
])
->auth('user')
@@ -170,7 +169,6 @@
Route::for('notifications/read-all')
->post([$this, 'markAllRead'])
->args([
- 'user' => 'integer|required',
'type' => 'string',
])
->auth('user')
@@ -181,7 +179,6 @@
Route::for('notifications/action')
->post([$this, 'markActioned'])
->args([
- 'user' => 'integer|required',
'notification_id' => 'integer|required',
])
->auth('user')
@@ -192,7 +189,6 @@
Route::for('notifications/dismiss')
->post([$this, 'markDismissed'])
->args([
- 'user' => 'integer|required',
'notification_id' => 'integer|required',
])
->auth('user')
@@ -203,7 +199,6 @@
Route::for('notifications/count')
->get([$this, 'getUnreadCount'])
->args([
- 'user' => 'integer|required',
'type' => 'string',
])
->auth('user')
@@ -220,16 +215,15 @@
*/
public function getNotifications(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
+ $user_id = get_current_user_id();
+ if (!$user_id) {
+ return $this->unauthorized();
+ }
$type = sanitize_text_field($request->get_param('type') ?? '');
$status = sanitize_text_field($request->get_param('status') ?? '');
$limit = absint($request->get_param('limit'));
$offset = absint($request->get_param('offset'));
- if (!$this->checkUser($user_id)) {
- return $this->unauthorized();
- }
-
$cacheKey = compact('user_id', 'type', 'status', 'limit', 'offset');
$result = $this->cache->remember($cacheKey, function() use ($user_id, $type, $status, $limit, $offset) {
@@ -264,12 +258,11 @@
*/
public function getUnreadCount(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
- $type = sanitize_text_field($request->get_param('type') ?? '');
-
- if (!$this->checkUser($user_id)) {
+ $user_id = get_current_user_id();
+ if (!$user_id) {
return $this->unauthorized();
}
+ $type = sanitize_text_field($request->get_param('type') ?? '');
$cacheKey = compact('user_id', 'type');
@@ -554,7 +547,7 @@
$statusCondition = $wpdb->prepare("a.status = %s", $status);
}
- $approvals = jvbApprovalTypes();
+ $approvals = Registrar::withFeature('approve_new');
foreach ($approvals as $type => $config) {
$table = $wpdb->prefix . BASE . 'approval_' . $type . 'requests';
$votes = $wpdb->prefix . BASE . 'approval_' . $type . 'votes';
@@ -646,12 +639,11 @@
*/
public function markRead(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
- $notification_id = absint($request->get_param('notification_id'));
-
- if (!$this->checkUser($user_id)) {
+ $user_id = get_current_user_id();
+ if (!$user_id) {
return $this->unauthorized();
}
+ $notification_id = absint($request->get_param('notification_id'));
try {
$result = $this->notifications->transaction(function($table) use ($notification_id, $user_id) {
@@ -694,12 +686,11 @@
*/
public function markAllRead(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
- $type = sanitize_text_field($request->get_param('type') ?? '');
-
- if (!$this->checkUser($user_id)) {
+ $user_id = get_current_user_id();
+ if (!$user_id) {
return $this->unauthorized();
}
+ $type = sanitize_text_field($request->get_param('type') ?? '');
try {
$where = ['owner_id' => $user_id, 'status' => 'unread'];
@@ -729,12 +720,11 @@
*/
public function markActioned(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
- $notification_id = absint($request->get_param('notification_id'));
-
- if (!$this->checkUser($user_id)) {
+ $user_id = get_current_user_id();
+ if (!$user_id) {
return $this->unauthorized();
}
+ $notification_id = absint($request->get_param('notification_id'));
try {
$result = $this->notifications->transaction(function($table) use ($notification_id, $user_id) {
@@ -778,12 +768,11 @@
*/
public function markDismissed(WP_REST_Request $request): WP_REST_Response
{
- $user_id = absint($request->get_param('user'));
- $notification_id = absint($request->get_param('notification_id'));
-
- if (!$this->checkUser($user_id)) {
+ $user_id = get_current_user_id();
+ if (!$user_id) {
return $this->unauthorized();
}
+ $notification_id = absint($request->get_param('notification_id'));
try {
$result = $this->notifications->transaction(function($table) use ($notification_id, $user_id) {
@@ -1184,7 +1173,7 @@
/**
* Get notification actions
*/
- protected function getNotificationActions(string $type, array $data, object $notification = null): array
+ protected function getNotificationActions(string $type, array $data, ?object $notification = null): array
{
$actions = [];
@@ -1317,7 +1306,7 @@
'status' => in_array($params['status'] ?? '', ['all', 'unread', 'expired'])
? $params['status']
: 'unread',
- 'user_id' => absint($params['user'] ?? get_current_user_id()),
+ 'user_id' => get_current_user_id(),
'page' => absint($params['page'] ?? 1),
'type' => in_array($params['type'] ?? '', array_keys($this->manager->notification_types ?? []))
? $params['type']
--
Gitblit v1.10.0