update

Author: edenleung

composer.json

@@ -9,7 +9,9 @@
         }
     ],
     "minimum-stability": "dev",
-    "require": {},
+    "require": {
+        "xiaodi-dev/think-jwt": "v3.0.0.beta.6"
+    },
     "autoload": {
         "psr-4": {
             "think\\User\\": "src/"

example/User.php

@@ -0,0 +1,43 @@
+<?php
+include __DIR__ . '/../vendor/autoload.php';
+
+use think\User\AuthorizationUserInterface;
+
+class User implements AuthorizationUserInterface
+{
+    public function hasUserByUserName($username): bool
+    {
+        return false;
+    }
+
+    public function getUserByUserName($username): AuthorizationUserInterface
+    {
+        return $this;
+    }
+
+    public function verifyPassword($password): bool
+    {
+        return false;
+    }
+
+    public function setUserName($username): AuthorizationUserInterface
+    {
+        $this->username = $username;
+        return $this;
+    }
+
+    public function setPassword($password): AuthorizationUserInterface
+    {
+        return $this;
+    }
+
+    public function token(): string
+    {
+        return '';
+    }
+
+    public function find()
+    {
+        return $this;
+    }
+}

example/test.php

@@ -0,0 +1,23 @@
+<?php
+
+include __DIR__ . '/../vendor/autoload.php';
+include __DIR__ . '/User.php';
+
+use think\User\Config;
+use think\User\Auth;
+use think\User\Drive\Jwt;
+use think\User\Drive\Session;
+use think\User\Drive\Cookie;
+
+$options = [
+    'drive' => Session::class,
+    'key' => 'uid',
+    'model' => User::class
+];
+
+$config = new Config($options);
+
+$auth = new Auth($config);
+
+var_dump($auth->isLogin());
+$auth->user();

src/Auth.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace think\User;
+
+use think\User\Drive\DriveManager;
+use think\User\Config;
+
+class Auth
+{
+    /**
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * @var DriveManager
+     */
+    protected $manager;
+
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+
+        $this->init();
+    }
+
+    protected function init()
+    {
+        $this->manager = $this->getManager();
+    }
+
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
+    protected function getManager()
+    {
+        return new DriveManager($this->config);
+    }
+
+    public function __call($name, $argv)
+    {
+        return $this->manager->$name(...$argv);
+    }
+}

src/AuthService.php

@@ -1,61 +1,18 @@
 <?php
 
-/*
- * This file is part of TAnt.
- * @link     https://github.com/edenleung/think-admin
- * @document https://www.kancloud.cn/manual/thinkphp6_0
- * @contact  QQ Group 996887666
- * @author   Eden Leung [email protected]
- * @copyright 2019 Eden Leung
- * @license  https://github.com/edenleung/think-admin/blob/6.0/LICENSE.txt
- */
-
 namespace think\User;
 
-use think\User\Exception\Unauthorized;
+use think\Service;
 
-class AuthService
+class AuthService extends Service
 {
-    /**
-     * @var AuthorizationUserInterface
-     */
-    protected $member;
-
-    public function __construct(AuthorizationUserInterface $member)
-    {
-        $this->member = $member;
-    }
-
-    public function login(string $username, string $password)
-    {
-        $row = $this->member->hasUserByUserName($username);
-
-        if ($row) {
-            $user = $this->member->getUserByUserName($username);
-            if (!$user->verifyPassword($password)) {
-                throw new Unauthorized('账号密码错误');
-            }
-
-            return $user;
-        }
-
-        throw new Unauthorized('没有此账号');
-    }
-
-    public function register($username, $password, $params = [])
+    public function register()
     {
-        $row = $this->member->hasUserByUserName($username);
-
-        if (!$row) {
-            $member = $this->member->setUserName($username)->setPassword($password);
-
-            foreach ($params as $key => $value) {
-                $member->$key = $value;
-            }
-
-            $member->save($params);
-        }
+        $this->app->bind('auth', function () {
+            $config = new Config(config('auth'));
+            $auth = new Auth($config);
 
-        throw new Unauthorized('此账号已注册');
+            return $auth;
+        });
     }
 }

src/AuthorizationUserInterface.php

@@ -1,19 +1,11 @@
 <?php
 
-/*
- * This file is part of TAnt.
- * @link     https://github.com/edenleung/think-admin
- * @document https://www.kancloud.cn/manual/thinkphp6_0
- * @contact  QQ Group 996887666
- * @author   Eden Leung [email protected]
- * @copyright 2019 Eden Leung
- * @license  https://github.com/edenleung/think-admin/blob/6.0/LICENSE.txt
- */
-
 namespace think\User;
 
 interface AuthorizationUserInterface
 {
+    public function getUserById($id): AuthorizationUserInterface;
+
     public function hasUserByUserName($username): bool;
 
     public function getUserByUserName($username): AuthorizationUserInterface;

src/Config.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace think\User;
+
+class Config
+{
+    protected $drive;
+
+    protected $key;
+
+    protected $model;
+
+    public function __construct($options)
+    {
+        foreach ($options as $key => $value) {
+            $this->$key = $value;
+        }
+    }
+
+    public function setModel($model)
+    {
+        $this->model = $model;
+        return $this;
+    }
+
+    public function getModel()
+    {
+        return $this->model;
+    }
+
+    public function setDrive($name)
+    {
+        $this->drive = $name;
+        return $this;
+    }
+
+    public function getDrive()
+    {
+        return $this->drive;
+    }
+
+    public function setKey($key)
+    {
+        $this->key = $key;
+        return $this;
+    }
+
+    public function getKey()
+    {
+        return $this->key;
+    }
+}

src/Drive/Cookie.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace think\User\Drive;
+
+use think\User\Drive\DriveInterface;
+
+class Cookie implements DriveInterface
+{
+    public function has($key)
+    {
+        return \think\facade\Cookie::has($key);
+    }
+
+    public function get($key)
+    {
+        return \think\facade\Cookie::get($key);
+    }
+
+    public function delete($key)
+    {
+    }
+}

src/Drive/DriveInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace think\User\Drive;
+
+interface DriveInterface
+{
+    public function get($key);
+
+    public function has($key);
+    
+    public function delete($key);
+}

src/Drive/DriveManager.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace think\User\Drive;
+
+use think\User\AuthorizationUserInterface;
+use think\User\Config;
+use think\User\Drive\DriveInterface;
+use think\User\Exception\Unauthorized;
+
+class DriveManager
+{
+    /**
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * @var DriveInterface
+     */
+    protected $drive;
+
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+
+        $this->init();
+    }
+
+    protected function init()
+    {
+        $class =  $this->config->getDrive();
+        $this->drive = new $class();
+    }
+
+    public function getDrive()
+    {
+        return $this->drive;
+    }
+
+    public function isLogin()
+    {
+        $key = $this->config->getKey();
+
+        return $this->drive->has($key);
+    }
+
+    protected function makeUser()
+    {
+        $class = $this->config->getModel();
+        $key = $this->config->getKey();
+        $id = $this->drive->get($key);
+
+        $model = new $class();
+        if ($model instanceof AuthorizationUserInterface) {
+            return $model->find($id);
+        } else {
+            throw new Unauthorized('implements ' . AuthorizationUserInterface::class);
+        }
+    }
+
+    public function user()
+    {
+        if ($this->isLogin() !== false) {
+            return $this->makeUser();
+        } else {
+            throw new Unauthorized('未登录');
+        }
+    }
+}