From 57faf21a676488d4da0bff0f0c1ff4e90d469b5a Mon Sep 17 00:00:00 2001
From: Alexander Davis <alex@adcm.uk>
Date: Mon, 17 Aug 2020 16:36:05 +0100
Subject: [PATCH 1/2] Fixing Login Die

---
 app/public/actions/login.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/public/actions/login.php b/app/public/actions/login.php
index aa13904..13d04d4 100644
--- a/app/public/actions/login.php
+++ b/app/public/actions/login.php
@@ -28,7 +28,7 @@
             $sql->bindParam(':family', $oidc_user['family_name']);
             $sql->bindParam(':email', $oidc_user['email']);
             $sql->execute();
-        } catch (Jumbojett\PDOException $e) {
+        } catch (PDOException $e) {
             echo("Error during creation of new user record: " . $e->getMessage());
             die();
             $alert = array("danger", "Error during creation of new user record: " . $e->getMessage());
@@ -44,7 +44,7 @@
             $sql->bindParam(':family', $oidc_user['family_name']);
             $sql->bindParam(':email', $oidc_user['email']);
             $sql->execute();
-        } catch (Jumbojett\PDOException $e) {
+        } catch (PDOException $e) {
             echo("Error during existing user record update: " . $e->getMessage());
             die();
             $alert = array("danger", "Error during existing user record update: " . $e->getMessage());

From 49581da52caec45a656813574ff29484d7e59c02 Mon Sep 17 00:00:00 2001
From: Alexander Davis <AlexanderEDavis@users.noreply.github.com>
Date: Mon, 17 Aug 2020 16:48:13 +0100
Subject: [PATCH 2/2] Broken login (#121)

* Fixing Login Die

* Fix Broken Login 2
---
 app/includes/footer.php      | 4 ++--
 app/public/actions/login.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/includes/footer.php b/app/includes/footer.php
index c737d4d..e2b63c7 100644
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -1,9 +1,9 @@
 <footer class="footer mt-auto py-3">
   <div class="text-center text-muted">
     <?php
-      echo($_ENV['APP_NAME'] . " " . get_version());
+      echo($_ENV['APP_NAME'] . " " . get_version() . ".<br>");
       if ($_ENV['APP_NAME'] != "FHeD") {
-          echo(", powered by FHeD");
+          echo("Powered by FHeD.");
       };
     ?><br>
     <?php if (is_signed_in()) {
diff --git a/app/public/actions/login.php b/app/public/actions/login.php
index 13d04d4..05e8933 100644
--- a/app/public/actions/login.php
+++ b/app/public/actions/login.php
@@ -17,7 +17,7 @@
         $alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
     }
 
-    if (!user_exists($db, $uuid)) {
+    if (user_exists($db, $oidc_user['sub']) == false) {
         // User doesn't already exist
         try {
             $stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)";