Competitions; CompetitionTypes; Participants; better routing; administrators; ...

1 files changed, 16 insertions, 3 deletions

diff --git a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
index 012b5cf..22ec44c 100644
--- a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
+++ b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
@@ -4,6 +4,7 @@ namespace CamilStaps\BotleaguesApi;
 use \Illuminate\Database\Eloquent\ModelNotFoundException;
 use \Illuminate\Support\ServiceProvider;
 use \Illuminate\Support\Facades\App;
+use \Illuminate\Support\Facades\Config;
 use \Dingo\Api\Facade\API;
 use Response;
 
@@ -27,15 +28,27 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
 
 		include __DIR__ . '/../../filters.php';
 		include __DIR__ . '/../../routes.php';
+		
+		App::fatal(function($e) {
+			return Response::make(
+				['error' => Config::get('app.debug') ? $e->getMessage() : "Internal error"], 
+				500);
+		});
 
 		API::error(function(ModelNotFoundException $e) {
-			return Response::make(['error' => 'Resource not found'], 404);
+			return Response::make(
+				['error' => 'Resource not found'], 
+				404);
 		});
 		API::error(function(\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException $e) {
-			return Response::make(['error' => $e->getMessage() == null ? 'Access denied' : $e->getMessage()], 404);
+			return Response::make(
+				['error' => !Config::get('app.debug') || empty($e->getMessage()) ? 'Access denied' : $e->getMessage()], 
+				404);
 		});
 		API::error(function(\Exception $e) {
-			return Response::make(['error' => $e->getMessage()], 500);
+			return Response::make(
+				['error' => Config::get('app.debug') ? $e->getMessage() : "Internal error"], 
+				500);
 		});
 	}