diff --git a/modules/content_management/dist/lib/commons-logging-1.2.jar b/modules/content_management/dist/lib/commons-logging-1.2.jar index 055db3d99b07cca6ce7c15237f9254e0fe53feff..07a3dbff8159276813a71f858edf1bf01615976a 100755 Binary files a/modules/content_management/dist/lib/commons-logging-1.2.jar and b/modules/content_management/dist/lib/commons-logging-1.2.jar differ diff --git a/modules/content_management/dist/lib/httpclient-4.5.2.jar b/modules/content_management/dist/lib/httpclient-4.5.2.jar index 086f865df599040db309266fda30a5beaa27d672..18bd2b30e3d9ad5474ba7c994a91854fbafc2b3a 100755 Binary files a/modules/content_management/dist/lib/httpclient-4.5.2.jar and b/modules/content_management/dist/lib/httpclient-4.5.2.jar differ diff --git a/modules/content_management/dist/lib/httpclient-cache-4.5.2.jar b/modules/content_management/dist/lib/httpclient-cache-4.5.2.jar index 5471ecb147e8012568c3fa7918559aae61f96dcd..caa81a2c57d91ebb6104e20dd58dd60a0627b415 100755 Binary files a/modules/content_management/dist/lib/httpclient-cache-4.5.2.jar and b/modules/content_management/dist/lib/httpclient-cache-4.5.2.jar differ diff --git a/modules/content_management/dist/lib/httpclient-win-4.5.2.jar b/modules/content_management/dist/lib/httpclient-win-4.5.2.jar index b3df744854b10c762b50797a47958dd3ad9cda24..85f9712040c8ca10025436621a427f8525325a6f 100755 Binary files a/modules/content_management/dist/lib/httpclient-win-4.5.2.jar and b/modules/content_management/dist/lib/httpclient-win-4.5.2.jar differ diff --git a/modules/content_management/dist/lib/httpcore-4.4.4.jar b/modules/content_management/dist/lib/httpcore-4.4.4.jar index f34fe0a36fefb6659b824e7a1fd5d842d8f01869..d729baa5ece4d188455540dfd20fcf7ab1f7d4a5 100755 Binary files a/modules/content_management/dist/lib/httpcore-4.4.4.jar and b/modules/content_management/dist/lib/httpcore-4.4.4.jar differ diff --git a/modules/content_management/dist/lib/plugin.jar b/modules/content_management/dist/lib/plugin.jar index 5cb7513f27541aeda5703ab57f49a35d992c5ec6..a25cb078a8edb79656a6bb7b9191b76733caaaee 100755 Binary files a/modules/content_management/dist/lib/plugin.jar and b/modules/content_management/dist/lib/plugin.jar differ diff --git a/modules/content_management/dist/maarchCM.jar b/modules/content_management/dist/maarchCM.jar index df964884360f8ea19dc82ef40702cf1462705004..e7957bee191245ee31971ea215b35e6871fc1444 100755 Binary files a/modules/content_management/dist/maarchCM.jar and b/modules/content_management/dist/maarchCM.jar differ diff --git a/modules/content_management/dist/not_signed/maarchCM.jar b/modules/content_management/dist/not_signed/maarchCM.jar index 44b1a25611ed833ed6a530e10008f952092bcc4a..f38c21e4d71a756943e9ac0b219a301ba0455593 100755 Binary files a/modules/content_management/dist/not_signed/maarchCM.jar and b/modules/content_management/dist/not_signed/maarchCM.jar differ diff --git a/src/app/contentManagement/controllers/JnlpController.php b/src/app/contentManagement/controllers/JnlpController.php index ca3a166f94bbf43e466796a581180deb65ca1ba8..36552f5dfd883b355a42a8b70497fc7719c24de3 100755 --- a/src/app/contentManagement/controllers/JnlpController.php +++ b/src/app/contentManagement/controllers/JnlpController.php @@ -144,6 +144,7 @@ class JnlpController $tagArg10 = $jnlpDocument->createElement('argument', 'false'); //ConvertPdf //Useless $tagArg11 = $jnlpDocument->createElement('argument', 'false'); //OnlyConvert //Useless $tagArg12 = $jnlpDocument->createElement('argument', 0); //HashFile //Useless + $tagArg13 = $jnlpDocument->createElement('argument', $body['authToken']); //Token authentication $tagJnlp->appendChild($tagInformation); @@ -177,6 +178,7 @@ class JnlpController $tagApplication->appendChild($tagArg10); $tagApplication->appendChild($tagArg11); $tagApplication->appendChild($tagArg12); + $tagApplication->appendChild($tagArg13); $jnlpDocument->appendChild($tagJnlp); diff --git a/src/frontend/app/administration/template/template-administration.component.ts b/src/frontend/app/administration/template/template-administration.component.ts index 6c3a4d038bf804d87e504fd0810d55c264a14add..4936a4d7f7828513fcf73d9ac8aeb1e2bac4c9f9 100755 --- a/src/frontend/app/administration/template/template-administration.component.ts +++ b/src/frontend/app/administration/template/template-administration.component.ts @@ -14,6 +14,7 @@ import { TemplateFileEditorModalComponent } from './templateFileEditorModal/temp import { DomSanitizer } from '@angular/platform-browser'; import { AlertComponent } from '../../../plugins/modal/alert.component'; import { MaarchFlatTreeComponent } from '../../../plugins/tree/maarch-flat-tree.component'; +import { AuthService } from '@service/auth.service'; declare var tinymce: any; @@ -99,7 +100,8 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy { public appService: AppService, private viewContainerRef: ViewContainerRef, public functionsService: FunctionsService, - public translate: TranslateService + public translate: TranslateService, + private authService: AuthService ) { } ngOnInit(): void { @@ -377,7 +379,7 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy { editorOptions.objectType = 'templateModification'; editorOptions.objectId = this.template.id; } - + editorOptions.authToken = this.authService.getToken(), this.launchJavaEditor(editorOptions); } else if (this.headerService.user.preferences.documentEdition !== 'java') { this.launchIntegratedEditor(editorOptions, this.headerService.user.preferences.documentEdition); diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts index 1ff5482a7bb826866799802b4fe0c58cded2aa29..ffddd90402f606a4e08376a725196b6ab1bf3cdf 100755 --- a/src/frontend/app/viewer/document-viewer.component.ts +++ b/src/frontend/app/viewer/document-viewer.component.ts @@ -18,6 +18,7 @@ import { PrivilegeService } from '@service/privileges.service'; import { VisaWorkflowModalComponent } from '../visa/modal/visa-workflow-modal.component'; import { of } from 'rxjs'; import { CollaboraOnlineViewerComponent } from '../../plugins/collabora-online/collabora-online-viewer.component'; +import { AuthService } from '@service/auth.service'; @Component({ selector: 'app-document-viewer', @@ -150,6 +151,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy { private sortPipe: SortPipe, public functions: FunctionsService, public privilegeService: PrivilegeService, + private authService: AuthService ) { (<any>window).pdfWorkerSrc = '../node_modules/pdfjs-dist/build/pdf.worker.min.js'; } @@ -753,6 +755,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy { objectType: 'attachmentCreation', objectId: template.id, cookie: document.cookie, + authToken : this.authService.getToken(), data: this.resourceDatas, }; this.editInProgress = true; @@ -809,6 +812,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy { objectType: 'attachmentModification', objectId: this.resId, cookie: document.cookie, + authToken : this.authService.getToken(), data: this.resourceDatas, }; this.editInProgress = true;