From 3b623393ac6313748c367d9df3b20fa960de4a69 Mon Sep 17 00:00:00 2001 From: "kai.t" Date: Fri, 24 May 2024 01:43:05 +0000 Subject: [PATCH] add token to header --- .../IpSupply/SyncOrder/Api/Repository.php | 21 -------------- .../SyncOrder/Block/Adminhtml/Config.php | 2 +- .../IpSupply/SyncOrder/Config/GetBaseURL.php | 0 .../Controller/Adminhtml/Config/Post.php | 0 app/code/IpSupply/SyncOrder/Helper.php | 29 ++++++++++++++++++- .../IpSupply/SyncOrder/Setup/UpgradeData.php | 3 +- app/code/IpSupply/SyncOrder/Sync/Index.php | 2 +- 7 files changed, 32 insertions(+), 25 deletions(-) mode change 100644 => 100755 app/code/IpSupply/SyncOrder/Config/GetBaseURL.php mode change 100644 => 100755 app/code/IpSupply/SyncOrder/Controller/Adminhtml/Config/Post.php diff --git a/app/code/IpSupply/SyncOrder/Api/Repository.php b/app/code/IpSupply/SyncOrder/Api/Repository.php index 68abc53f..040d1076 100755 --- a/app/code/IpSupply/SyncOrder/Api/Repository.php +++ b/app/code/IpSupply/SyncOrder/Api/Repository.php @@ -32,27 +32,6 @@ class Repository implements RepositoryInterface die(json_encode(['message' => 'unauthorized'])); } - static function getForm() - { - $data = [ - 'url' => '', - ]; - - $config = \IpSupply\SyncOrder\Config\Getter::get('config'); - if ($config) { - $data = json_decode($config, true); - } - - return [ - [ - 'label' => 'API', - 'name' => 'url', - 'value' => $data['url'] ?? '' - ] - ]; - } - - public function getData() { return \IpSupply\SyncOrder\Helper::responseOk([ diff --git a/app/code/IpSupply/SyncOrder/Block/Adminhtml/Config.php b/app/code/IpSupply/SyncOrder/Block/Adminhtml/Config.php index 1382cef8..1cf5b64b 100755 --- a/app/code/IpSupply/SyncOrder/Block/Adminhtml/Config.php +++ b/app/code/IpSupply/SyncOrder/Block/Adminhtml/Config.php @@ -28,6 +28,6 @@ class Config extends Template } public function getForm() { - return \IpSupply\SyncOrder\Api\Repository::getForm(); + return \IpSupply\SyncOrder\Helper::getForm(); } } diff --git a/app/code/IpSupply/SyncOrder/Config/GetBaseURL.php b/app/code/IpSupply/SyncOrder/Config/GetBaseURL.php old mode 100644 new mode 100755 diff --git a/app/code/IpSupply/SyncOrder/Controller/Adminhtml/Config/Post.php b/app/code/IpSupply/SyncOrder/Controller/Adminhtml/Config/Post.php old mode 100644 new mode 100755 diff --git a/app/code/IpSupply/SyncOrder/Helper.php b/app/code/IpSupply/SyncOrder/Helper.php index c23b76c7..f41acbeb 100755 --- a/app/code/IpSupply/SyncOrder/Helper.php +++ b/app/code/IpSupply/SyncOrder/Helper.php @@ -2,10 +2,37 @@ namespace IpSupply\SyncOrder; -final class Helper { +final class Helper +{ public const API_KEY = 'IpSupply@123'; public const PREFIX = 'IpSupply_SyncOrder'; + static function getForm() + { + $data = [ + 'url' => '', + 'token' => '' + ]; + + $config = \IpSupply\SyncOrder\Config\Getter::get('config'); + if ($config) { + $data = json_decode($config, true); + } + + return [ + [ + 'label' => 'API', + 'name' => 'url', + 'value' => $data['url'] ?? '' + ], + [ + 'label' => 'Token', + 'name' => 'token', + 'value' => $data['token'] ?? '' + ] + ]; + } + static function responseOk(array $data) { header('HTTP/1.1 200 Ok'); diff --git a/app/code/IpSupply/SyncOrder/Setup/UpgradeData.php b/app/code/IpSupply/SyncOrder/Setup/UpgradeData.php index 208d9716..81181e13 100755 --- a/app/code/IpSupply/SyncOrder/Setup/UpgradeData.php +++ b/app/code/IpSupply/SyncOrder/Setup/UpgradeData.php @@ -27,7 +27,8 @@ class UpgradeData implements UpgradeDataInterface public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context) { \IpSupply\SyncOrder\Config\Setter::set(path: 'config', value: json_encode([ - 'url' => 'https://google.com' // TODO: config api + 'url' => 'https://api.nswteam.net/api/transferPostData', + 'token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2FwaS5uc3d0ZWFtLm5ldC9hcGkvbG9naW4iLCJpYXQiOjE2ODkzOTEyMDMsImV4cCI6MTcyMDkyNzIwMywibmJmIjoxNjg5MzkxMjAzLCJqdGkiOiJreFA1MW9jck5rdEYzSzY3Iiwic3ViIjozNjkwLCJwcnYiOiJjOGVlMWZjODllNzc1ZWM0YzczODY2N2U1YmUxN2E1OTBiNmQ0MGZjIn0.p-aE0oWkKmdrcKWD94oSmMd_CMbY_4MoqADIwYIhIKw' // ])); } } diff --git a/app/code/IpSupply/SyncOrder/Sync/Index.php b/app/code/IpSupply/SyncOrder/Sync/Index.php index a962bd90..79feed22 100755 --- a/app/code/IpSupply/SyncOrder/Sync/Index.php +++ b/app/code/IpSupply/SyncOrder/Sync/Index.php @@ -20,7 +20,7 @@ final class Index protected function _headers($headers = array()) { return array_merge([ - 'Authorization' => 'Bearer ' . null + 'Authorization' => 'Bearer ' . $this->_config['token'] ], $headers); }