andreas/hForumPHP
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored/ streamlined UserSession code

Browse Source 
Makes it easier to tell when a user is signed in
This commit is contained in:
Hion-V 2019-05-24 23:53:49 +02:00
parent 09e9e616ec
commit be9e69c71c
9 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev_mvc/controller/Database.php
View File

@ -235,7 +235,6 @@ Class Database{
$query->execute();
//Check hoeveelheid teruggestuurde rijen
if($query->rowCount() == 1){
echo('session valid in db<br>');
return true;
}
else{
@ -243,7 +242,6 @@ Class Database{
}
}
static function invalidateSession($token){
echo("hek");
//Init db connection
$con = Database::connectToDB();
//Bereid query voor

36
dev_mvc/controller/UserSession.php
View File

@ -1,15 +1,12 @@
<?php
Class UserSession{
public $username = "undefined";
public $uid = -1;
public $token = "undefined";
public $expires;
public function UserSession($username, $uid, $token = "undefined"){
$this->username = $username;
public function UserSession($uid, $token = "undefined"){
$this->uid = $uid;
$this->token = $token;
$this->setExpiry();
//echo($username."<br>");
//echo($loginSessionToken);
$_SESSION['usersession'] = $this;
setcookie('usersession', $this->token);
@ -39,7 +36,6 @@ Class UserSession{
public static function isSessionValid(){
if(isset($_SESSION['usersession'])){
if(!Database::isSessionValid($_SESSION['usersession']->token, $_SESSION['usersession']->uid)){
echo('session invalid in db');
return false;
}
if(!UserSession::isSessionExpired($_SESSION['usersession'])){
@ -52,8 +48,7 @@ Class UserSession{
$token = $_COOKIE['usersession'];
$uid = $_COOKIE['uid'];
if(Database::isSessionValid($token,$uid)){
$username = Database::getUsername($uid);
$session = new UserSession($username, $uid, $token);
$session = new UserSession($uid, $token);
$session->expires = new DateTime(Database::getSessionExpiryDate($token));
}
else{
@ -81,6 +76,7 @@ Class UserSession{
}
}
public static function isUserSignedIn(){
/*
if(UserSession::isSessionValid()){
if(!UserSession::isSessionExpired(UserSession::getSession())){
if(Database::isSessionValid(UserSession::getSession()->token, UserSession::getSession()->uid)){
@ -95,11 +91,31 @@ Class UserSession{
else{
return false;
}
}
public static function updateSigninState(){
if(!UserSession::isUserSignedIn()){
*/
//session exists, no need to do anything
if(isset($_SESSION['usersession'])){
return true;
}
else{
if(isset($_COOKIE['usersession'])){
//check if the session exists in the database
if(Database::isSessionTokenInUse($_COOKIE['usersession'])){
//check if database expiration datetime is still valid
$expirationDateTime = Database::getSessionExpiryDate($_COOKIE['usersession']);
if(new DateTime($expirationDateTime) >= new DateTime()){
//user is signed in. Restore session
$userSession = new UserSession($_COOKIE['uid'], $_COOKIE['usersession']);
return true;
}
else{
Database::invalidateSession($_COOKIE['usersession']);
}
}
}
}
//session either doesn't exist, doesn't exist in cookie, doesn't exist in database, or is expired in the database.
return false;
}
}
?>

2
dev_mvc/index.php
View File

@ -19,7 +19,7 @@ include_once("./controller/ActionHandler.php");
session_start();
//Execute Actie zo nodig.
ActionHandler::doAction();
UserSession::UpdateSigninState();
//Store de geselecteerde pagina in variabele $page

1
dev_mvc/model/model_destroy.php → dev_mvc/model/actions/model_destroy.php
View File

@ -1,3 +1,4 @@
<?php
session_destroy();
session_start();
?>

5
dev_mvc/model/actions/model_signout.php
View File

@ -1,7 +1,4 @@
<?php
include_once("./controller/UserSession.php");
if(UserSession::isSessionValid()){
Database::invalidateSession(UserSession::getSession()->token);
}
Database::invalidateSession($_COOKIE['usersession']);
session_destroy();
?>

7
dev_mvc/model/model_attempt_logout.php
View File

@ -1,7 +0,0 @@
<?php
include_once("./controller/UserSession.php");
if(UserSession::isSessionValid()){
Database::invalidateSession(UserSession::getSession()->token);
session_destroy();
}
?>

4
dev_mvc/model/model_do_login.php
View File

@ -3,7 +3,7 @@ $debuginfo = false;
include_once("./controller/UserSession.php");
include_once("./controller/Database.php");
include_once("./controller/HUtils.php");
if(!UserSession::isSessionValid()){
if(!UserSession::isUserSignedIn()){
if(HUtils::issetPost(['email','password'])){
if(Database::isLoginValid($_POST['email'], $_POST['password'])){
//obtain UID
@ -17,7 +17,7 @@ if(!UserSession::isSessionValid()){
while(Database::isSessionTokenInUse($token)){
$token = UserSession::generateToken();
}
$a = new UserSession($username, $uid, $token);
$a = new UserSession($uid, $token);
if($debuginfo){
echo $a->getSessionToken();
echo "<br>";

3
dev_mvc/view/pagecontent/content_header.php
View File

@ -4,7 +4,4 @@ if(UserSession::isUserSignedIn()){
}else{
include("./view/pagecontent/header/content_header_signedout.php");
}
if(!UserSession::isSessionValid()){
include_once("./model/actions/model_signout.php");
}
?>

2
dev_mvc/view/pagecontent/header/content_header_signedin.php
View File

@ -3,5 +3,5 @@ include_once("./controller/AssetHandler.php");
AssetHandler::printAsset("logo.png", true, 128);
?>
<nav>
<a href="?a=signout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?p=destroy">simulate $_SESSION expiry</a>
<a href="?action=signout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?action=destroy">simulate $_SESSION expiry</a>
</nav>