Merge pull request #330 from orvice/dev

add api

app/Controllers/ApiController.php

@@ -3,14 +3,96 @@
 namespace App\Controllers;
 
 use App\Models\InviteCode;
-use App\Models\Node;
-
+use App\Models\Node,App\Models\User;
+use App\Services\Factory;
+use App\Utils\Tools,App\Utils\Hash,App\Utils\Helper;
 /**
  *  ApiController
  */
 
 class ApiController extends BaseController
 {
 
+    public function index(){
+
+    }
+
+    public function token($request, $response, $args){
+        $accessToken = $id = $args['token'];
+        $storage = Factory::createTokenStorage();
+        $token = $storage->get($accessToken);
+        if ($token==null){
+            $res['ret'] = 0;
+            $res['msg'] = "token is null";
+            return $this->echoJson($response,$res);
+        }
+        $res['ret'] = 1;
+        $res['msg'] = "ok";
+        $res['data'] = $token;
+        return $this->echoJson($response,$res);
+    }
+
+    public function newToken($request, $response, $args){
+        // $data = $request->post('sdf');
+        $email =  $request->getParam('email');
+        $email = strtolower($email);
+        $passwd = $request->getParam('passwd');
+
+        // Handle Login
+        $user = User::where('email','=',$email)->first();
+
+        if ($user == null){
+            $res['ret'] = 0;
+            $res['msg'] = "401 邮箱或者密码错误";
+            return $this->echoJson($response,$res);
+        }
+
+        if (!Hash::checkPassword($user->pass,$passwd)){
+            $res['ret'] = 0;
+            $res['msg'] = "402 邮箱或者密码错误";
+            return $this->echoJson($response,$res);
+        }
+        $tokenStr = Tools::genToken();
+        $storage = Factory::createTokenStorage();
+        $expireTime = time() + 3600*24*7;
+        if($storage->store($tokenStr,$user,$expireTime)){
+            $res['ret'] = 1;
+            $res['msg'] = "ok";
+            $res['data']['token'] = $tokenStr;
+            $res['data']['user_id'] = $user->id;
+            return $this->echoJson($response,$res);
+        }
+        $res['ret'] = 0;
+        $res['msg'] = "system error";
+        return $this->echoJson($response,$res);
+    }
+
+    public function node($request, $response, $args){
+        $nodes = Node::where('type',1)->orderBy('sort')->get();
+        $res['ret'] = 1;
+        $res['msg'] = "ok";
+        $res['data'] = $nodes;
+        return $this->echoJson($response,$res);
+    }
+
+    public function userInfo($request, $response, $args){
+        $id = $args['id'];
+        $accessToken = Helper::getTokenFromReq($request);
+        $storage = Factory::createTokenStorage();
+        $token = $storage->get($accessToken);
+        if($id != $token->userId){
+            $res['ret'] = 0;
+            $res['msg'] = "access denied";
+            return $this->echoJson($response,$res);
+        }
+        $user = User::find($token->userId);
+        $user->pass = null;
+        $data = $user;
+        $res['ret'] = 1;
+        $res['msg'] = "ok";
+        $res['data'] = $data;
+        return $this->echoJson($response,$res);
+
+    }
 
 }

app/Controllers/AuthController.php

@@ -25,7 +25,7 @@ public function login()
         return $this->view()->display('auth/login.tpl');
     }
 
-    public function loginHandle($request, $response, $next)
+    public function loginHandle($request, $response, $args)
     {
         // $data = $request->post('sdf');
         $email =  $request->getParam('email');
@@ -42,7 +42,7 @@ public function loginHandle($request, $response, $next)
             return $response->getBody()->write(json_encode($rs));
         }
 
-        if ($user->pass != Hash::passwordHash($passwd)){
+        if (!Hash::checkPassword($user->pass,$passwd)){
             $rs['ret'] = 0;
             $rs['msg'] = "402 邮箱或者密码错误";
             return $response->getBody()->write(json_encode($rs));
@@ -60,7 +60,7 @@ public function loginHandle($request, $response, $next)
 
     public function register($request, $response, $next)
     {
-         $ary = $request->getQueryParams();
+        $ary = $request->getQueryParams();
         $code = "";
         if(isset($ary['code'])){
             $code = $ary['code'];

app/Controllers/BaseController.php

@@ -31,7 +31,12 @@ public function view(){
         return $this->smarty();
     }
 
-    public function echoJson(){
-
+    /**
+     * @param $response
+     * @param $res
+     * @return mixed
+     */
+    public function echoJson($response,$res){
+        return $response->getBody()->write(json_encode($res));
     }
 }

app/Controllers/UserController.php

@@ -4,7 +4,6 @@
 
 use App\Models\InviteCode;
 use App\Services\Auth;
-use App\Models\User;
 use App\Models\Node;
 use App\Services\Config;
 use App\Utils\Hash;
@@ -86,12 +85,11 @@ public function doInvite($request, $response, $args){
         $this->user->invite_num = 0;
         $this->user->save();
         $res['ret'] = 1;
-        return $response->getBody()->write(json_encode($res));
+        return $this->echoJson($response,$res);
     }
 
     public function sys(){
         return $this->view()->assign('ana',"")->display('user/sys.tpl');
-
     }
 
     public function updatePassword($request, $response, $args){
@@ -121,15 +119,15 @@ public function updatePassword($request, $response, $args){
 
         $res['ret'] = 1;
         $res['msg'] = "ok";
-        return $response->getBody()->write(json_encode($res));
+        return $this->echoJson($response,$res);
     }
 
     public function updateSsPwd($request, $response, $args){
         $user = Auth::getUser();
         $pwd =  $request->getParam('sspwd');
         $user->updateSsPwd($pwd);
         $res['ret'] = 1;
-        return $response->getBody()->write(json_encode($res));
+        return $this->echoJson($response,$res);
     }
 
     public function updateMethod($request, $response, $args){
@@ -138,7 +136,7 @@ public function updateMethod($request, $response, $args){
         $method = strtolower($method);
         $user->updateMethod($method);
         $res['ret'] = 1;
-        return $response->getBody()->write(json_encode($res));
+        return $this->echoJson($response,$res);
     }
 
     public function logout($request, $response, $args){
@@ -159,8 +157,27 @@ public function doCheckIn($request, $response, $args){
         $this->user->save();
         $res['msg'] = sprintf("获得了 %u MB流量.",$traffic);
         $res['ret'] = 1;
-        return $response->getBody()->write(json_encode($res));
+        return $this->echoJson($response,$res);
     }
 
+    public function kill($request, $response, $args){
+        return $this->view()->display('user/kill.tpl');
+    }
 
+    public function handleKill($request, $response, $args){
+        $user = Auth::getUser();
+        $passwd =  $request->getParam('passwd');
+        // check passwd
+        $res = array();
+        if (!Hash::checkPassword($user->pass,$passwd)){
+            $res['ret'] = 0;
+            $res['msg'] = " 密码错误";
+            return $this->echoJson($response,$res);
+        }
+        Auth::logout();
+        $user->delete();
+        $res['ret'] = 1;
+        $res['msg'] = "GG!您的帐号已经从我们的系统中删除.";
+        return $this->echoJson($response,$res);
+    }
 }

app/Middleware/Api.php

@@ -4,21 +4,36 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use App\Services\Auth as AuthService;
+use App\Services\Factory;
+use App\Utils\Helper;
 
-class Api{
+class Api
+{
 
     public function __invoke(ServerRequestInterface $request,ResponseInterface $response, $next)
     {
-        //$response->getBody()->write('BEFORE');
-        $user = AuthService::getUser();
-        if(!$user->isLogin){
-            // @TODO no login action
-            $response->getBody()->write('Access Denied');
+        $accessToken = Helper::getTokenFromReq($request);
+        if ($accessToken==null){
+            $res['ret'] = 0;
+            $res['msg'] = "token is null";
+            $response->getBody()->write(json_encode($res));
+            return $response;
+        }
+        $storage = Factory::createTokenStorage();
+        $token = $storage->get($accessToken);
+        if ($token==null){
+            $res['ret'] = 0;
+            $res['msg'] = "token is null";
+            $response->getBody()->write(json_encode($res));
+            return $response;
+        }
+        if ($token->expireTime < time()){
+            $res['ret'] = 0;
+            $res['msg'] = "token is expire";
+            $response->getBody()->write(json_encode($res));
             return $response;
         }
         $response = $next($request, $response);
-        //$response->getBody()->write('AFTER');
         return $response;
     }
 }

app/Models/Token.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+
+class Token extends Model
+{
+    protected $table = "user_token";
+}

app/Services/Auth.php

@@ -2,9 +2,6 @@
 
 namespace App\Services;
 
-use App\Services\Auth\Cookie;
-use App\Services\Auth\Redis;
-use App\Services\Auth\File;
 
 class Auth
 {
@@ -14,19 +11,8 @@ public function __construct(){
 
    }
 
-   public static  function getDriver(){
-
-       $method = Config::get('authDriver');
-
-       switch($method){
-           case 'cookie':
-               return new Cookie();
-               break;
-           case 'redis':
-               return new Redis();
-               break;
-       }
-       return new Redis();
+   private static  function getDriver(){
+       return Factory::createAuth();
    }
 
    public static function login($uid,$time){

app/Services/Auth/Base.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Services\Auth;
+
+
+abstract class Base
+{
+    abstract public function login($uid,$time);
+    abstract public function logout();
+    abstract public function getUser();
+}

app/Services/Auth/Cookie.php

@@ -7,7 +7,7 @@
 use App\Utils\Hash;
 
 
-class Cookie
+class Cookie extends Base
 {
     public  function login($uid,$time){
         $user = User::find($uid);
@@ -30,6 +30,7 @@ public  function getUser(){
 
         $user = User::find($uid);
         if ($user == null){
+            $user = new User();
             $user->isLogin = false;
             return $user;
         }

app/Services/Auth/JwtToken.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Services\Auth;
+
+use App\Utils;
+use App\Services\Jwt;
+
+class JwtToken extends Base
+{
+    public function login($uid, $time)
+    {
+        $expireTime = time() + $time;
+        $ary = [
+          "uid" => $uid,
+          "expire_time" => $expireTime
+        ];
+        $decode = Jwt::encode($ary);
+        Utils\Cookie::set([
+            //"uid" => $uid,
+            "token" => $decode
+        ],$expireTime);
+    }
+
+    public function logout()
+    {
+        Utils\Cookie::set([
+            //"uid" => $uid,
+            "token" => ""
+        ],time()-3600);
+    }
+
+    public function getUser()
+    {
+        $token = Utils\Cookie::get('token');
+        $tokenInfo = Jwt::decodeArray($token);
+    }
+}

app/Services/Auth/Redis.php

@@ -7,7 +7,7 @@
 use App\Utils\Tools;
 use App\Utils\Cookie;
 
-class Redis
+class Redis extends Base
 {
     private $client;
 
@@ -46,6 +46,7 @@ public  function getUser(){
         $uid = $value;
         $user =  User::find($uid);
         if($user == null ){
+            $user = new User();
             $user->isLogin = false;
             return $user;
         }