Merge pull request #6 from pdsinterop/feature/user-tests

Add unit tests for the 'User' class.
Introduces the Session class for basic session handling.
Move www/profile/index.php to www/user/profile.php to let the filenames make more sense

Author: ylebre

TODO

@@ -65,13 +65,14 @@
 - [v] IpAttempts
 - [v] Util
 - [v] PasswordValidator
+- [v] User
 - [ ] Mailer
 - [ ] MailTemplateGenerator
 - [ ] MailTemplates
 - [ ] Server
-- [ ] SolidNotifications
-- [ ] SolidPubSub
 - [ ] StorageServer
-- [ ] User
+- [-] Session
+- [-] SolidNotifications
+- [-] SolidPubSub
 - [-] Middleware
 - [-] Db

docker/solid.conf

@@ -20,7 +20,7 @@
 <VirtualHost *:443>
         ServerName identity.solid.local
 	ServerAlias *.solid.local
-        DocumentRoot /opt/solid/www/profile
+        DocumentRoot /opt/solid/www/user
 
 	SSLEngine on
 	SSLCertificateFile      /etc/ssl/certs/ssl-cert-snakeoil.pem
@@ -39,7 +39,7 @@
 	RewriteCond %{HTTP_HOST} ^id-([a-zA-Z0-9-]+)\.solid\.local$ [NC]
 	# Example rewrite rule based on the first part of the hostname
 	# This will redirect to /subdomain-content/first_part_of_hostname
-	RewriteRule ^(.+)$ index.php [QSA,L]
+	RewriteRule ^(.+)$ profile.php [QSA,L]
 
 	# Extract the first part of the subdomain (before the first dot)
 	RewriteCond %{HTTP_HOST} ^storage-([a-zA-Z0-9-]+)\.solid\.local$ [NC]

lib/Session.php

@@ -0,0 +1,20 @@
+<?php
+	namespace Pdsinterop\PhpSolid;
+
+	class Session {
+		private $cookieLifetime = 24*60*60;
+		public static function start($username) {
+			session_start([
+				'cookie_lifetime' => 24*60*60 // 1 day
+			]);
+			$_SESSION['username'] = $username;
+		}
+		
+		public static function getLoggedInUser() {
+			session_start();
+			if (!isset($_SESSION['username'])) {
+				return false;
+			}
+			return $_SESSION['username'];
+		}
+	}

lib/User.php

@@ -178,7 +178,7 @@ public static function getStorage($userId) {
 		public static function setStorage($userId, $storageUrl) {
 			Db::connect();
 			$query = Db::$pdo->prepare(
-				'INSERT OR REPLACE INTO storage VALUES(:userId, :storageUrl)'
+				'INSERT OR REPLACE INTO userStorage VALUES(:userId, :storageUrl)'
 			);
 			$query->execute([
 				':userId' => $userId,
@@ -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'
@@ -247,24 +250,12 @@ public static function checkPassword($email, $password) {
 			$result = $query->fetchAll();
 			if (sizeof($result) === 1) {
 				if (password_verify($password, $result[0]['password'])) {
-					session_start([
-						'cookie_lifetime' => 24*60*60 // 1 day
-					]);
-					$_SESSION['username'] = $email;
 					return true;
 				}
 			}
 			return false;
 		}
 
-		public static function getLoggedInUser() {
-			session_start();
-			if (!isset($_SESSION['username'])) {
-				return false;
-			}
-			return self::getUser($_SESSION['username']);
-		}
-
 		public static function userIdExists($userId) {
 			Db::connect();
 			$query = Db::$pdo->prepare(