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

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

Merged
restyled-io[bot] merged 1 commits from restyled/bug-69 into bug-69 2020-08-17 14:46:50 +00:00
Conversation 1 Commits 1 Files Changed 2 +41 -44
2 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/includes/app_functions.php
View File

@@ -8,15 +8,14 @@
function user_exists($db, $uuid)
{
try {
$sql = $db->prepare("SELECT uuid FROM users WHERE uuid=:uuid");
$sql->bindParam(':uuid', $uuid);
$sql->execute();
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());
$alert = array("danger", "Error during check for user record: " . $e->getMessage());
}
if (empty($sql))
{
if (empty($sql)) {
return false;
} else {
return true;

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

@@ -4,9 +4,9 @@
// Perform the OIDC authentication
try {
$oidc->authenticate();
$_SESSION['access_token'] = $oidc->requestClientCredentialsToken()->access_token;
$oidc_user = array(
$oidc->authenticate();
$_SESSION['access_token'] = $oidc->requestClientCredentialsToken()->access_token;
$oidc_user = array(
'sub' => $oidc->requestUserInfo('sub'),
'username' => $oidc->requestUserInfo('preferred_username'),
'given_name' => $oidc->requestUserInfo('given_name'),
@@ -14,42 +14,41 @@
'email' => $oidc->requestUserInfo('email'),
);
} catch (Jumbojett\OpenIDConnectClientException $e) {
$alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
$alert = array("danger", "Error during OpenID Connect authentication: " . $e->getMessage());
}
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)";
$sql = $db->prepare($stmt);
$sql->bindParam(':sub', $oidc_user['sub']);
$sql->bindParam(':username', $oidc_user['username']);
$sql->bindParam(':given', $oidc_user['given_name']);
$sql->bindParam(':family', $oidc_user['family_name']);
$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());
}
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)";
$sql = $db->prepare($stmt);
$sql->bindParam(':sub', $oidc_user['sub']);
$sql->bindParam(':username', $oidc_user['username']);
$sql->bindParam(':given', $oidc_user['given_name']);
$sql->bindParam(':family', $oidc_user['family_name']);
$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 {
// User already exists
try {
$stmt = "UPDATE users SET uid=:username, given_name=:given, family_name=:family, email=:email WHERE uuid=:sub";
$sql = $db->prepare($stmt);
$sql->bindParam(':sub', $oidc_user['sub']);
$sql->bindParam(':username', $oidc_user['username']);
$sql->bindParam(':given', $oidc_user['given_name']);
$sql->bindParam(':family', $oidc_user['family_name']);
$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());
}
// User already exists
try {
$stmt = "UPDATE users SET uid=:username, given_name=:given, family_name=:family, email=:email WHERE uuid=:sub";
$sql = $db->prepare($stmt);
$sql->bindParam(':sub', $oidc_user['sub']);
$sql->bindParam(':username', $oidc_user['username']);
$sql->bindParam(':given', $oidc_user['given_name']);
$sql->bindParam(':family', $oidc_user['family_name']);
$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());
}
}
oidc_set_vars($oidc_user['sub'], $oidc_user['username'], $oidc_user['given_name'], $oidc_user['family_name'], $oidc_user['email']);
@@ -58,4 +57,3 @@
$_SESSION['is_signed_in'] = "true";
header('Location: /');
?>