From 6ffc10b36270916c1f7419e3598812337bc5dfc7 Mon Sep 17 00:00:00 2001 From: turbofeedorglory <85827039+turbofeedorglory@users.noreply.github.com> Date: Sat, 27 Aug 2022 23:27:46 +0100 Subject: [PATCH] Update ESI search endpoint & auth (#133) --- app/Controller/Api/Universe.php | 3 ++- app/Controller/Ccp/Universe.php | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Controller/Api/Universe.php b/app/Controller/Api/Universe.php index 9ee33e84..66475dcf 100644 --- a/app/Controller/Api/Universe.php +++ b/app/Controller/Api/Universe.php @@ -25,13 +25,14 @@ class Universe extends Controller\AccessController { $postData = (array)$f3->get('POST'); $categories = (array)$postData['categories']; $universeNameData = []; + $activeCharacter = $this->getCharacter(); if( array_key_exists('arg1', $params) && !empty($search = strtolower($params['arg1'])) && !empty($categories) ){ - $universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search); + $universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search, $activeCharacter->_id, $activeCharacter->getAccessToken()); } echo json_encode($universeNameData); diff --git a/app/Controller/Ccp/Universe.php b/app/Controller/Ccp/Universe.php index fe6a1e3b..26b5ee23 100644 --- a/app/Controller/Ccp/Universe.php +++ b/app/Controller/Ccp/Universe.php @@ -299,14 +299,16 @@ class Universe extends Controller\Controller { * search universeName data by search term * @param array $categories * @param string $search + * @param int $characterId + * @param string $accessToken * @param bool $strict * @return array */ - public static function searchUniverseNameData(array $categories, string $search, bool $strict = false) : array { + public static function searchUniverseNameData(array $categories, string $search, int $characterId, string $accessToken, bool $strict = false) : array { $f3 = \Base::instance(); $universeNameData = []; if( !empty($categories) && !empty($search)){ - $universeIds = $f3->ccpClient()->send('search', $categories, $search, $strict); + $universeIds = $f3->ccpClient()->send('search', $categories, $search, $characterId, $accessToken, $strict); if(isset($universeIds['error'])){ // ESI error $universeNameData = $universeIds;