From efa0ef2cfd96cbfecee836f8120399c862893f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 8 Dec 2020 20:52:47 +0800 Subject: [PATCH 1/3] no message --- src/Http/Middleware/CheckUserStatus.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index ba6a7c0..e7b92b1 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -26,6 +26,10 @@ use Psr\Http\Server\RequestHandlerInterface; class CheckUserStatus implements MiddlewareInterface { + private $noCheckAction = [ + '/api/user/signinfields', + '/api/user/signinfields' + ]; /** * {@inheritdoc} * @@ -34,14 +38,17 @@ class CheckUserStatus implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $actor = $request->getAttribute('actor'); - + $actor->status = 2; // 被禁用的用户 if ($actor->status == 1) { throw new PermissionDeniedException('ban_user'); } // 审核中的用户 if ($actor->status == 2) { - throw new PermissionDeniedException('register_validate'); + $path = $request->getUri()->getPath(); + if(!in_array($path,$this->noCheckAction)){ + throw new PermissionDeniedException('register_validate'); + } } // 审核拒绝 if ($actor->status == 3) { -- Gitee From 2465bd4b21dc34844da3b69300811f03dca21f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 8 Dec 2020 20:57:35 +0800 Subject: [PATCH 2/3] no message --- src/Http/Middleware/CheckUserStatus.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index e7b92b1..668beb7 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -38,7 +38,6 @@ class CheckUserStatus implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $actor = $request->getAttribute('actor'); - $actor->status = 2; // 被禁用的用户 if ($actor->status == 1) { throw new PermissionDeniedException('ban_user'); -- Gitee From 0020e623de366ea0a8d2a6d4c3b9cd93b06ada7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 8 Dec 2020 21:01:22 +0800 Subject: [PATCH 3/3] no message --- src/Http/Middleware/CheckUserStatus.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index 668beb7..229394d 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -27,7 +27,6 @@ use Psr\Http\Server\RequestHandlerInterface; class CheckUserStatus implements MiddlewareInterface { private $noCheckAction = [ - '/api/user/signinfields', '/api/user/signinfields' ]; /** -- Gitee