From 92576cd89c4f4426df6fcb38acbcc70d2c618088 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 2 Sep 2013 17:38:35 +0200 Subject: [PATCH] Set oc_requesttoken as token to the webodf server proxy object (and have it used in every call) --- js/documents.js | 1 + js/editor/server/pullbox/Server.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/documents.js b/js/documents.js index 915391f0..5412bd0b 100644 --- a/js/documents.js +++ b/js/documents.js @@ -71,6 +71,7 @@ var documentsMain = { runtime.assert(response.es_id, "invalid session id."); memberId = response.member_id; documentsMain.webodfServerInstance = serverFactory.createServer(); + documentsMain.webodfServerInstance.setToken(oc_requesttoken); documentsMain.webodfEditorInstance = new Editor({unstableFeaturesEnabled: documentsMain.useUnstable}, documentsMain.webodfServerInstance, serverFactory); // load the document and get called back when it's live diff --git a/js/editor/server/pullbox/Server.js b/js/editor/server/pullbox/Server.js index 418716d1..970da129 100644 --- a/js/editor/server/pullbox/Server.js +++ b/js/editor/server/pullbox/Server.js @@ -89,6 +89,9 @@ runtime.log("Sending message to server: "+messageString); // do the request xhr.open('POST', args.url, true); + if (token) { + xhr.setRequestHeader("requesttoken", token); + } xhr.onreadystatechange = handleResult; // ArrayBufferView will have an ArrayBuffer property, in WebKit, XHR can send() // an ArrayBuffer, In Firefox, one must use sendAsBinary with a string @@ -266,7 +269,9 @@ runtime.log("Sending message to server: "+messageString); // do the request xhr.open('POST', args.sessionStateToFileUrl, true); - xhr.setRequestHeader("requesttoken", oc_requesttoken); + if (token) { + xhr.setRequestHeader("requesttoken", token); + } xhr.setRequestHeader("webodf-session-id", sessionId); xhr.setRequestHeader("webodf-member-id", memberId); xhr.setRequestHeader("webodf-session-revision", seqHead);