diff options
author | Joas Schilling <coding@schilljs.com> | 2021-04-21 08:58:35 +0200 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2021-05-12 08:16:07 +0200 |
commit | b6c6527705695a343b055f89bdde5ec497914ff1 (patch) | |
tree | b52adc3a0b203add9a971cd1e2bf0ef9666af23a /lib/private/AppFramework/Middleware | |
parent | 0599a8060ceb6518bb3981c88fc14f215d80f562 (diff) | |
download | nextcloud-server-b6c6527705695a343b055f89bdde5ec497914ff1.tar.gz nextcloud-server-b6c6527705695a343b055f89bdde5ec497914ff1.zip |
Fix unauthorized OCS status in provisioning
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/AppFramework/Middleware')
-rw-r--r-- | lib/private/AppFramework/Middleware/OCSMiddleware.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index f701f17a48e..ad461faef6f 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -100,8 +100,7 @@ class OCSMiddleware extends Middleware { * we need to catch the response and convert it to a proper OCS response. */ if ($controller instanceof OCSController && !($response instanceof BaseResponse)) { - if ($response->getStatus() === Http::STATUS_UNAUTHORIZED || - $response->getStatus() === Http::STATUS_FORBIDDEN) { + if ($response->getStatus() === Http::STATUS_UNAUTHORIZED) { $message = ''; if ($response instanceof JSONResponse) { /** @var DataResponse $response */ @@ -110,6 +109,15 @@ class OCSMiddleware extends Middleware { return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message); } + if ($response->getStatus() === Http::STATUS_FORBIDDEN) { + $message = ''; + if ($response instanceof JSONResponse) { + /** @var DataResponse $response */ + $message = $response->getData()['message']; + } + + return $this->buildNewResponse($controller, Http::STATUS_FORBIDDEN, $message); + } } return $response; |