api: inherit OCSController

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/672/head
Varun Patil 2023-05-21 10:21:10 -07:00
parent 997a95da15
commit 72c83319cb
1 changed files with 22 additions and 2 deletions

View File

@ -27,7 +27,9 @@ use OCA\Memories\AppInfo\Application;
use OCA\Memories\Db\FsManager; use OCA\Memories\Db\FsManager;
use OCA\Memories\Db\TimelineQuery; use OCA\Memories\Db\TimelineQuery;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\AppFramework\ApiController; use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\OCSController;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\IConfig; use OCP\IConfig;
use OCP\IDBConnection; use OCP\IDBConnection;
@ -35,7 +37,7 @@ use OCP\IRequest;
use OCP\IUserSession; use OCP\IUserSession;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
abstract class GenericApiController extends ApiController abstract class GenericApiController extends OCSController
{ {
protected IConfig $config; protected IConfig $config;
protected IUserSession $userSession; protected IUserSession $userSession;
@ -68,4 +70,22 @@ abstract class GenericApiController extends ApiController
$this->timelineQuery = $timelineQuery; $this->timelineQuery = $timelineQuery;
$this->fs = $fs; $this->fs = $fs;
} }
/**
* We need to extend OCSController instead of ApiController because
* these are external APIs and should be accessible without CSRF
* tokens. The OCS response, unfortunately, nukes status codes so
* we need to override the buildResponse method to force it back.
*
* @param mixed $response Response that cannot be rendered directly
* @param mixed $format Format of the response
*/
public function buildResponse($response, $format = 'json')
{
if ($response instanceof DataResponse) {
return new JSONResponse($response->getData(), $response->getStatus());
}
return new JSONResponse($response);
}
} }