Changeset 285 for Dev/branches/jos-branch/server/api.php

Timestamp:

02/24/12 10:03:02 (13 years ago)

Author:

jkraaijeveld

Message:

Merge from rest-dojo-ui 272-282

File:

• Dev/branches/jos-branch/server/api.php (modified) (9 diffs)

Dev/branches/jos-branch/server/api.php

@@ -46 +46 @@
 
         $user = null;
-        $data = null;
         if (!empty($request->data)) {
-            $data = json_decode($request->data, true);
-        }
-        if (!empty($data)) {
-            $user = Auth::login($data['username'], sha1($data['password']));
+            $user = Auth::login($request->data['email'], $request->data['password']);
             if (!$user) {
-                throw new ResponseException("Incorrect username and password", Response::UNAUTHORIZED);
+                throw new ResponseException("Incorrect email and password", Response::UNAUTHORIZED);
             }
             set_session_cookie($response, $user);
@@ -59 +55 @@
             $user = restore_session($response);
         }
-        $response->body = json_encode($user);
+        $response->body = $user;
+        return $response;
+    }
+
+}
+
+/**
+ *  @uri /register
+ */
+class RegisterResource extends Resource {
+
+    function post($request) {
+        $response = new Response($request);
+
+        $user = null;
+        if (!empty($request->data)) {
+            $user = Auth::register($request->data['email'], $request->data['password']);
+            set_session_cookie($response, $user);
+        } else {
+            throw new ResponseException("No email and password provided.",Response::BADREQUEST);
+        }
+        $response->body = $user;
         return $response;
     }
@@ -83 +100 @@
         $type = $this->getType($request);
         $objects = $type::get(array());
-        //$objects = array_map(function($val) { return array('uid' => $val->uid); }, $objects);
-
-        $response->body = json_encode($objects);
+
+        $response->body = $objects;
         return $response;
     }
@@ -94 +110 @@
 
         $type = $this->getType($request);
-        $data = json_decode($request->data);
         $onlyAdd = $request->ifNoneMatch('*');
         $onlyUpdate = $request->ifMatch('*');
 
         $object = FALSE;
-        if (isset($data->uid)) {
-            $objects = $type::get(array('uid' => $data->uid));
+        if (isset($request->data->uid)) {
+            $objects = $type::get(array('uid' => $request->data->uid));
             if (!empty($objects)) {
                 $object = $objects[0];
@@ -116 +131 @@
             $response->code = Response::OK;
         }
-        foreach ($data as $key => $val) {
+        foreach ($request->data as $key => $val) {
             $object->$key = $val;
         }
-        $object->save();
-
-        $response->body = json_encode($object);
-        return $response;
-    }
-
+        if (!$object->save()) {
+            throw new ResponseException("Save failed", Response::INTERNALSERVERERROR);
+        }
+
+        $response->body = $object;
+        return $response;
+    }
+
+    function put($request) {
+        return $this->post($request);
+    }
+    
 }
 
@@ -150 +171 @@
         }
 
-        $response->body = json_encode($objects[0]);
-        return $response;
-    }
-
-    function put($request) {
+        $response->body = $objects[0];
+        return $response;
+    }
+
+    function post($request) {
         $response = new Response($request);
         restore_session($response);
 
         $info = $this->getTypeAndUid($request);
-        $data = json_decode($request->data);
         $onlyAdd = $request->ifNoneMatch('*');
         $onlyUpdate = $request->ifMatch('*');
@@ -179 +199 @@
             $response->code = Response::OK;
         }
-        foreach ($data as $key => $val) {
+        foreach ($request->data as $key => $val) {
             $object->$key = $val;
         }
-        $object->save();
-
-        $response->body = json_encode($object);
-        return $response;
+        if (!$object->save()) {
+            throw new ResponseException("Save failed", Response::INTERNALSERVERERROR);
+        }
+
+        $response->body = $object;
+        return $response;
+    }
+
+    function put($request) {
+        return $this->post($request);
     }
 
     function delete($request) {
-        restore_session();
+        restore_session(new Response($request));
         throw new ReponseException("Delete not implemented", Response::METHODNOTALLOWED);
     }
@@ -202 +228 @@
     $request->baseUri = $baseUri;
 }
-
+$request->data = Marshaller::unmarshall(json_decode($request->data));
 try {
     $resource = $request->loadResource();
@@ -208 +234 @@
 } catch (ResponseException $e) {
     $response = $e->response($request);
-    $response->body = json_encode(array('errorMsg' => $response->body));
+    $response->body = array('errorMsg' => $response->body);
 } catch (Exception $e) {
     $response = new Response($request);
     $response->code = Response::INTERNALSERVERERROR;
-    $response->body = json_encode(array('errorMsg' => "Unhandled exception: " . $e));
+    $response->body = array('errorMsg' => "Unhandled exception: " . $e);
 }
 add_default_headers($response);
+$response->body = json_encode(Marshaller::marshall($response->body));
 $response->output();
+
 ?>