From c987aeef06b39f3a7d4863edd0ecdf3e7baaab69 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Thu, 25 Aug 2022 15:18:58 +0100 Subject: [PATCH] API4 checkPermissions 0 => FALSE --- ext/oauth-client/CRM/OAuth/MailSetup.php | 10 +++++----- ext/oauth-client/CRM/OAuth/Page/Return.php | 2 +- .../Civi/Api4/Action/OAuthSysToken/Refresh.php | 2 +- ext/oauth-client/Civi/OAuth/OAuthLeagueFacade.php | 2 +- .../tests/phpunit/Civi/OAuth/AuthCodeFlowTest.php | 4 ++-- .../tests/phpunit/api/v4/OAuthClientTest.php | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ext/oauth-client/CRM/OAuth/MailSetup.php b/ext/oauth-client/CRM/OAuth/MailSetup.php index 2ed9c01751..127f69255d 100644 --- a/ext/oauth-client/CRM/OAuth/MailSetup.php +++ b/ext/oauth-client/CRM/OAuth/MailSetup.php @@ -8,8 +8,8 @@ class CRM_OAuth_MailSetup { * @see CRM_Utils_Hook::mailSetupActions() */ public static function buildSetupLinks() { - $clients = Civi\Api4\OAuthClient::get(0)->addWhere('is_active', '=', 1)->execute(); - $providers = Civi\Api4\OAuthProvider::get(0)->execute()->indexBy('name'); + $clients = Civi\Api4\OAuthClient::get(FALSE)->addWhere('is_active', '=', 1)->execute(); + $providers = Civi\Api4\OAuthProvider::get(FALSE)->execute()->indexBy('name'); $setupActions = []; foreach ($clients as $client) { @@ -68,15 +68,15 @@ class CRM_OAuth_MailSetup { return; } - $client = \Civi\Api4\OAuthClient::get(0)->addWhere('id', '=', $token['client_id'])->execute()->single(); - $provider = \Civi\Api4\OAuthProvider::get(0)->addWhere('name', '=', $client['provider'])->execute()->single(); + $client = \Civi\Api4\OAuthClient::get(FALSE)->addWhere('id', '=', $token['client_id'])->execute()->single(); + $provider = \Civi\Api4\OAuthProvider::get(FALSE)->addWhere('name', '=', $client['provider'])->execute()->single(); $vars = ['token' => $token, 'client' => $client, 'provider' => $provider]; $mailSettings = civicrm_api4('MailSettings', 'create', [ 'values' => self::evalArrayTemplate($provider['mailSettingsTemplate'], $vars), ])->single(); - \Civi\Api4\OAuthSysToken::update(0) + \Civi\Api4\OAuthSysToken::update(FALSE) ->addWhere('id', '=', $token['id']) ->setValues(['tag' => 'MailSettings:' . $mailSettings['id']]) ->execute(); diff --git a/ext/oauth-client/CRM/OAuth/Page/Return.php b/ext/oauth-client/CRM/OAuth/Page/Return.php index b3df41301a..38b1aaa14e 100644 --- a/ext/oauth-client/CRM/OAuth/Page/Return.php +++ b/ext/oauth-client/CRM/OAuth/Page/Return.php @@ -35,7 +35,7 @@ class CRM_OAuth_Page_Return extends CRM_Core_Page { $this->assign('error', $error ?? NULL); } elseif ($authCode = CRM_Utils_Request::retrieve('code', 'String')) { - $client = \Civi\Api4\OAuthClient::get(0)->addWhere('id', '=', $state['clientId'])->execute()->single(); + $client = \Civi\Api4\OAuthClient::get(FALSE)->addWhere('id', '=', $state['clientId'])->execute()->single(); $tokenRecord = Civi::service('oauth2.token')->init([ 'client' => $client, 'scope' => $state['scopes'], diff --git a/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php b/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php index 5a1e4c523f..008eaca1ae 100644 --- a/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php +++ b/ext/oauth-client/Civi/Api4/Action/OAuthSysToken/Refresh.php @@ -79,7 +79,7 @@ class Refresh extends BasicBatchAction { protected function getProvider($clientId) { if (!isset($this->providers[$clientId])) { - $client = \Civi\Api4\OAuthClient::get(0)->addWhere('id', '=', $clientId)->execute()->single(); + $client = \Civi\Api4\OAuthClient::get(FALSE)->addWhere('id', '=', $clientId)->execute()->single(); $this->providers[$clientId] = \Civi::service('oauth2.league')->createProvider($client); } return $this->providers[$clientId]; diff --git a/ext/oauth-client/Civi/OAuth/OAuthLeagueFacade.php b/ext/oauth-client/Civi/OAuth/OAuthLeagueFacade.php index 49f50b9707..01fd7d4064 100644 --- a/ext/oauth-client/Civi/OAuth/OAuthLeagueFacade.php +++ b/ext/oauth-client/Civi/OAuth/OAuthLeagueFacade.php @@ -25,7 +25,7 @@ class OAuthLeagueFacade { */ public function createProviderOptions($clientDef) { $clientDef = $this->resolveSingleRef('OAuthClient', $clientDef, ['id', 'provider'], ['secret', 'guid']); - $providerDef = \Civi\Api4\OAuthProvider::get(0) + $providerDef = \Civi\Api4\OAuthProvider::get(FALSE) ->addWhere('name', '=', $clientDef['provider']) ->execute() ->single(); diff --git a/ext/oauth-client/tests/phpunit/Civi/OAuth/AuthCodeFlowTest.php b/ext/oauth-client/tests/phpunit/Civi/OAuth/AuthCodeFlowTest.php index 5dd61ce826..8f30036b6c 100644 --- a/ext/oauth-client/tests/phpunit/Civi/OAuth/AuthCodeFlowTest.php +++ b/ext/oauth-client/tests/phpunit/Civi/OAuth/AuthCodeFlowTest.php @@ -254,7 +254,7 @@ class AuthCodeFlowTest extends \PHPUnit\Framework\TestCase implements $this->assertEquals('example-access-token-value', $tokenRecord['access_token']); $this->assertEquals('example-refresh-token-value', $tokenRecord['refresh_token']); $this->assertGreaterThan($notLoggedInContactID, $tokenRecord['contact_id']); - $contact = \Civi\Api4\Contact::get(0) + $contact = \Civi\Api4\Contact::get(FALSE) ->addWhere('id', '=', $tokenRecord['contact_id']) ->addJoin('Email AS email') ->addSelect('email.email') @@ -351,7 +351,7 @@ class AuthCodeFlowTest extends \PHPUnit\Framework\TestCase implements $this->assertEquals('example-access-token-value', $tokenRecord['access_token']); $this->assertEquals('example-refresh-token-value', $tokenRecord['refresh_token']); $this->assertGreaterThan($loggedInContactID, $tokenRecord['contact_id']); - $contact = \Civi\Api4\Contact::get(0) + $contact = \Civi\Api4\Contact::get(FALSE) ->addWhere('id', '=', $tokenRecord['contact_id']) ->addJoin('Email AS email') ->addSelect('email.email') diff --git a/ext/oauth-client/tests/phpunit/api/v4/OAuthClientTest.php b/ext/oauth-client/tests/phpunit/api/v4/OAuthClientTest.php index 34ec0a0973..cb7e0eb0fa 100644 --- a/ext/oauth-client/tests/phpunit/api/v4/OAuthClientTest.php +++ b/ext/oauth-client/tests/phpunit/api/v4/OAuthClientTest.php @@ -50,15 +50,15 @@ class api_v4_OAuthClientTest extends \PHPUnit\Framework\TestCase implements Head $usePerms(['manage OAuth client']); // If we can tighten perm model: $usePerms(['manage OAuth client', 'manage OAuth client secrets']); - $get = Civi\Api4\OAuthClient::get(0)->addWhere('guid', '=', "example-id-$random")->execute(); + $get = Civi\Api4\OAuthClient::get(FALSE)->addWhere('guid', '=', "example-id-$random")->execute(); $this->assertEquals(1, $get->count()); $client = $get->first(); $this->assertEquals("example-id-$random", $client['guid']); $this->assertEquals("example-secret-$random", $client['secret']); $usePerms(['manage OAuth client']); - Civi\Api4\OAuthClient::delete(0)->addWhere('guid', '=', "example-id-$random")->execute(); - $get = Civi\Api4\OAuthClient::get(0)->addWhere('guid', '=', "example-id-$random")->execute(); + Civi\Api4\OAuthClient::delete(FALSE)->addWhere('guid', '=', "example-id-$random")->execute(); + $get = Civi\Api4\OAuthClient::get(FALSE)->addWhere('guid', '=', "example-id-$random")->execute(); $this->assertEquals(0, $get->count()); } -- 2.25.1