diff options
12 files changed, 112 insertions, 96 deletions
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index b031c405046..e9b74a2723f 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -225,7 +225,7 @@ class GroupsController extends AUserData { return new DataResponse(['users' => $usersDetails]); } - throw new OCSException('User does not have access to specified group', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('The requested group could not be found', OCSController::RESPOND_NOT_FOUND); } /** @@ -271,7 +271,7 @@ class GroupsController extends AUserData { throw new OCSException('Not supported by backend', 101); } else { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_UNKNOWN_ERROR); } } diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 115b955354b..0bc9f25eeb1 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -509,7 +509,7 @@ class UsersController extends AUserData { $data = $this->getUserData($userId, $includeScopes); // getUserData returns empty array if not enough permissions if (empty($data)) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } return new DataResponse($data); } @@ -602,7 +602,7 @@ class UsersController extends AUserData { $targetUser = $this->userManager->get($userId); if ($targetUser === null) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } $permittedFields = []; @@ -668,12 +668,12 @@ class UsersController extends AUserData { $permittedFields[] = 'quota'; } else { // No rights - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } } // Check if permitted to edit this field if (!in_array($key, $permittedFields)) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', 103); } // Process the edit switch ($key) { @@ -690,7 +690,7 @@ class UsersController extends AUserData { $quota = \OCP\Util::computerFileSize($quota); } if ($quota === false) { - throw new OCSException('Invalid quota value '.$value, 103); + throw new OCSException('Invalid quota value '.$value, 102); } if ($quota === -1) { $quota = 'none'; @@ -788,14 +788,18 @@ class UsersController extends AUserData { $targetUser = $this->userManager->get($userId); - if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) { + if ($targetUser === null) { + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); + } + + if ($targetUser->getUID() === $currentLoggedInUser->getUID()) { throw new OCSException('', 101); } // If not permitted $subAdminManager = $this->groupManager->getSubAdmin(); if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } $this->remoteWipe->markAllTokensForWipe($targetUser); @@ -816,14 +820,18 @@ class UsersController extends AUserData { $targetUser = $this->userManager->get($userId); - if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) { + if ($targetUser === null) { + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); + } + + if ($targetUser->getUID() === $currentLoggedInUser->getUID()) { throw new OCSException('', 101); } // If not permitted $subAdminManager = $this->groupManager->getSubAdmin(); if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } // Go ahead with the delete @@ -877,7 +885,7 @@ class UsersController extends AUserData { // If not permitted $subAdminManager = $this->groupManager->getSubAdmin(); if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) { - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } // enable/disable the user now @@ -924,7 +932,7 @@ class UsersController extends AUserData { return new DataResponse(['groups' => $groups]); } else { // Not permitted - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } } } @@ -1132,7 +1140,7 @@ class UsersController extends AUserData { if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser) && !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) { // No rights - throw new OCSException('', OCSController::RESPOND_UNAUTHORISED); + throw new OCSException('', OCSController::RESPOND_NOT_FOUND); } $email = $targetUser->getEMailAddress(); diff --git a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php index a8bb8140060..cf51a148bba 100644 --- a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php +++ b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php @@ -30,10 +30,10 @@ namespace OCA\Provisioning_API\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCSController; use OCP\AppFramework\Utility\IControllerMethodReflector; class ProvisioningApiMiddleware extends Middleware { @@ -84,7 +84,7 @@ class ProvisioningApiMiddleware extends Middleware { */ public function afterException($controller, $methodName, \Exception $exception) { if ($exception instanceof NotSubAdminException) { - throw new OCSException($exception->getMessage(), OCSController::RESPOND_UNAUTHORISED); + throw new OCSException($exception->getMessage(), Http::STATUS_FORBIDDEN); } throw $exception; diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 1afe9be4319..d95edff8625 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -1208,7 +1208,7 @@ class UsersControllerTest extends TestCase { public function testGetUserDataAsSubAdminAndUserIsNotAccessible() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() @@ -1681,7 +1681,7 @@ class UsersControllerTest extends TestCase { public function testEditUserRegularUserSelfEditChangeQuota() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(103); $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() @@ -1759,7 +1759,7 @@ class UsersControllerTest extends TestCase { public function testEditUserAdminUserSelfEditChangeInvalidQuota() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); $this->expectExceptionMessage('Invalid quota value ABC'); - $this->expectExceptionCode(103); + $this->expectExceptionCode(102); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser @@ -2091,7 +2091,7 @@ class UsersControllerTest extends TestCase { public function testEditUserSubadminUserInaccessible() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser @@ -2131,7 +2131,7 @@ class UsersControllerTest extends TestCase { public function testDeleteUserNotExistingUser() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(101); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser @@ -2344,7 +2344,7 @@ class UsersControllerTest extends TestCase { public function testDeleteUserAsSubAdminAndUserIsNotAccessible() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser @@ -2525,7 +2525,7 @@ class UsersControllerTest extends TestCase { public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser @@ -3526,7 +3526,7 @@ class UsersControllerTest extends TestCase { public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible() { $this->expectException(\OCP\AppFramework\OCS\OCSException::class); - $this->expectExceptionCode(997); + $this->expectExceptionCode(998); $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php index 4565bde42a2..1977a4aa0f9 100644 --- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php +++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php @@ -27,8 +27,8 @@ namespace OCA\Provisioning_API\Tests\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; use OCA\Provisioning_API\Middleware\ProvisioningApiMiddleware; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http; use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCSController; use OCP\AppFramework\Utility\IControllerMethodReflector; use Test\TestCase; @@ -115,7 +115,7 @@ class ProvisioningApiMiddlewareTest extends TestCase { } catch (OCSException $e) { $this->assertFalse($forwared); $this->assertSame($exception->getMessage(), $e->getMessage()); - $this->assertSame(OCSController::RESPOND_UNAUTHORISED, $e->getCode()); + $this->assertSame(Http::STATUS_FORBIDDEN, $e->getCode()); } catch (\Exception $e) { $this->assertTrue($forwared); $this->assertSame($exception, $e); diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 03aaad4b857..22feb7ef24f 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -176,8 +176,8 @@ Feature: provisioning When sending "PUT" to "/cloud/users/brand-new-user" with | key | phoneScope | | value | v2-private | - Then the OCS status code should be "997" - And the HTTP status code should be "401" + Then the OCS status code should be "103" + And the HTTP status code should be "200" Scenario: Search by phone number Given As an "admin" @@ -234,11 +234,12 @@ Feature: provisioning And the HTTP status code should be "200" Scenario: adding user to a group without privileges - Given As an "brand-new-user" + Given user "brand-new-user" exists + And As an "brand-new-user" When sending "POST" to "/cloud/users/brand-new-user/groups" with | groupid | new-group | - Then the OCS status code should be "997" - And the HTTP status code should be "401" + Then the OCS status code should be "403" + And the HTTP status code should be "200" Scenario: adding user to a group Given As an "admin" @@ -523,8 +524,8 @@ Feature: provisioning And Assure user "subadmin" is subadmin of group "new-group" And As an "subadmin" When sending "PUT" to "/cloud/users/user1/disable" - Then the OCS status code should be "997" - Then the HTTP status code should be "401" + Then the OCS status code should be "998" + Then the HTTP status code should be "200" And As an "admin" And user "user1" is enabled @@ -539,8 +540,8 @@ Feature: provisioning And Assure user "subadmin" is subadmin of group "new-group" And As an "subadmin" When sending "PUT" to "/cloud/users/another-admin/disable" - Then the OCS status code should be "997" - Then the HTTP status code should be "401" + Then the OCS status code should be "998" + Then the HTTP status code should be "200" And As an "admin" And user "another-admin" is enabled @@ -615,8 +616,8 @@ Feature: provisioning And user "user2" exists And As an "user1" When sending "PUT" to "/cloud/users/user2/disable" - Then the OCS status code should be "997" - And the HTTP status code should be "401" + Then the OCS status code should be "403" + And the HTTP status code should be "200" And As an "admin" And user "user2" is enabled @@ -627,8 +628,8 @@ Feature: provisioning And assure user "user2" is disabled And As an "user1" When sending "PUT" to "/cloud/users/user2/enable" - Then the OCS status code should be "997" - And the HTTP status code should be "401" + Then the OCS status code should be "403" + And the HTTP status code should be "200" And As an "admin" And user "user2" is disabled diff --git a/build/integration/sharing_features/sharing-v1-part2.feature b/build/integration/sharing_features/sharing-v1-part2.feature index 8fc06fbddeb..f9ebf6782b1 100644 --- a/build/integration/sharing_features/sharing-v1-part2.feature +++ b/build/integration/sharing_features/sharing-v1-part2.feature @@ -919,7 +919,7 @@ Feature: sharing And As an "user1" When Deleting last share Then the OCS status code should be "403" - And the HTTP status code should be "401" + And the HTTP status code should be "200" Scenario: Keep usergroup shares (#22143) Given As an "admin" diff --git a/build/integration/sharing_features/sharing-v1-part3.feature b/build/integration/sharing_features/sharing-v1-part3.feature index 5094111d025..42e0f1b6add 100644 --- a/build/integration/sharing_features/sharing-v1-part3.feature +++ b/build/integration/sharing_features/sharing-v1-part3.feature @@ -403,7 +403,7 @@ Feature: sharing And Updating last share with | permissions | 19 | Then the OCS status code should be "403" - And the HTTP status code should be "401" + And the HTTP status code should be "200" Scenario: do not allow to increase permissions on non received share with user with resharing rights Given As an "admin" @@ -427,7 +427,7 @@ Feature: sharing And Updating last share with | permissions | 19 | Then the OCS status code should be "403" - And the HTTP status code should be "401" + And the HTTP status code should be "200" Scenario: do not allow to increase link share permissions on reshare Given As an "admin" diff --git a/build/integration/sharing_features/sharing-v1.feature b/build/integration/sharing_features/sharing-v1.feature index 2c391805331..fbcbb50b7de 100644 --- a/build/integration/sharing_features/sharing-v1.feature +++ b/build/integration/sharing_features/sharing-v1.feature @@ -54,7 +54,7 @@ Feature: sharing | shareWith | a-room-token | | shareType | 10 | Then the OCS status code should be "403" - And the HTTP status code should be "401" + And the HTTP status code should be "200" Scenario: Creating a new mail share Given dummy mail server is listening 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; diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php index 9ccff9ac98c..8ad36bada7e 100644 --- a/lib/private/AppFramework/OCS/V1Response.php +++ b/lib/private/AppFramework/OCS/V1Response.php @@ -37,7 +37,7 @@ class V1Response extends BaseResponse { */ public function getStatus() { $status = parent::getStatus(); - if ($status === Http::STATUS_FORBIDDEN || $status === OCSController::RESPOND_UNAUTHORISED) { + if ($status === OCSController::RESPOND_UNAUTHORISED) { return Http::STATUS_UNAUTHORIZED; } diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index 1ee6da9ca30..83b764f6c65 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -98,29 +98,24 @@ class OCSMiddlewareTest extends \Test\TestCase { $OCSMiddleware = new OCSMiddleware($this->request); $OCSMiddleware->beforeController($controller, 'method'); - try { - $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertFalse($forward); + if ($forward) { + $this->expectException(get_class($exception)); + $this->expectExceptionMessage($exception->getMessage()); + } - $this->assertInstanceOf(V1Response::class, $result); + $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); + $this->assertInstanceOf(V1Response::class, $result); - if ($exception->getCode() === 0) { - $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); - } else { - $this->assertSame($code, $result->getOCSStatus()); - } + $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); - if ($exception instanceof OCSForbiddenException) { - $this->assertSame(Http::STATUS_UNAUTHORIZED, $result->getStatus()); - } else { - $this->assertSame(Http::STATUS_OK, $result->getStatus()); - } - } catch (\Exception $e) { - $this->assertTrue($forward); - $this->assertEquals($exception, $e); + if ($exception->getCode() === 0) { + $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); + } else { + $this->assertSame($code, $result->getOCSStatus()); } + + $this->assertSame(Http::STATUS_OK, $result->getStatus()); } /** @@ -139,23 +134,22 @@ class OCSMiddlewareTest extends \Test\TestCase { $OCSMiddleware = new OCSMiddleware($this->request); $OCSMiddleware->beforeController($controller, 'method'); - try { - $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertFalse($forward); + if ($forward) { + $this->expectException(get_class($exception)); + $this->expectExceptionMessage($exception->getMessage()); + } - $this->assertInstanceOf(V2Response::class, $result); + $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); - if ($exception->getCode() === 0) { - $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); - } else { - $this->assertSame($code, $result->getOCSStatus()); - } - $this->assertSame($code, $result->getStatus()); - } catch (\Exception $e) { - $this->assertTrue($forward); - $this->assertEquals($exception, $e); + $this->assertInstanceOf(V2Response::class, $result); + + $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); + if ($exception->getCode() === 0) { + $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); + } else { + $this->assertSame($code, $result->getOCSStatus()); } + $this->assertSame($code, $result->getStatus()); } /** @@ -174,23 +168,22 @@ class OCSMiddlewareTest extends \Test\TestCase { $OCSMiddleware = new OCSMiddleware($this->request); $OCSMiddleware->beforeController($controller, 'method'); - try { - $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertFalse($forward); + if ($forward) { + $this->expectException(get_class($exception)); + $this->expectExceptionMessage($exception->getMessage()); + } - $this->assertInstanceOf(V2Response::class, $result); + $result = $OCSMiddleware->afterException($controller, 'method', $exception); - $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); - if ($exception->getCode() === 0) { - $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); - } else { - $this->assertSame($code, $result->getOCSStatus()); - } - $this->assertSame($code, $result->getStatus()); - } catch (\Exception $e) { - $this->assertTrue($forward); - $this->assertEquals($exception, $e); + $this->assertInstanceOf(V2Response::class, $result); + + $this->assertSame($message, $this->invokePrivate($result, 'statusMessage')); + if ($exception->getCode() === 0) { + $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR, $result->getOCSStatus()); + } else { + $this->assertSame($code, $result->getOCSStatus()); } + $this->assertSame($code, $result->getStatus()); } public function dataAfterController() { @@ -205,7 +198,7 @@ class OCSMiddlewareTest extends \Test\TestCase { [$OCSController, new Http\Response(), false], [$OCSController, new Http\JSONResponse(), false], [$OCSController, new Http\JSONResponse(['message' => 'foo']), false], - [$OCSController, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), true], + [$OCSController, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), true, OCSController::RESPOND_UNAUTHORISED], [$OCSController, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_FORBIDDEN), true], [$controller, new Http\Response(), false], @@ -223,8 +216,9 @@ class OCSMiddlewareTest extends \Test\TestCase { * @param Controller $controller * @param Http\Response $response * @param bool $converted + * @param int $convertedOCSStatus */ - public function testAfterController($controller, $response, $converted) { + public function testAfterController($controller, $response, $converted, $convertedOCSStatus = 0) { $OCSMiddleware = new OCSMiddleware($this->request); $newResponse = $OCSMiddleware->afterController($controller, 'foo', $response); @@ -233,8 +227,13 @@ class OCSMiddlewareTest extends \Test\TestCase { } else { $this->assertInstanceOf(BaseResponse::class, $newResponse); $this->assertSame($response->getData()['message'], $this->invokePrivate($newResponse, 'statusMessage')); - $this->assertSame(\OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED, $newResponse->getOCSStatus()); - $this->assertSame(Http::STATUS_UNAUTHORIZED, $newResponse->getStatus()); + + if ($convertedOCSStatus) { + $this->assertSame($convertedOCSStatus, $newResponse->getOCSStatus()); + } else { + $this->assertSame($response->getStatus(), $newResponse->getOCSStatus()); + } + $this->assertSame($response->getStatus(), $newResponse->getStatus()); } } } |