Skip to content

Commit

Permalink
https://github.com/opencart/opencart/issues/12661
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielkerr
danielkerr committed Apr 27, 2024
1 parent ea2e814 commit a5aa0ca
Show file tree
Hide file tree
Showing 7 changed files with 198 additions and 139 deletions.
46 changes: 40 additions & 6 deletions upload/admin/controller/marketplace/marketplace.php
View file
Expand Up @@ -580,7 +580,11 @@ public function info(): ?\Opencart\System\Engine\Action {

curl_close($curl);

$response_info = json_decode($response, true);
if ($status == 200) {
$response_info = json_decode($response, true);
} else {
$response_info = [];
}

if ($response_info) {
$this->load->language('marketplace/marketplace');
Expand Down Expand Up @@ -837,7 +841,11 @@ public function purchase(): void {

curl_close($curl);

$response_info = json_decode($response, true);
if ($status == 200) {
$response_info = json_decode($response, true);
} else {
$response_info = [];
}

if (isset($response_info['success'])) {
// If purchase complete we update the status for all downloads to be available.
Expand Down Expand Up @@ -918,10 +926,16 @@ public function download(): void {

$response = curl_exec($curl);

$response_info = json_decode($response, true);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);

curl_close($curl);

if ($status == 200) {
$response_info = json_decode($response, true);
} else {
$response_info = [];
}

if (isset($response_info['download'])) {
if (substr($response_info['filename'], -10) == '.ocmod.zip') {
$handle = fopen(DIR_STORAGE . 'marketplace/' . $response_info['filename'], 'w');
Expand Down Expand Up @@ -1026,9 +1040,15 @@ public function addComment(): void {

$response = curl_exec($curl);

$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);

curl_close($curl);

$response_info = json_decode($response, true);
if ($status == 200) {
$response_info = json_decode($response, true);
} else {
$response_info = [];
}

if (isset($response_info['success'])) {
$json['success'] = $response_info['success'];
Expand Down Expand Up @@ -1075,9 +1095,15 @@ public function comment(): void {

$response = curl_exec($curl);

$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);

curl_close($curl);

$json = json_decode($response, true);
if ($status == 200) {
$json = json_decode($response, true);
} else {
$json = [];
}

$data['comments'] = [];

Expand Down Expand Up @@ -1154,7 +1180,15 @@ public function reply(): void {

$response = curl_exec($curl);

$json = json_decode($response, true);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);

curl_close($curl);

if ($status == 200) {
$json = json_decode($response, true);
} else {
$json = [];
}

$data['replies'] = [];

Expand Down
92 changes: 87 additions & 5 deletions upload/admin/controller/sale/order.php
View file
Expand Up @@ -1244,6 +1244,42 @@ public function info(): void {
*
* Method to call the storefront API and return a response.
*
* @Example
*
* $url = 'https://www.yourdomain.com/index.php?route=api/account/login&language=en-gb&store_id=0';
*
* $request_data = [
* 'username' => 'Default',
* 'key' => ''
* ];
*
* $curl = curl_init();
*
* curl_setopt($curl, CURLOPT_URL, $url);
* curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
* curl_setopt($curl, CURLOPT_HEADER, false);
* curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
* curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 30);
* curl_setopt($curl, CURLOPT_TIMEOUT, 30);
* curl_setopt($curl, CURLOPT_POST, 1);
* curl_setopt($curl, CURLOPT_POSTFIELDS, $request_data);
*
* $response = curl_exec($curl);
*
* $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
*
* curl_close($curl);
*
* if ($status == 200) {
* $api_token = json_decode($response, true);
*
* if (isset($api_token['api_token'])) {
*
* // You can now store the session cookie as a var in the your current session or some of persistent storage
* $session_id = $api_token['api_token'];
* }
* }
*
* @return void
*/
public function call(): void {
Expand All @@ -1252,25 +1288,25 @@ public function call(): void {
$json = [];

if (isset($this->request->get['call'])) {
$call = $this->request->get['call'];
$call = (string)$this->request->get['call'];
} else {
$call = '';
}

if (isset($this->session->data['api_session'])) {
$session_id = $this->session->data['api_session'];
$session_id = (string)$this->session->data['api_session'];
} else {
$session_id = '';
}

if (isset($this->request->get['store_id'])) {
$store_id = $this->request->get['store_id'];
$store_id = (int)$this->request->get['store_id'];
} else {
$store_id = 0;
}

if (isset($this->request->get['language'])) {
$language = $this->request->get['language'];
$language = (string)$this->request->get['language'];
} else {
$language = $this->config->get('config_language');
}
Expand All @@ -1279,7 +1315,50 @@ public function call(): void {
$json['error']['warning'] = $this->language->get('error_permission');
}

$this->load->model('user/api');

$api_info = $this->model_user_api->getApi($this->config->get('config_api_id'));

if (!$api_info) {
$json['error']['warning'] = $this->language->get('error_api');
}

if (!$json) {
$time = time();

// We create a hash from the data in a similar method to how amazon does things.
$string = 'api/' . $call . "\n";
$string .= $api_info['username'] . "\n";
$string .= $this->request->server['HTTP_HOST'] . "\n";
$string .= $store_id . "\n";
$string .= $language . "\n";
$string .= json_encode($this->reqest->post) . "\n";
$string .= $time . "\n";

$signature = base64_encode(hash_hmac('sha1', $string, $api_info['key'], true));

$url = '?route=api/' . $call;
$url .= '&username=' . urlencode($api_info['username']);
$url .= '&store_id=' . $store_id . "\n";
$url .= '&language=' . $language . "\n";
$url .= '&time=' . $time;
$url .= '&signature=' . rawurlencode($signature);

/*
$curl = curl_init(OPENCART_SERVER . 'index.php' . $url);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_FORBID_REUSE, 1);
curl_setopt($curl, CURLOPT_FRESH_CONNECT, 1);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
$response = curl_exec($curl);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
*/

// 1. Create a store instance using loader class to call controllers, models, views, libraries
$this->load->model('setting/store');

Expand All @@ -1292,7 +1371,10 @@ public function call(): void {
$store->request->post = $this->request->post;

$store->request->get['route'] = 'api/' . $call;
$store->request->get['language'] = $language;


$store->request->get = string;


// 3. Remove the unneeded keys
unset($store->request->get['call']);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/startup/notification.php
View file
Expand Up @@ -32,7 +32,7 @@ public function index(): void {
if ($status == 200) {
$notification = json_decode($response, true);
} else {
$notification = '';
$notification = [];
}

if (isset($notification['notification'])) {
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/tool/upgrade.php
View file
Expand Up @@ -55,12 +55,12 @@ public function index(): void {

curl_close($curl);

if ($status = 200) {
if ($status == 200) {
$response_info = json_decode($response, true);
} else {
$response_info = [];
}

if ($response_info) {
$data['latest_version'] = $response_info['version'];
$data['date_added'] = date($this->language->get('date_format_short'), strtotime($response_info['date_added']));
Expand Down
122 changes: 0 additions & 122 deletions upload/catalog/controller/api/login.php
View file

This file was deleted.

0 comments on commit a5aa0ca

Please sign in to comment.