DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set oc_requesttoken as token to the webodf server proxy object (and have it used in every call)

Browse Source
This commit is contained in:
Friedrich W. H. Kossebau 2013-09-02 17:38:35 +02:00
parent 0288fd685e
commit 92576cd89c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/documents.js
View File

@ -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

7
js/editor/server/pullbox/Server.js
View File

@ -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);