0ct0pu5/Heimdall
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some changes to SupportedApps.php

Browse source
This commit is contained in:
Chris 2018-10-31 15:42:34 +00:00
parent 125b9f4160
commit fe6776ee9d
1 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/SupportedApps.php
View file

@ -8,10 +8,18 @@ abstract class SupportedApps
protected $jar = false;
protected $method = 'GET';
protected $error;
public function appTest($url, $attrs = [])
public function appTest($url, $attrs = [], $overridevars=false)
{
$res = $this->execute($url, $attrs);
if($res == null) {
return (object)[
'code' => null,
'status' => $this->error,
'response' => 'Connection failed',
];
}
switch($res->getStatusCode()) {
case 200:
$status = 'Successfully communicated with the API';
@ -33,20 +41,33 @@ abstract class SupportedApps
];
}
public function execute($url, $attrs = [])
public function execute($url, $attrs = [], $overridevars=false, $overridemethod=false)
{
$vars = [
$res = null;
$vars = ($overridemethod !== false) ?
$overridevars : [
'http_errors' => false,
'timeout' => 15,
'connect_timeout' => 15,
];
$client = new Client($vars);
$method = ($overridemethod !== false) ? $overridemethod : $this->method;
try {
return $client->request($this->method, $url, $attrs);
} catch (\GuzzleHttp\Exception\ServerException $e) {
echo (string) $e->getResponse()->getBody();
}
return $client->request($method, $url, $attrs);
} catch (\GuzzleHttp\Exception\ConnectException $e) {
Log::error("Connection refused");
Log::debug($e->getMessage());
$this->error = "Connection refused - ".(string) $e->getMessage();
} catch (\GuzzleHttp\Exception\ServerException $e) {
Log::debug($e->getMessage());
$this->error = (string) $e->getResponse()->getBody();
}
$this->error = 'General error connecting with API';
return $res;
}
public function login()
@ -54,9 +75,14 @@ abstract class SupportedApps
}
public function apiRequest($url)
public function normaliseurl($url, $addslash=true)
{
$url = rtrim($url, '/');
if($addslash) $url .= '/';
return $url;
}