From c5eb8cf161349416c2d95377871526b9d2367ceb Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Thu, 16 Apr 2020 12:46:16 +0200 Subject: [PATCH] FEAT #13779 TIME 1:30 fix server uri --- .../onlyoffice-api-js/onlyoffice-viewer.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 321b48765d9..ddc34d85365 100644 --- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts +++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts @@ -170,9 +170,16 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit, OnD this.http.get(`../rest/onlyOffice/configuration`).pipe( tap((data: any) => { if (data.enabled) { + + const serverUriArr = data.serverUri.split('/'); const protocol = data.serverSsl ? 'https://' : 'http://'; + const domain = data.serverUri.split('/')[0]; + const path = serverUriArr.slice(1).join('/'); const port = data.serverPort ? `:${data.serverPort}` : ':80'; - this.onlyOfficeUrl = `${protocol}${data.serverUri}${port}`; + + const serverUri = [domain + port, path].join('/'); + + this.onlyOfficeUrl = `${protocol}${serverUri}`; this.appUrl = data.coreUrl; resolve(true); } else { -- GitLab