Changeset 274 for Dev/branches/rest-dojo-ui/server/classes/Auth.php

Timestamp:

02/20/12 16:27:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Moved pages in subtree of rft/, allowing controllers next to them.
• [Client] Created questions page, gives overview and allows adding.
• [Client] Page controllers inherit from _Page, because the previous mechanism w

asn't working.

• [Client] Added new user registration.
• [Server] Changed user passwords to passwordHash/passwordSalt combination.
• [Server] Added simple object marshalling and unmarshalling to preserve types.
• [Server] Added ResearchToolObjectInterface? with static create() method. Implemented for all model classes.

File:

• Dev/branches/rest-dojo-ui/server/classes/Auth.php (modified) (1 diff)

Dev/branches/rest-dojo-ui/server/classes/Auth.php

@@ -5 +5 @@
 class Auth {
 
-    public static function login($username, $password) {
-        $user_results = User::get(array("name" => $username));
-        if (!empty($user_results)) {
-            $user = $user_results[0];
-            if (sha1($password) == $user->password) {
-                return $user;
-            }
+    public static function register($email, $password) {
+        $user_results = User::get(array("email" => $email));
+        if ( !empty($user_results) ) {
+            throw new Exception("User with email $email already exists.");
         }
-        return false;
+        $salt = rand();
+        $user = new User(null,$email,sha1($password.$salt),$salt);
+        $user->save();
+        return $user;
+    }
+    
+    public static function login($email, $password) {
+        $user_results = User::get(array("email" => $email));
+        if (empty($user_results)) {
+            throw new Exception("User with email $email not found.");
+        }
+        $user = $user_results[0];
+        if (sha1($password.$user->passwordSalt) != $user->passwordHash) {
+            throw new Exception("Wrong password.");
+        }
+        return $user;
     }
 
     public static function restore($session) {
         $user_results = User::get(array("uid" => $session));
-        if (!empty($user_results)) {
-            return $user_results[0];
+        if (empty($user_results)) {
+            throw new Exception("Session with id $session not found.");
         }
-        return false;
+        return $user_results[0];
     }