auth

Author: luffyzhao

composer.json

@@ -6,6 +6,7 @@
         "illuminate/contracts": "^5.6.0",
         "illuminate/http": "^5.6.0",
         "illuminate/support": "^5.6.0",
+        "illuminate/redis": "^5.6.0",
         "lcobucci/jwt": "^3.2",
         "namshi/jose": "^7.0",
         "nesbot/carbon": "^1.0",
@@ -32,5 +33,11 @@
             "name": "luffyzhao",
             "email": "luffyzhao@vip.126.com"
         }
-    ]
+    ],
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://packagist.phpcomposer.com"
+        }
+    }
 }

src/Auths/Signer/SignerGuard.php

@@ -10,9 +10,9 @@
 
 
 use Illuminate\Auth\GuardHelpers;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\UserProvider;
-use LTools\Contracts\Signer\SignerInterface;
 
 class SignerGuard implements Guard
 {
@@ -90,13 +90,13 @@ public function validate(array $credentials = [])
     }
 
     /**
-     * @param SignerInterface $user
+     * @param Authenticatable $user
      *
      * @return bool|string
      */
-    public function login(SignerInterface $user)
+    public function login(Authenticatable $user)
     {
-        $token = $this->handle->fromUser($user);
+        $token = $this->handle->generate($user);
         $this->setUser($user);
 
         return $token;

src/Auths/Signer/TokenHandle.php

@@ -10,10 +10,10 @@
 
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;
-use Lcobucci\JWT\Builder;
 use LTools\Contracts\Signer\SignerInterface;
+use Illuminate\Support\Facades\Crypt;
 
 class TokenHandle
 {
@@ -24,37 +24,16 @@ class TokenHandle
      */
     protected $header = 'authorization';
 
-    /**
-     * 过期时间
-     *
-     * @var int
-     * @author luffyzhao@vip.126.com
-     */
-    protected $expired = 3600;
-
-    /**
-     * 生命周期
-     *
-     * @var int
-     * @author luffyzhao@vip.126.com
-     */
-    protected $ttl = 0;
-
     /**
      * @var Request
      * @author luffyzhao@vip.126.com
      */
     protected $request;
-    /**
-     * @var Builder
-     */
-    private $builder;
 
 
-    public function __construct(Request $request, Builder $builder)
+    public function __construct(Request $request)
     {
         $this->request = $request;
-        $this->builder = $builder;
     }
 
     /**
@@ -66,99 +45,40 @@ public function __construct(Request $request, Builder $builder)
      * @return bool|string
      * @author luffyzhao@vip.126.com
      */
-    public function fromUser(SignerInterface $user)
+    public function generate(SignerInterface $user): string
     {
-        $code = Str::random(5);
-        $now = time();
-
-        if($user->saveSignerCode($code)){
-            return $this->builder
-                ->setIssuer(Config::get('app.url'))
-                ->setId(Str::random(12), true)
-                ->setIssuedAt($now)
-                ->setNotBefore($now + Config::get('ltool.signer.nbf'))
-                ->setExpiration($now + Config::get('ltool.signer.exp'))
-                ->set('id', $user->getAuthIdentifier())
-                ->set('code', $code)
-                ->getToken();
-        }
+        return $this->tokenString($user);
     }
 
-    /**
-     * 尝试从请求头解析token
-     * @method parse
-     *
-     * @return mixed
-     * @author luffyzhao@vip.126.com
-     */
-    protected function parse()
-    {
-        return $this->request->headers->get($this->header)
-            ?: $this->fromAltHeaders();
-    }
 
     /**
-     * 试图从某些其他可能的报头解析 token
-     * @method fromAltHeaders
-     *
-     * @return mixed
+     * tokenString
+     * @param SignerInterface $user
      * @author luffyzhao@vip.126.com
-     */
-    protected function fromAltHeaders()
-    {
-        return $this->request->server->get('HTTP_AUTHORIZATION')
-            ?: $this->request->server->get(
-                'REDIRECT_HTTP_AUTHORIZATION'
-            );
-    }
-
-    /**
      * @return string
      */
-    public function getHeader(): string
+    protected function tokenString(SignerInterface $user): string
     {
-        return $this->header;
-    }
 
-    /**
-     * @param string $header
-     */
-    public function setHeader(string $header)
-    {
-        $this->header = $header;
-    }
+        $code = $this->getRedisString();
 
-    /**
-     * @return int
-     */
-    public function getExpired(): int
-    {
-        return $this->expired;
-    }
+        Redis::hset('token:user', $user->getAuthIdentifier(), $code);
 
-    /**
-     * @param int $expired
-     */
-    public function setExpired(int $expired)
-    {
-        $this->expired = $expired;
+        return Crypt::encrypt([
+            'id' => $user->getAuthIdentifier(),
+            'code' => $code,
+            'time' => time()
+        ]);
     }
 
     /**
-     * @return int
-     */
-    public function getTtl(): int
-    {
-        return $this->ttl;
-    }
-
-    /**
-     * @param int $ttl
+     * generateTokenString
+     * @author luffyzhao@vip.126.com
+     * @return string
      */
-    public function setTtl(int $ttl)
+    private function getRedisString(): string
     {
-        $this->ttl = $ttl;
+        return Str::random(16);
     }
 
-
 }

src/Contracts/Signer/SignerInterface.php

@@ -11,7 +11,5 @@
 
 interface SignerInterface
 {
-    public function getSignerIdentifier();
-
-    public function saveSignerCode($code);
+    public function getAuthIdentifier();
 }