[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-3' - loleaflet/js

[Ashod Nakashian (via logerrit)]

 loleaflet/js/global.js |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 98c9145edae6089120b8adb937512f6509ab4524
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon May 18 23:26:35 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 19 11:21:51 2020 +0200

    leaflet: restore reuse_cookies to the url
    
    Reuse cookies are captured on file-serving the
    loleaflet.html, whereupon they are injected
    into it before serving as part of the document
    load url. They show up as &reuse_cookies=
    in the url embedded in loleaflet.html.
    When loading the document, and creating
    the session, the cookies received via
    reuse_cookies is stored and set in each
    WOPI http invocation.
    
    This restores creating reuse_cookies in the
    URL. It was inadvertently dropped after some cleanup.
    
    Change-Id: I6de8ddb58e7f43566a08c22327dbc4b7a1207388
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94452
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index c5546f7c2..20c7a8bbb 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -519,6 +519,9 @@
 		else if (global.accessHeader !== '') {
 			wopiParams = { 'access_header': global.accessHeader };
 		}
+		else if (global.reuseCookies !== '') {
+			wopiParams = { 'reuse_cookies': global.reuseCookies };
+		}
 		if (wopiParams) {
 			docParams = Object.keys(wopiParams).map(function(key) {
 				return encodeURIComponent(key) + '=' + encodeURIComponent(wopiParams[key]);