完善登录逻辑

Author: limingxinleo

README.md

@@ -12,8 +12,75 @@ composer require kydev/work-wx-user
 
 ## 使用
 
+### 发布配置
+
+```shell
+php bin/hyperf.php vendor:publish kydev/work-wx-user
+```
+
 ### 登录
 
+创建控制器
+
+```php
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller;
+
+use Hyperf\Di\Annotation\Inject;
+use KY\WorkWxUser\Request\AuthorizeRequest;
+use KY\WorkWxUser\UserService;
+use KY\WorkWxUser\WeChat\WeChat;
+
+class OAuthController extends Controller
+{
+    #[Inject]
+    protected WeChat $wx;
+
+    #[Inject]
+    protected UserService $service;
+
+    public function authorize(AuthorizeRequest $request)
+    {
+        $url = (string) $request->input('redirect_uri');
+        $state = (string) $request->input('state');
+
+        $redirectUrl = $this->wx->authorize($url, $state);
+
+        return $this->response->redirect($redirectUrl);
+    }
+
+    public function login()
+    {
+        $code = $this->request->input('code');
+
+        $result = $this->service->login($code);
+
+        return $this->response->success([
+            'token' => $result->getToken(),
+            'user' => $result->getUser()->toArray(),
+        ]);
+    }
+}
+
+```
+
+增加路由
+
+```php
+<?php
+
+Router::get('/oauth/authorize', [App\Controller\OAuthController::class, 'authorize']);
+Router::get('/oauth/login', [App\Controller\OAuthController::class, 'login']);
+Router::post('/oauth/login', [App\Controller\OAuthController::class, 'login']);
+```
+
+浏览器访问以下地址，并扫码
+
+http://127.0.0.1:9501/oauth/authorize?state=STATE&redirect_uri=http://127.0.0.1:9501/oauth/login
+
 ### 验证登录态
 
 在 `middlewares.php` 配置中，增加对应的中间件。

composer.json

@@ -30,6 +30,7 @@
         "hyperf/http-server": "3.0.*",
         "hyperf/model-cache": "3.0.*",
         "hyperf/redis": "3.0.*",
+        "hyperf/validation": "3.0.*",
         "limingxinleo/easywechat-classmap": "^1.0",
         "limingxinleo/hyperf-utils": "^3.3",
         "w7corp/easywechat": "^6.7"

src/Exception/ApiException.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of KnowYourself.
+ *
+ * @link     https://www.zhiwotansuo.cn
+ * @document https://github.com/kydever/work-wx-user/blob/main/README.md
+ * @contact  l@hyperf.io
+ * @license  https://github.com/kydever/work-wx-user/blob/main/LICENSE
+ */
+namespace KY\WorkWxUser\Exception;
+
+class ApiException extends \RuntimeException
+{
+}

src/Request/AuthorizeRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of KnowYourself.
+ *
+ * @link     https://www.zhiwotansuo.cn
+ * @document https://github.com/kydever/work-wx-user/blob/main/README.md
+ * @contact  l@hyperf.io
+ * @license  https://github.com/kydever/work-wx-user/blob/main/LICENSE
+ */
+namespace KY\WorkWxUser\Request;
+
+use Hyperf\Validation\Request\FormRequest;
+
+class AuthorizeRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            'redirect_uri' => 'required|string',
+            'state' => 'string',
+        ];
+    }
+}

src/UserAuth.php

@@ -15,11 +15,14 @@
 use Hyperf\Redis\Redis;
 use Hyperf\Utils\Codec\Json;
 use KY\WorkWxUser\Exception\TokenInvalidException;
+use KY\WorkWxUser\Model\User;
 
 class UserAuth implements \JsonSerializable
 {
     public const AUTH_TOKEN = 'work-wx-token';
 
+    protected ?User $user = null;
+
     public function __construct(protected int $id, protected string $token)
     {
     }
@@ -31,6 +34,17 @@ public function jsonSerialize()
         ];
     }
 
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): static
+    {
+        $this->user = $user;
+        return $this;
+    }
+
     public function getId(): int
     {
         return $this->id;

src/UserService.php

@@ -15,7 +15,6 @@
 use KY\WorkWxUser\Dao\DepartmentDao;
 use KY\WorkWxUser\Dao\UserDao;
 use KY\WorkWxUser\Model\Department;
-use KY\WorkWxUser\Model\User;
 use KY\WorkWxUser\Translator\UserTranslator;
 use KY\WorkWxUser\WeChat\DepartmentWeChat;
 use KY\WorkWxUser\WeChat\UserWeChat;
@@ -55,14 +54,22 @@ public function syncToDatabase(): void
         }
     }
 
-    public function login(User $user): UserAuth
+    public function login(string $code): UserAuth
     {
+        $info = di()->get(UserWeChat::class)->getUserInfo($code);
+
+        $user = di()->get(UserDao::class)->firstByUserid($info['userid']);
+
+        $user = di()->get(UserTranslator::class)->translate($info, $user);
+
+        $user->save();
+
         $token = sprintf('%d_%s', $user->id, md5(uniqid()));
 
         $userAuth = new UserAuth($user->id, $token);
 
         $userAuth->save();
 
-        return $userAuth;
+        return $userAuth->setUser($user);
     }
 }

src/WeChat/Api.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of KnowYourself.
+ *
+ * @link     https://www.zhiwotansuo.cn
+ * @document https://github.com/kydever/work-wx-user/blob/main/README.md
+ * @contact  l@hyperf.io
+ * @license  https://github.com/kydever/work-wx-user/blob/main/LICENSE
+ */
+namespace KY\WorkWxUser\WeChat;
+
+use KY\WorkWxUser\Exception\ApiException;
+
+abstract class Api
+{
+    public function format(array $result): array
+    {
+        if ($result['errcode'] > 0) {
+            throw new ApiException($result['errmsg'], $result['errcode']);
+        }
+
+        return $result;
+    }
+}

src/WeChat/DepartmentWeChat.php

@@ -14,18 +14,20 @@
 use EasyWeChat\Work\Application;
 use GuzzleHttp\RequestOptions;
 
-class DepartmentWeChat
+class DepartmentWeChat extends Api
 {
     public function __construct(protected Application $wx)
     {
     }
 
     public function departments(int $id): array
     {
-        return $this->wx->getClient()->get('/cgi-bin/department/list', [
+        $result = $this->wx->getClient()->get('/cgi-bin/department/list', [
             RequestOptions::QUERY => [
                 'id' => $id,
             ],
         ])->toArray();
+
+        return $this->format($result);
     }
 }

src/WeChat/UserWeChat.php

@@ -14,29 +14,33 @@
 use EasyWeChat\Work\Application;
 use GuzzleHttp\RequestOptions;
 
-class UserWeChat
+class UserWeChat extends Api
 {
     public function __construct(protected Application $wx)
     {
     }
 
     public function infoByUserid(string $userid): array
     {
-        return $this->wx->getClient()->get('/cgi-bin/user/get', [
+        $result = $this->wx->getClient()->get('/cgi-bin/user/get', [
             RequestOptions::QUERY => [
                 'userid' => $userid,
             ],
         ])->toArray();
+
+        return $this->format($result);
     }
 
     public function listByDepartmentId(int $departmentId, bool $fetchChild = false): array
     {
-        return $this->wx->getClient()->get('/cgi-bin/user/list', [
+        $result = $this->wx->getClient()->get('/cgi-bin/user/list', [
             RequestOptions::QUERY => [
                 'department_id' => $departmentId,
                 'fetch_child' => (int) $fetchChild,
             ],
         ])->toArray();
+
+        return $this->format($result);
     }
 
     public function getUserInfo(string $code): array