diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index f5005a6e52f8e5b8a27d932fdb5c1ec838345795..8facc123133745ae07f1e8f438316998cfcde12a 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -24,7 +24,6 @@ use App\Models\UserSignInFields; use Discuz\Auth\Exception\PermissionDeniedException; use Discuz\Common\Utils; use Discuz\Contracts\Setting\SettingsRepository; -use Discuz\Http\DiscuzResponseFactory; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; @@ -78,7 +77,6 @@ class CheckUserStatus implements MiddlewareInterface 'user/signinfields', // 查询、提交扩展字段 'attachments', //上传图片、附件 'unreadnotification', // 消息 - 'thread.detail', // 帖子详情 'posts', // 帖子 'backAdmin/login', 'emoji', @@ -118,14 +116,13 @@ class CheckUserStatus implements MiddlewareInterface ResponseCode::$codeMap[ResponseCode::VALIDATE_REJECT], User::getUserReject($actor->id) ); -// $this->exceptionResponse($actor->id,'validate_reject'); } // 审核忽略 if ($actor->status == User::STATUS_IGNORE) { Utils::outPut(ResponseCode::VALIDATE_IGNORE); } // 待填写扩展审核字段的用户 - if ($actor->status == User::STATUS_NEED_FIELDS || $this->isJumpSiginFields($actor)) { + if ($actor->status == User::STATUS_NEED_FIELDS || $this->isJumpSignFields($actor)) { if (!in_array($api, $this->noAuditAction) && !(strpos($api, 'users') === 0)) { Utils::outPut(ResponseCode::JUMP_TO_SIGIN_FIELDS); } @@ -133,26 +130,7 @@ class CheckUserStatus implements MiddlewareInterface return $handler->handle($request); } - private function exceptionResponse($userId, $msg) - { - $crossHeaders = DiscuzResponseFactory::getCrossHeaders(); - foreach ($crossHeaders as $k=>$v) { - header($k . ':' . $v); - } - $response = [ - 'errors' => [ - [ - 'status' => '401', - 'code' => $msg, - 'data' => User::getUserReject($userId) - ] - ] - ]; - header('Content-Type:application/json; charset=utf-8', true, 401); - exit(json_encode($response, 256)); - } - - private function isJumpSiginFields($actor){ + private function isJumpSignFields($actor){ $userId = !empty($actor->id) ? (int)$actor->id : 0; $settings = app(SettingsRepository::class); $openExtFields = $settings->get('open_ext_fields'); diff --git a/src/Http/Middleware/CheckoutSite.php b/src/Http/Middleware/CheckoutSite.php index 756c30d66e25882cc71df91a9362e5687bd404d3..117b3023cf72b37612bc84c1c23489a4efea2560 100644 --- a/src/Http/Middleware/CheckoutSite.php +++ b/src/Http/Middleware/CheckoutSite.php @@ -64,11 +64,11 @@ class CheckoutSite implements MiddlewareInterface 'user/signinfields', // 查询、提交扩展字段 'attachments', //上传图片、附件 'unreadnotification', - 'thread.detail', // 帖子详情 'posts', // 帖子 'backAdmin/login', 'emoji', - 'view.count' + 'view.count', + 'swagger' ]; public function __construct(Application $app, SettingsRepository $settings) {