From d0475b22c1f59ffd60e06d079534704a2de88fa8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 15:37:23 -0400
Subject: [PATCH] Add UserPrivilege enum, provide better 404 information

---
 api/BusinessLogic/Security/UserPrivilege.php | 15 ++++++++++
 api/BusinessLogic/Tickets/Autoassigner.php   |  5 ++--
 api/index.php                                | 29 ++++++++------------
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 api/BusinessLogic/Security/UserPrivilege.php

diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php
new file mode 100644
index 00000000..8344d31d
--- /dev/null
+++ b/api/BusinessLogic/Security/UserPrivilege.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 3/12/2017
+ * Time: 12:11 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserPrivilege {
+    const CAN_VIEW_TICKETS = 'can_view_tickets';
+    const CAN_REPLY_TO_TICKETS = 'can_reply_tickets';
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index e7d24207..49723095 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -4,6 +4,7 @@ namespace BusinessLogic\Tickets;
 
 
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserPrivilege;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\UserGateway;
 
@@ -34,8 +35,8 @@ class Autoassigner {
         foreach ($potentialUsers as $potentialUser) {
             if ($potentialUser->admin ||
                 (in_array($categoryId, $potentialUser->categories) &&
-                    in_array('can_view_tickets', $potentialUser->permissions) &&
-                    in_array('can_reply_tickets', $potentialUser->permissions))) {
+                    in_array(UserPrivilege::CAN_VIEW_TICKETS, $potentialUser->permissions) &&
+                    in_array(UserPrivilege::CAN_REPLY_TO_TICKETS, $potentialUser->permissions))) {
                 return $potentialUser;
             }
         }
diff --git a/api/index.php b/api/index.php
index 3010cddf..7b1120a0 100644
--- a/api/index.php
+++ b/api/index.php
@@ -9,8 +9,10 @@ register_shutdown_function('fatalErrorShutdownHandler');
 $userContext = null;
 
 function handle404() {
-    http_response_code(404);
-    print json_encode('404 found');
+    print output(array(
+        'message' => "The endpoint '{$_SERVER['REQUEST_URI']}' was not found. Double-check your request and submit again.",
+        'uri' => $_SERVER['REQUEST_URI']
+    ), 404);
 }
 
 function before() {
@@ -21,6 +23,8 @@ function before() {
 }
 
 function assertApiIsEnabled() {
+    global $applicationContext;
+
     return true;
 }
 
@@ -34,13 +38,7 @@ function buildUserContext($xAuthToken) {
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
-    if ($errorNumber === E_WARNING) {
-        //-- TODO log a warning
-    } elseif ($errorNumber === E_NOTICE || $errorNumber === E_USER_NOTICE) {
-        //-- TODO log an info
-    } else {
-        exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
-    }
+    exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
 }
 
 /**
@@ -53,15 +51,12 @@ function exceptionHandler($exception) {
         $castedException = $exception;
 
         print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode);
+    } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
+        /* @var $castedException \Core\Exceptions\SQLException */
+        $castedException = $exception;
+        print_error("Fought an uncaught SQL exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
     } else {
-        if (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
-            /* @var $castedException \Core\Exceptions\SQLException */
-            $castedException = $exception;
-            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
-        } else {
-            print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
-        }
-
+        print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
     }
     // Log more stuff to logging table if possible; we'll catch any exceptions from this
     die();