get user from session

Author: ylebre

lib/Session.php

@@ -7,14 +7,14 @@ public static function start($username) {
 			session_start([
 				'cookie_lifetime' => 24*60*60 // 1 day
 			]);
-			$_SESSION['username'] = $email;
+			$_SESSION['username'] = $username;
 		}
 
 		public static function getLoggedInUser() {
 			session_start();
 			if (!isset($_SESSION['username'])) {
 				return false;
 			}
-			return self::getUser($_SESSION['username']);
+			return $_SESSION['username'];
 		}
 	}

lib/User.php

@@ -187,6 +187,9 @@ public static function setStorage($userId, $storageUrl) {
 		}
 
 		public static function getUser($email) {
+			if (!isset($email)) {
+				return false;
+			}
 			Db::connect();
 			$query = Db::$pdo->prepare(
 				'SELECT user_id, data FROM users WHERE email=:email'

www/idp/index.php

@@ -37,7 +37,7 @@
 				break;
 				case "/authorize":
 				case "/authorize/":
-					$user = Session::getLoggedInUser();
+					$user = User::getUser(Session::getLoggedInUser());
 					if (!$user) {
 						header("Location: /login/?redirect_uri=" . urlencode($_SERVER['REQUEST_URI']));
 						exit();
@@ -125,7 +125,7 @@
 				break;
 				case "/dashboard":
 				case "/dashboard/":
-					$user = Session::getLoggedInUser();
+					$user = User::getUser(Session::getLoggedInUser());
 					if (!$user) {
 						header("Location: /login/");
 						exit();
@@ -134,7 +134,7 @@
 				break;
 				case "/logout":
 				case "/logout/":
-					$user = Session::getLoggedInUser();
+					$user = User::getUser(Session::getLoggedInUser());
 					if ($user) {
 						session_destroy();
 					}
@@ -162,7 +162,7 @@
 				break;
 				case "/sharing":
 				case "/sharing/":
-					$user = Session::getLoggedInUser();
+					$user = User::getUser(Session::getLoggedInUser());
 					if (!$user) {
 						header("Location: /login/");
 						exit();
@@ -368,7 +368,7 @@
 				break;
 				case "/api/sharing":
 				case "/api/sharing/":
-					$user = Session::getLoggedInUser();
+					$user = User::getUser(Session::getLoggedInUser());
 					if (!$user) {
 						header("HTTP/1.1 400 Bad request");
 					} else {