Merge branch 'remastering' of https://git.steelants.cz/SImple-Home/PHP_SMART_HOME_V3 into remastering

This commit is contained in:
JonatanRek 2020-04-25 18:04:08 +02:00
commit 11e75cb18d
2 changed files with 11 additions and 8 deletions

View File

@ -34,12 +34,15 @@ spl_autoload_register("Autoloader::ClassLoader");
Autoloader::setRoot('/var/www/dev.steelants.cz/vasek/home-update/');
class ErrorHandler {
static function exception($exception){
error_log($exception);
header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, $exception->getCode());
echo '<h1>Oops!</h1><p>Something went wrong!</p>';
exit;
}
static function exception($exception){
error_log($exception);
http_response_code($exception->getCode());
$message = [
'code' => $exception->getCode(),
'message' => $exception->getMessage(),
];
echo json_encode($message);
}
}
set_exception_handler("ErrorHandler::exception");

View File

@ -23,10 +23,10 @@ class ApiController {
$authManager = new AuthManager();
$this->authenticated = $authManager>validateToken($_SERVER['HTTP_AUTHORIZATION']);
if(!$this->authenticated){
throw new Exception("Auth required", 401);
throw new Exception("Authorization required", 401);
}
} else {
throw new Exception("Auth required", 401);
throw new Exception("Authorization required", 401);
}
}