Changeset 263 for Dev/branches/rest-dojo-ui/server/api.php

Timestamp:

02/16/12 14:47:39 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Finished page framework. See rft/ui/content.js or test files for details.
• [Client] Allow login by pressing Enter.
• [API] On exception include details in json response.
• [Server Use Exceptions when save() fails, iso return values.

File:

• Dev/branches/rest-dojo-ui/server/api.php (modified) (7 diffs)

Dev/branches/rest-dojo-ui/server/api.php

@@ -12 +12 @@
 use Tonic\Resource as Resource;
 
-function set_session_cookie($response,$user) {
+function set_session_cookie($response, $user) {
     $response->addHeader('Set-Cookie', 'rft_uid=' . $user->uid . '; Max-Age: 3600; Path=' . $response->request->baseUri);
 }
@@ -31 +31 @@
 }
 
+function add_default_headers($response) {
+    $response->addHeader('Content-Type', 'application/json');
+    $response->addHeader('Cache-Control', 'no-cache, must-revalidate');
+    $response->addHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
+}
+
 /**
  *  @uri /login
@@ -41 +47 @@
         $user = null;
         $data = null;
-        if ( !empty($request->data) ) {
-            $data = json_decode($request->data,true);
+        if (!empty($request->data)) {
+            $data = json_decode($request->data, true);
         }
         if (!empty($data)) {
@@ -49 +55 @@
                 throw new ResponseException("Incorrect username and password", Response::UNAUTHORIZED);
             }
+            set_session_cookie($response, $user);
         } else {
             $user = restore_session($response);
@@ -140 +147 @@
         $objects = $info['type']::get(array('uid' => $info['uid']));
         if (empty($objects)) {
-            throw new ReponseException("Object not found", Response::NOTFOUND);
+            throw new ResponseException("Object not found", Response::NOTFOUND);
         }
 
@@ -195 +202 @@
     $request->baseUri = $baseUri;
 }
+
 try {
     $resource = $request->loadResource();
@@ -200 +208 @@
 } catch (ResponseException $e) {
     $response = $e->response($request);
-}
-$response->addHeader('Content-Type', 'application/json');
-$response->addHeader('Cache-Control', 'no-cache, must-revalidate');
-$response->addHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
+    $response->body = json_encode(array('errorMsg' => $response->body));
+} catch (Exception $e) {
+    $response = new Response($request);
+    $response->code = Response::INTERNALSERVERERROR;
+    $response->body = json_encode(array('errorMsg' => "Unhandled exception: " . $e));
+}
+add_default_headers($response);
 $response->output();
 ?>