diff --git a/rest/index.php b/rest/index.php index f783c454fff85dda19694b822e3a99fc1659bb57..152c26f3e57698dec504a3d607f9479c77360877 100755 --- a/rest/index.php +++ b/rest/index.php @@ -29,7 +29,7 @@ $app = new \Slim\App(['settings' => ['displayErrorDetails' => true, 'determineRo //Authentication $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next) { - $routesWithoutAuthentication = ['GET/jnlp/{jnlpUniqueId}', 'POST/password', 'PUT/password', 'GET/passwordRules', 'GET/onlyOffice/mergedFile']; + $routesWithoutAuthentication = ['GET/jnlp/{jnlpUniqueId}', 'POST/password', 'PUT/password', 'GET/passwordRules', 'GET/onlyOffice/mergedFile', 'POST/onlyOfficeCallback']; $route = $request->getAttribute('route'); $currentMethod = empty($route) ? '' : $route->getMethods()[0]; $currentRoute = empty($route) ? '' : $route->getPattern(); @@ -133,7 +133,9 @@ $app->post('/convertedFile', \Convert\controllers\ConvertPdfController::class . $app->get('/convertedFile/{filename}', \Convert\controllers\ConvertPdfController::class . ':getConvertedFileByFilename'); //ContentManagement -$app->post('/test', \ContentManagement\controllers\JnlpController::class . ':test'); //TODO +$app->post('/onlyOfficeCallback', function (\Slim\Http\Request $request, \Slim\Http\Response $response) { + return $response->withJson(['error' => 0]); +}); $app->post('/jnlp', \ContentManagement\controllers\JnlpController::class . ':generateJnlp'); $app->get('/jnlp/{jnlpUniqueId}', \ContentManagement\controllers\JnlpController::class . ':renderJnlp'); $app->post('/jnlp/{jnlpUniqueId}', \ContentManagement\controllers\JnlpController::class . ':processJnlp'); diff --git a/src/app/contentManagement/controllers/JnlpController.php b/src/app/contentManagement/controllers/JnlpController.php index c4b0e5c285fe99a031e49de3b2ee86318ed3949c..fad66019a986101786d5a0b4c1d4ad5aaf7c440e 100755 --- a/src/app/contentManagement/controllers/JnlpController.php +++ b/src/app/contentManagement/controllers/JnlpController.php @@ -380,9 +380,4 @@ class JnlpController return $response->saveXML(); } - - public static function test(Request $request, Response $response) - { - return $response->withJson(['error' => 0]); - } } diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts index 3bafb5bfb6955eb13062475098381558619df49e..65eb8efba007feebb962cfee4fa470a856b5dec9 100644 --- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts +++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts @@ -151,7 +151,7 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit { } }, editorConfig: { - callbackUrl: 'http://cchaplin:maarch@10.2.95.76/maarch_courrier_develop/rest/test', + callbackUrl: `${this.appUrl}rest/onlyOfficeCallback`, lang: 'fr', region: 'fr-FR', mode: 'edit',