mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #609 from nextcloud/stable10_606 

Support subdir in the OCS v2 endpoint
This commit is contained in:
Roeland Jago Douma 2016-07-28 14:23:40 +02:00 committed by GitHub
parent 77c18e4ec2 6990a4e550
commit e184e4ad75
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/AppFramework/Middleware/OCSMiddleware.php
View File

@ -56,7 +56,13 @@ class OCSMiddleware extends Middleware {
if ($code === 0) {
$code = Http::STATUS_INTERNAL_SERVER_ERROR;
}
return new OCSResponse($format, $code, $exception->getMessage());
$response = new OCSResponse($format, $code, $exception->getMessage());
if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
$response->setStatus($code);
}
return $response;
}
throw $exception;

33
tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php
View File

@ -89,6 +89,9 @@ class OCSMiddlewareTest extends \Test\TestCase {
* @param int $code
*/
public function testAfterException($controller, $exception, $forward, $message = '', $code = 0) {
$this->request
->method('getScriptName')
->willReturn('/mysubfolder/ocs/v1.php');
$OCSMiddleware = new OCSMiddleware($this->request);
try {
@ -105,4 +108,34 @@ class OCSMiddlewareTest extends \Test\TestCase {
}
}
/**
* @dataProvider dataAfterException
*
* @param Controller $controller
* @param \Exception $exception
* @param bool $forward
* @param string $message
* @param int $code
*/
public function testAfterExceptionOCSv2SubFolder($controller, $exception, $forward, $message = '', $code = 0) {
$this->request
->method('getScriptName')
->willReturn('/mysubfolder/ocs/v2.php');
$OCSMiddleware = new OCSMiddleware($this->request);
try {
$result = $OCSMiddleware->afterException($controller, 'method', $exception);
$this->assertFalse($forward);
$this->assertInstanceOf('OCP\AppFramework\Http\OCSResponse', $result);
$this->assertSame($message, $this->invokePrivate($result, 'message'));
$this->assertSame($code, $this->invokePrivate($result, 'statuscode'));
$this->assertSame($code, $result->getStatus());
} catch (\Exception $e) {
$this->assertTrue($forward);
$this->assertEquals($exception, $e);
}
}
}