app/.env.sample

@@ -13,3 +13,5 @@ OIDC_HOST          = ""
 OIDC_CLIENT_ID     = ""
 OIDC_CLIENT_SECRET = ""
 OIDC_DISABLE_SSL   = ""
+
+SENTRY_ENVIRONMENT = ""

app/composer.json

@@ -1,7 +1,8 @@
 {
-    "require": {
-        "ramsey/uuid": "^4.0",
-        "vlucas/phpdotenv": "^5.0",
-        "jumbojett/openid-connect-php": "^0.9.0"
-    }
+  "require": {
+    "ramsey/uuid": "^4.0",
+    "vlucas/phpdotenv": "^5.0",
+    "jumbojett/openid-connect-php": "^0.9.0",
+    "sentry/sdk": "^2.1"
+  }
 }

app/includes/app_functions.php

@@ -6,6 +6,25 @@
       return $version;
   }
 
+  function oidc_set_vars($sub, $uid, $fname, $lname, $email)
+  {
+      $_SESSION['uuid'] = $sub;
+      $_SESSION['username'] = $uid;
+      $_SESSION['given_name'] = $fname;
+      $_SESSION['family_name'] = $lname;
+      $_SESSION['full_name'] = $fname . " " . $lname;
+      $_SESSION['email'] = $email;
+  }
+
+  function is_signed_in()
+  {
+      if (isset($_SESSION['is_signed_in'])) {
+          return true;
+      } else {
+          return false;
+      }
+  }
+
   function user_exists($db, $uuid)
   {
       try {
@@ -15,13 +34,13 @@
           $sql->setFetchMode(PDO::FETCH_ASSOC);
           $result = $sql->fetchAll();
       } catch (PDOException $e) {
-          $alert = array("danger", "Error during check for user record: " . $e->getMessage());
+          throw new Exception("Error in user_exists(): " . $e->getMessage());
           die();
       }
       if (empty($result)) {
-         return false;
+          return false;
       } else {
-         return true;
+          return true;
       }
   }
 
@@ -34,7 +53,8 @@
           $sql->setFetchMode(PDO::FETCH_ASSOC);
           $result = $sql->fetchAll();
       } catch (PDOException $e) {
-          echo("Error: " . $e->getMessage());
+          throw new Exception("Error in get_all_users(): " . $e->getMessage());
+          die();
       }
       return $result;
   }
@@ -50,7 +70,8 @@
           $result = $sql->fetchAll();
           $usr = $result[0]['given_name'] . " " . $result[0]['family_name'];
       } catch (PDOException $e) {
-          echo("Error: " . $e->getMessage());
+          throw new Exception("Error in get_user_name(): " . $e->getMessage());
+          die();
       }
       return $usr;
   }

app/includes/prereqs.php

@@ -7,17 +7,27 @@ require_once __DIR__ . "/../vendor/autoload.php";
 $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . "/..");
 $dotenv->load();
 
+// Custom functions
+require_once __DIR__ . "/app_functions.php";
+
+// Sentry
+Sentry\init([
+  'dsn' => 'https://8d8f4632fe3e4ec9b005a1b60b660ba5@o435706.ingest.sentry.io/5395475',
+  'release' => get_version(),
+]);
+
 // Database auto-generation
 if (file_exists("/../includes/install.php")) {
-  return;
-  add_action('run_db_populate');
+    return;
+    add_action('run_db_populate');
 }
 
-function run_db_populate() {
+function run_db_populate()
+{
     // all my glorious one-time-magic.
-    include( "/../includes/install.php" );
-   // after all execution rename your file;
-   rename( "/../includes/install.php", "/../includes/install-backup.php");
+    include("/../includes/install.php");
+    // after all execution rename your file;
+    rename("/../includes/install.php", "/../includes/install-backup.php");
 }
 
 // Session
@@ -29,30 +39,9 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 // OpenID Connect
 use Jumbojett\OpenIDConnectClient;
+
 $oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
 if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
-  $oidc->setVerifyHost(false);
-  $oidc->setVerifyPeer(false);
-}
-
-
-// Custom functions
-
-require_once __DIR__ . "/app_functions.php";
-
-function oidc_set_vars($sub, $uid, $fname, $lname, $email) {
-  $_SESSION['uuid'] = $sub;
-  $_SESSION['username'] = $uid;
-  $_SESSION['given_name'] = $fname;
-  $_SESSION['family_name'] = $lname;
-  $_SESSION['full_name'] = $fname . " " . $lname;
-  $_SESSION['email'] = $email;
-}
-
-function is_signed_in() {
-  if (isset($_SESSION['is_signed_in'])) {
-    return true;
-  } else {
-    return false;
-  }
+    $oidc->setVerifyHost(false);
+    $oidc->setVerifyPeer(false);
 }