archives/FHeD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 40 Activity

🐛 User not added to DB - force die() on error

Browse Source 
Signed-off-by: Luke Tainton <luke@tainton.uk>
This commit is contained in:
Luke Tainton
2020-08-17 15:37:15 +01:00
parent 7a4a1074c5
commit 9e8b0c7769
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/includes/app_functions.php
View File

@@ -6,6 +6,23 @@
return $version;
}
function user_exists($db, $uuid)
{
try {
$sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid");
$sql->bindParam(':uuid', $uuid);
$sql->execute();
} catch (PDOException $e) {
$alert = array("danger", "Error during check for user record: " . $e->getMessage());
}
if (empty($sql))
{
return false;
} else {
return true;
}
}
function get_all_users($db)
{
try {

16
app/public/actions/login.php
View File

@@ -17,16 +17,8 @@
$alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
}
// Check if the user already exists
try {
$user_exist_sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid");
$user_exist_sql->bindParam(':uuid', $oidc_user['sub']);
$user_exist_sql->execute();
} catch (PDOException $e) {
$alert = array("danger", "Error during check for user record: " . $e->getMessage());
}
if (empty($user_exist_sql)) {
if (!user_exists($db, $uuid))
{
// User doesn't already exist
try {
$stmt = "INSERT INTO users (uuid, uid, given_name, family_name, email) VALUES (:sub, :username, :given, :family, :email)";
@@ -38,6 +30,8 @@
$sql->bindParam(':email', $oidc_user['email']);
$sql->execute();
} catch (Jumbojett\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());
}
} else {
@@ -52,6 +46,8 @@
$sql->bindParam(':email', $oidc_user['email']);
$sql->execute();
} catch (Jumbojett\PDOException $e) {
echo("Error during existing user record update: " . $e->getMessage());
die();
$alert = array("danger", "Error during existing user record update: " . $e->getMessage());
}
}