Ignore:
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.
Location:
Dev/branches/rest-dojo-ui/server
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r260 r263  
    1212use Tonic\Resource as Resource;
    1313
    14 function set_session_cookie($response,$user) {
     14function set_session_cookie($response, $user) {
    1515    $response->addHeader('Set-Cookie', 'rft_uid=' . $user->uid . '; Max-Age: 3600; Path=' . $response->request->baseUri);
    1616}
    … …  
    3131}
    3232
     33function add_default_headers($response) {
     34    $response->addHeader('Content-Type', 'application/json');
     35    $response->addHeader('Cache-Control', 'no-cache, must-revalidate');
     36    $response->addHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
     37}
     38
    3339/**
    3440 *  @uri /login
    … …  
    4147        $user = null;
    4248        $data = null;
    43         if ( !empty($request->data) ) {
    44             $data = json_decode($request->data,true);
     49        if (!empty($request->data)) {
     50            $data = json_decode($request->data, true);
    4551        }
    4652        if (!empty($data)) {
    … …  
    4955                throw new ResponseException("Incorrect username and password", Response::UNAUTHORIZED);
    5056            }
     57            set_session_cookie($response, $user);
    5158        } else {
    5259            $user = restore_session($response);
    … …  
    140147        $objects = $info['type']::get(array('uid' => $info['uid']));
    141148        if (empty($objects)) {
    142             throw new ReponseException("Object not found", Response::NOTFOUND);
     149            throw new ResponseException("Object not found", Response::NOTFOUND);
    143150        }
    144151
    … …  
    195202    $request->baseUri = $baseUri;
    196203}
     204
    197205try {
    198206    $resource = $request->loadResource();
    … …  
    200208} catch (ResponseException $e) {
    201209    $response = $e->response($request);
    202 }
    203 $response->addHeader('Content-Type', 'application/json');
    204 $response->addHeader('Cache-Control', 'no-cache, must-revalidate');
    205 $response->addHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT');
     210    $response->body = json_encode(array('errorMsg' => $response->body));
     211} catch (Exception $e) {
     212    $response = new Response($request);
     213    $response->code = Response::INTERNALSERVERERROR;
     214    $response->body = json_encode(array('errorMsg' => "Unhandled exception: " . $e));
     215}
     216add_default_headers($response);
    206217$response->output();
    207218?>

  • Dev/branches/rest-dojo-ui/server/classes/models/Answer.php

    r256 r263  
    112112                //TODO: Decide how to fix invalid references graciously.
    113113                if(!$this->evaluate())
    114                         return false;
     114                        throw new Exception('Evaluation failed.');
    115115
    116116                //Ensure the required folder exists.

  • Dev/branches/rest-dojo-ui/server/classes/models/AnswerSet.php

    r256 r263  
    8484                //TODO: Decide how to fix invalid references graciously.
    8585                if(!$this->evaluate())
    86                         return false;
    87                 //Ensure the required folder exists.
     86                        throw new Exception('Evaluation failed.');
     87
     88        //Ensure the required folder exists.
    8889                if(!is_dir('data/results/'))
    8990                        mkdir('data/results/');

  • Dev/branches/rest-dojo-ui/server/classes/models/ApplicationInstance.php

    r256 r263  
    7676                //Do note save if there are invalid references in this object.
    7777                if(!$this->evaluate())
    78                         return false;
     78                        throw new Exception('Evaluation failed.');
    7979
    8080                //Ensure the required folder exists.

  • Dev/branches/rest-dojo-ui/server/classes/models/ResultSet.php

    r256 r263  
    7272                //TODO: Decide how to fix invalid references graciously.
    7373                if(!$this->evaluate())
    74                         return false;
    75                 //Ensure the required folder exists.
     74                        throw new Exception('Evaluation failed.');
     75
     76        //Ensure the required folder exists.
    7677                if(!is_dir('data/results/'))
    7778                        mkdir('data/results/');

  • Dev/branches/rest-dojo-ui/server/classes/models/Session.php

    r256 r263  
    8282                //TODO: Decide how to fix invalid references graciously.
    8383                if(!$this->evaluate())
    84                         return false;
     84                        throw new Exception('Evaluation failed.');
    8585
    8686                //Ensure the required folder exists.

  • Dev/branches/rest-dojo-ui/server/classes/models/SessionInstance.php

    r256 r263  
    9595                //TODO: Decide how to fix invalid references graciously.
    9696                if(!$this->evaluate())
    97                         return false;
     97                        throw new Exception('Evaluation failed.');
    9898
    9999                //Ensure the required folder exists.

  • Dev/branches/rest-dojo-ui/server/classes/models/Survey.php

    r256 r263  
    6565                //TODO: Decide how to fix invalid references graciously.
    6666                if(!$this->evaluate())
    67                         return false;
     67                        throw new Exception('Evaluation failed.');
    6868
    6969                if(!is_dir('data/surveys/'))

  • Dev/branches/rest-dojo-ui/server/data/sessions/sessions.rdf

    r256 r263  
    1212   <ns1:uid>8eda00ead3b9770a54678c63110e5572</ns1:uid>
    1313   <ns1:title><![CDATA[]]></ns1:title>
    14    <ns1:creator>525f949e2cce1ebc964f89fba2826ab9</ns1:creator>
     14   <ns1:creator>49a9d2d8643b66e5fa0e8f6b7b51a9f3</ns1:creator>
    1515   <ns1:creationdate>1328711521</ns1:creationdate>
    1616</rdf:Description>
    … …  
    2020   <ns1:uid>d8b94990fbc59320c4cc0a409a4368a5</ns1:uid>
    2121   <ns1:title><![CDATA[]]></ns1:title>
    22    <ns1:creator>525f949e2cce1ebc964f89fba2826ab9</ns1:creator>
     22   <ns1:creator>49a9d2d8643b66e5fa0e8f6b7b51a9f3</ns1:creator>
    2323   <ns1:creationdate>1328714755</ns1:creationdate>
    2424</rdf:Description>
    … …  
    2828   <ns1:uid>d40c12ae47d52a97b1d0d009890bc1bc</ns1:uid>
    2929   <ns1:title>My session (for real)</ns1:title>
    30    <ns1:creator>525f949e2cce1ebc964f89fba2826ab9</ns1:creator>
     30   <ns1:creator>49a9d2d8643b66e5fa0e8f6b7b51a9f3</ns1:creator>
    3131   <ns1:creationdate>1328714890</ns1:creationdate>
    3232</rdf:Description>
    … …  
    3636   <ns1:uid>c765e10335f7f6bc1670eb8ebf83f08c</ns1:uid>
    3737   <ns1:title>Name...</ns1:title>
    38    <ns1:creator>525f949e2cce1ebc964f89fba2826ab9</ns1:creator>
     38   <ns1:creator>49a9d2d8643b66e5fa0e8f6b7b51a9f3</ns1:creator>
    3939   <ns1:creationdate>1328715256</ns1:creationdate>
    4040</rdf:Description>

  • Dev/branches/rest-dojo-ui/server/data/users/users.rdf

    r256 r263  
    1515</rdf:Description>
    1616
    17 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/150fe83c17857e833a921ddf50caf882">
    18    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    19    <ns1:uid>150fe83c17857e833a921ddf50caf882</ns1:uid>
    20    <ns1:email><![CDATA[]]></ns1:email>
    21    <ns1:password>noot</ns1:password>
    22 </rdf:Description>
    23 
    24 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/63ef7c9bbfaaa46d6517f227cde4d1eb">
    25    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    26    <ns1:uid>63ef7c9bbfaaa46d6517f227cde4d1eb</ns1:uid>
    27    <ns1:email><![CDATA[]]></ns1:email>
    28    <ns1:password>noot</ns1:password>
    29 </rdf:Description>
    30 
    31 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/5fa5ca4f64bfbf843313ca1ce08630e5">
    32    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    33    <ns1:uid>5fa5ca4f64bfbf843313ca1ce08630e5</ns1:uid>
    34    <ns1:email>noot</ns1:email>
    35    <ns1:password>noot</ns1:password>
    36 </rdf:Description>
    37 
    38 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/f9978056e4df42aad84a7003a4eb770e">
    39    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    40    <ns1:uid>f9978056e4df42aad84a7003a4eb770e</ns1:uid>
    41    <ns1:email>noot</ns1:email>
    42    <ns1:password>noot</ns1:password>
    43 </rdf:Description>
    44 
    45 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/0bfe935a03efd12363d0321b485ad6ce">
    46    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    47    <ns1:uid>0bfe935a03efd12363d0321b485ad6ce</ns1:uid>
    48    <ns1:email>noot</ns1:email>
    49    <ns1:password>noot</ns1:password>
    50 </rdf:Description>
    51 
    52 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/1f9d2dc28329bd7ae2e426676bf3a6f3">
    53    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    54    <ns1:uid>1f9d2dc28329bd7ae2e426676bf3a6f3</ns1:uid>
    55    <ns1:email>noot</ns1:email>
    56    <ns1:password>noot</ns1:password>
    57 </rdf:Description>
    58 
    59 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/20be613d2b8590d7565e47b1c712b548">
    60    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    61    <ns1:uid>20be613d2b8590d7565e47b1c712b548</ns1:uid>
    62    <ns1:email>noot</ns1:email>
    63    <ns1:password>noot</ns1:password>
    64 </rdf:Description>
    65 
    66 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/2578f4174ea728ed9a0b4cc0d91c661a">
    67    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    68    <ns1:uid>2578f4174ea728ed9a0b4cc0d91c661a</ns1:uid>
    69    <ns1:email>wim</ns1:email>
    70    <ns1:password>noot</ns1:password>
    71 </rdf:Description>
    72 
    73 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/fd135ec93f7566a7a9cad338a219f13f">
    74    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    75    <ns1:uid>fd135ec93f7566a7a9cad338a219f13f</ns1:uid>
    76    <ns1:email>mies</ns1:email>
    77    <ns1:password>noot</ns1:password>
    78 </rdf:Description>
    79 
    80 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/5df5871a812dedab6cdc4ce8a3bd6113">
    81    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    82    <ns1:uid>5df5871a812dedab6cdc4ce8a3bd6113</ns1:uid>
    83    <ns1:email>mies</ns1:email>
    84    <ns1:password>noot</ns1:password>
    85 </rdf:Description>
    86 
    87 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/6f2563b665865a2a885491f0599e0462">
    88    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    89    <ns1:uid>6f2563b665865a2a885491f0599e0462</ns1:uid>
    90    <ns1:email>wim</ns1:email>
    91    <ns1:password>noot</ns1:password>
    92 </rdf:Description>
    93 
    94 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/905628f99785ee2a7f15bbd76ed8f2b8">
    95    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    96    <ns1:uid>905628f99785ee2a7f15bbd76ed8f2b8</ns1:uid>
    97    <ns1:email>teun</ns1:email>
    98    <ns1:password>noot</ns1:password>
    99 </rdf:Description>
    100 
    101 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/4d89d76fea260fd7794a25a4156eb7d5">
    102    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    103    <ns1:uid>4d89d76fea260fd7794a25a4156eb7d5</ns1:uid>
    104    <ns1:email>teun</ns1:email>
    105    <ns1:password>noot</ns1:password>
    106 </rdf:Description>
    107 
    108 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/1a33469e005d3dde1bcdabbed2011a17">
    109    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    110    <ns1:uid>1a33469e005d3dde1bcdabbed2011a17</ns1:uid>
    111    <ns1:email>teun</ns1:email>
    112    <ns1:password>noot</ns1:password>
    113 </rdf:Description>
    114 
    115 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/f29a3d47f398ac48188fa7b3180c8aa6">
    116    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    117    <ns1:uid>f29a3d47f398ac48188fa7b3180c8aa6</ns1:uid>
    118    <ns1:email>teun</ns1:email>
    119    <ns1:password>noot</ns1:password>
    120 </rdf:Description>
    121 
    122 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/f58b9e3942d793cf7ada3cf36cd3a4de">
    123    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    124    <ns1:uid>f58b9e3942d793cf7ada3cf36cd3a4de</ns1:uid>
    125    <ns1:email>teun</ns1:email>
    126    <ns1:password>noot</ns1:password>
    127 </rdf:Description>
    128 
    129 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/f2dbe7ca68844c186ec1a348330640b5">
    130    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    131    <ns1:uid>f2dbe7ca68844c186ec1a348330640b5</ns1:uid>
    132    <ns1:email>vuur</ns1:email>
    133    <ns1:password>noot</ns1:password>
    134 </rdf:Description>
    135 
    136 <rdf:Description rdf:about="http://tbm.tudelft.nl/researchtool/resources/user/0cc6b4db5454824c15b02c7c27c944c1">
    137    <ns1:resource_type rdf:resource="http://tbm.tudelft.nl/researchtool/resources/user"/>
    138    <ns1:uid>0cc6b4db5454824c15b02c7c27c944c1</ns1:uid>
    139    <ns1:email>vuur</ns1:email>
    140    <ns1:password>noot</ns1:password>
    141 </rdf:Description>
    142 
    14317</rdf:RDF>
Note: See TracChangeset for help on using the changeset viewer.