From fb3c8356b2163d3116fe4ebfebbef0002fa60190 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 17 Dec 2019 16:00:07 +0100
Subject: [PATCH] FEAT #11158 TIME 1 callback url in onlyOffice
---
rest/index.php | 6 ++++--
src/app/contentManagement/controllers/JnlpController.php | 5 -----
.../onlyoffice-api-js/onlyoffice-viewer.component.ts | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/rest/index.php b/rest/index.php
index f783c454fff..152c26f3e57 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 c4b0e5c285f..fad66019a98 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 3bafb5bfb69..65eb8efba00 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',
--
GitLab