yuan/E-learning-Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix API Login

Browse Source
This commit is contained in:
Yuan Chiu 2014-11-25 19:04:20 +08:00
parent 555b3ebbeb
commit 265cf68540
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/api/v2/index.php
View File

@ -218,7 +218,7 @@ $app->group('/users', 'APIrequest', function () use ($app, $app_template) {
); );
// 顯示建立成功 // 顯示建立成功
$app->render(200,array( $app->render(201,array(
'user_id' => $user_id, 'user_id' => $user_id,
'group_id' => $group_id, 'group_id' => $group_id,
'class_id' => $class_id, 'class_id' => $class_id,
@ -344,7 +344,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$user_id = $session->getUserId($token); $user_id = $session->getUserId($token);
$session->logout($token); $session->logout($token);
$app->render(201,array( $app->render(204,array(
'token' => $token, 'token' => $token,
'user_id' => $user_id, 'user_id' => $user_id,
'error' => false, 'error' => false,
@ -374,7 +374,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$logoutTotal = $session->logoutOtherSession($token); $logoutTotal = $session->logoutOtherSession($token);
$inLoginTotal = $session->getCurrentLoginTotalByUserId($user_id); $inLoginTotal = $session->getCurrentLoginTotalByUserId($user_id);
$app->render(201,array( $app->render(204,array(
'token' => $token, 'token' => $token,
'user_id' => $user_id, 'user_id' => $user_id,
'logout_total' => $logoutTotal, 'logout_total' => $logoutTotal,
@ -408,30 +408,25 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$studyMgr = new Study\StudyActivityManager(); $studyMgr = new Study\StudyActivityManager();
$studyList = $studyMgr->getEnableActivityByUserId($user_id); $studyList = $studyMgr->getEnableActivityByUserId($user_id);
// TODO: $studyList 分離重新包裝陣列
$app->render(200,array( $app->render(200,array(
'token' => $token, 'token' => $token,
'user_id' => $user_id, 'user_id' => $user_id,
'enable_study' => array( 'enable_study' => $studyList,
$studyList
),
'error' => false, 'error' => false,
'msg' => '\''.$user_id.'\' other session is logout.',
'msg_cht' => '\''.$user_id.'\'此登入階段之外的皆已登出'
)); ));
} }
catch (Exception\LoginTokenNoFoundException $e) { catch (Exception\LoginTokenNoFoundException $e) {
$app->render(404,array( $app->render(404,array(
'token' => $token, 'token' => $token,
'error' => true, 'error' => true,
'msg' => 'No \''.$token.'\' session. Please login again.',
'msg_cht' => '沒有\''.$token.'\'登入階段，請重新登入'
)); ));
} }
}); });
/* /*
* 開始進行一場學習活動 * 開始進行一場學習活動
* GET http://localhost/api/v2/tokens/{登入Token}/Activity * POST http://localhost/api/v2/tokens/{登入Token}/Activity
*/ */
$app->post('/:token/activity', function ($token) use ($app) { $app->post('/:token/activity', function ($token) use ($app) {
// TODO: 開始進行一場學習活動 // TODO: 開始進行一場學習活動