From b86677cb9a5d953c7b111719e3ed60173d65cf0c Mon Sep 17 00:00:00 2001 From: Yuan Chiu Date: Tue, 25 Nov 2014 20:23:27 +0800 Subject: [PATCH] api add: login add login_time field --- htdocs/api/v2/index.php | 6 ++++-- htdocs/lib/User/UserSession.php | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/api/v2/index.php b/htdocs/api/v2/index.php index 3e7a011..bbbb7db 100644 --- a/htdocs/api/v2/index.php +++ b/htdocs/api/v2/index.php @@ -72,6 +72,7 @@ function login($user_id = null) { $session = new User\UserSession(); $loginToken = $session->login($user_id, $password, $browser); $user = $session->getUser($loginToken); + $sessionInfo = $session->getTokenInfo($loginToken); $app->render(201,array( 'user_id' => $user_id, @@ -95,9 +96,10 @@ function login($user_id = null) { 'email' => $user->getEmail(), 'memo' => $user->getMemo(), ), + 'login_time' => $sessionInfo['login_date'], 'error' => false, - 'msg' => '\''.$user_id.'\' is logined', - 'msg_cht' => '\''.$user_id.'\'使用者已登入' + 'msg' => '\''.$user_id.'\' is logined', + 'msg_cht' => '\''.$user_id.'\'使用者已登入' )); } catch (Exception\UserNoFoundException $e) { diff --git a/htdocs/lib/User/UserSession.php b/htdocs/lib/User/UserSession.php index 242835f..e1058fa 100644 --- a/htdocs/lib/User/UserSession.php +++ b/htdocs/lib/User/UserSession.php @@ -213,7 +213,10 @@ class UserSession { * @since 2.0.0 */ public function getTokenInfo($token) { - // TODO: 取得登入資訊 + $db = new Database\DBUserSession(); + $sessionArray = $db->queryByToken($token); + if(isset($sessionArray)) return $sessionArray; + else throw new Exception\LoginTokenNoFoundException($token); } // ========================================================================