update

Author: edenleung

example/test.php

@@ -3,21 +3,22 @@
 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
+    'default' => 'api',
+    'stores' => [
+        'api' => [
+            'drive' => Session::class,
+            'key' => 'uid',
+            'model' => User::class
+        ]
+    ]
 ];
 
-$config = new Config($options);
-
 $auth = new Auth($config);
 
 var_dump($auth->isLogin());
-$auth->user();
+$auth->user();

src/Auth.php

@@ -2,41 +2,69 @@
 
 namespace think\User;
 
+use think\User\Config\Config;
 use think\User\Drive\DriveManager;
-use think\User\Config;
 
 class Auth
 {
+    /**
+     * @var array
+     */
+    protected $options;
+
     /**
      * @var Config
      */
     protected $config;
 
+    /**
+     * @var string
+     */
+    protected $store;
+
     /**
      * @var DriveManager
      */
     protected $manager;
 
-    public function __construct(Config $config)
+    public function __construct(array $options)
     {
-        $this->config = $config;
+        $this->options = $options;
 
         $this->init();
     }
 
-    protected function init()
+    private function init()
+    {
+        $this->makeConfig();
+        $this->makeManager();
+    }
+
+    public function store($store)
+    {
+        $this->store = $store;
+        return $this;
+    }
+
+    protected function getDefaultApp()
+    {
+        return $this->options['default'];
+    }
+
+    protected function makeConfig()
     {
-        $this->manager = $this->getManager();
+        $app = $this->store ?? $this->getDefaultApp();
+        $this->config = new Config($this->options['stores'][$app]);
     }
 
     protected function getConfig()
     {
         return $this->config;
     }
 
-    protected function getManager()
+    protected function makeManager()
     {
-        return new DriveManager($this->config);
+        $this->manager = new DriveManager($this->config);
     }
 
     public function __call($name, $argv)

src/AuthService.php

@@ -8,9 +8,8 @@ class AuthService extends Service
 {
     public function register()
     {
-        $this->app->bind('auth', function () {
-            $config = new Config(config('auth'));
-            $auth = new Auth($config);
+        $this->app->bind('auth', function ($store = null) {
+            $auth = new Auth(config('auth'));
 
             return $auth;
         });

src/Config.php src/Config/Config.phpsrc/Config.php renamed to src/Config/Config.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace think\User;
+namespace think\User\Config;
 
 class Config
 {

src/Drive/DriveManager.php

@@ -3,7 +3,7 @@
 namespace think\User\Drive;
 
 use think\User\AuthorizationUserInterface;
-use think\User\Config;
+use think\User\Config\Config;
 use think\User\Drive\DriveInterface;
 use think\User\Exception\Unauthorized;
 
@@ -52,7 +52,7 @@ protected function makeUser()
 
         $model = new $class();
         if ($model instanceof AuthorizationUserInterface) {
-            return $model->find($id);
+            return $model->getUserById($id);
         } else {
             throw new Unauthorized('implements ' . AuthorizationUserInterface::class);
         }