From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
inc/integrations/OAuth.php | 135 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 110 insertions(+), 25 deletions(-)
diff --git a/inc/integrations/OAuth.php b/inc/integrations/OAuth.php
index 5f8085f..df742fa 100644
--- a/inc/integrations/OAuth.php
+++ b/inc/integrations/OAuth.php
@@ -10,8 +10,8 @@
trait OAuth
{
- use _Base, Admin;
- protected bool $hasOAuth = true;
+ use _Base, Admin, ServiceMap;
+ protected OAuthURLs $oauth;
/**
* Child classes must set this (e.g. 'https://api.example.com/v1/')
*/
@@ -20,9 +20,40 @@
protected int $oauthTTL = 300;
protected array $oathScopes = [];
+ protected ?RateLimits $oauthLimiter;
- abstract protected function getOAuthRequestHeaders(): array;
- abstract protected function handleOAuthResponse(array|WP_Error $response, string $method, string $endpoint): array;
+ protected function initializeOAuthRateLimiter():void
+ {
+ $key = $this->service_name;
+ if (!is_null($this->userID)) {
+ $key .= '_'.$this->userID;
+ }
+ $key .= '_oauth';
+ $this->oauthLimiter = new RateLimits($key, ['s' => 1, 'm' => 10, 'h' => 100]);
+ }
+ /**
+ * @return array Defaults to the base getRequestHeaders, but can optionally be overridden
+ */
+ protected function getOAuthRequestHeaders(): array
+ {
+ return $this->getRequestHeaders();
+ }
+ public function getOAuthBaseURL():?string
+ {
+ return $this->baseOAuthUrl;
+ }
+
+ /**
+ * Default to the base handleResponse method, but extensions can modify accordingly
+ * @param array|WP_Error $response
+ * @param string $method
+ * @param string $endpoint
+ * @return array
+ */
+ protected function handleOAuthResponse(array|WP_Error $response, string $method, string $endpoint): array
+ {
+ return $this->handleResponse($response, $method, $endpoint);
+ }
abstract protected function refreshAccessToken(OAuthCredentials $credentials): array;
function addOAuthActions():void
@@ -39,16 +70,69 @@
'icon' => 'plugs-disconnected',
'action' => [$this, 'handleOAuthDisconnect']
],
- [
- 'name' => 'Refresh Token',
- 'icon' => 'arrows-clockwise',
- 'action' => [$this, 'handleOAuthRefreshToken']
- ]
+// [
+// 'name' => 'Refresh Token',
+// 'icon' => 'arrows-clockwise',
+// 'action' => [$this, 'handleOAuthRefreshToken']
+// ]
];
foreach ($actions as $a) {
$this->addAction($a['name'], $a['action'], $a['slug']??null, $a['icon']??null, $a['label']??null);
}
}
+ public function hasOAuthCredentials(?int $userID = null):bool
+ {
+ if ($userID !== $this->userID) {
+ $this->switchUser($userID);
+ }
+ return $this->hasValidOAuth();
+ }
+ public function handleOAuthConnect():array
+ {
+ $url = $this->getOAuthUrl();
+ if ($url) {
+ return [
+ 'success' => true,
+ 'redirect' => $url,
+ ];
+ }
+ return $this->response(false, 'Failed to generate OAuth URL');
+ }
+
+ public function handleOAuthDisconnect():array
+ {
+ $revoked = $this->revokeOAuth();
+ return $this->response($revoked, $revoked ?
+ 'Successfully disconnected from '.$this->title :
+ 'Failed to disconnect from '.$this->title);
+ }
+
+ public function revokeOAuth():bool
+ {
+ if (empty($this->oauth['revoke'])) {
+ error_log('No revoke url set for '.$this->service_name);
+ return false;
+ }
+ $credentials = $this->loadCredentials();
+ if (empty($credentials['access_token'])) {
+ error_log('Could not send revoke request, no access_token for '.$this->service_name);
+ } else {
+ $response = $this->postOAuthRequest($this->oauth['revoke'], [
+ 'body' => [
+ 'token' => $credentials['access_token']
+ ]
+ ]);
+ $empty = new OAuthCredentials([]);
+ foreach ($empty->toArray() as $key => $value) {
+ if (array_key_exists($key, $credentials)) {
+ unset($credentials[$key]);
+ }
+ }
+
+ return Auth::getInstance()->storeCredentials($this->service_name, $credentials, $this->userID);
+ }
+ return false;
+ }
protected function registerOAuthCallbacks():void
{
@@ -105,10 +189,6 @@
return $this->handleOAuthResponse($error, $method, $endpoint);
}
- if (!empty($this->requiredScopes) && !$credentials->hasScopes($this->requiredScopes)) {
- $error = new WP_Error('insufficient_scope', "Missing required scopes for {$this->service_name}");
- return $this->handleOAuthResponse($error, $method, $endpoint);
- }
$url = rtrim($this->baseOAuthUrl, '/') . '/' . ltrim($endpoint, '/');
@@ -215,12 +295,14 @@
}
// Get integration instance
- $integration = JVB()->connect($this->service_name, $user_id);
+ $integration = $this->getService($this->service_name);
- if (!$integration) {
+ if (!$integration || !method_exists($integration, 'switchUser')) {
wp_die('Invalid service: ' . esc_html($this->service_name), 'OAuth Error');
}
+ $integration->switchUser($user_id);
+
// Exchange code for tokens
$result = $integration->handleOAuthCode($code, $state);
@@ -296,11 +378,9 @@
public function getOAuthURL(?string $return_url = null):string
{
- if (!$this->hasOAuth) {
- return '';
- }
+
$credentials = $this->loadCredentials();
- if (empty($credentials['authorize'])) {
+ if (empty($this->oauth['authorize'])) {
$this->logError('getOAuthUrl', 'OAuth authorize URL not configured');
return '';
}
@@ -308,7 +388,7 @@
'client_id' => $credentials['client_id']??$credentials['application_id']??$credentials['app_id']??'',
'redirect_url' => $this->getRedirectUri(),
'response_type' => 'code',
- 'scope' => implode(' ', $credentials['scopes']??[])
+ 'scope' => implode(' ', $this->oauthScopes??[])
];
$state_key = wp_generate_password(32, false);
$user_id = $this->userID??0;
@@ -338,14 +418,19 @@
$params = $this->addOAuthParams($params);
}
- return $credentials['authorize'] . '?' . http_build_query($params);
+ return $this->oauth['authorize'] . '?' . http_build_query($params);
}
protected function getRedirectUri():string
{
- if ($this->hasOAuth) {
- return admin_url('admin-ajax.php?action='.BASE . $this->service_name . '_oauth_callback');
- }
- return rest_url('jvb/v1/oauth/callback?service=' . $this->service_name);
+ return admin_url('admin-ajax.php?action='.BASE . $this->service_name . '_oauth_callback');
+ }
+
+ /****************************************************
+ * UTILITY
+ ****************************************************/
+ protected function getAccessToken():string
+ {
+ return $this->loadCredentials()['access_token']??'';
}
}
--
Gitblit v1.10.0