Fix Bug 33666 - user name is undefined

web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs

@@ -26,6 +26,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Configuration;
@@ -213,20 +214,26 @@ namespace OnlineEditorsExampleMVC.Helpers
                                      : documentRevisionId;
             documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
-
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
+            var req = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
+            req.Method = "POST";
+            req.ContentType = "text/json";
             req.Timeout = ConvertTimeout;
 
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            req.ContentLength = bytes.Length;
+            using (var requestStream = req.GetRequestStream())
+            {
+                requestStream.Write(bytes, 0, bytes.Length);
+            }
+
             Stream stream = null;
             var countTry = 0;
             while (countTry < MaxTry)

web/documentserver-example/csharp/DocumentConverter.cs

@@ -23,6 +23,7 @@
  *
 */
 
+using System.Text;
 using OnlineEditorsExample;
 using System;
 using System.IO;
@@ -220,22 +221,28 @@ namespace ASC.Api.DocumentConverter
                                      : documentRevisionId;
             documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
-
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
+            var req = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
+            req.Method = "POST";
+            req.ContentType = "text/json";
             req.Timeout = ConvertTimeout;
 
-            Stream stream = null;
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            req.ContentLength = bytes.Length;
+            using (var requestStream = req.GetRequestStream())
+            {
+                requestStream.Write(bytes, 0, bytes.Length);
+            }
+
             var countTry = 0;
+            Stream stream = null;
 
             // hack. http://ubuntuforums.org/showthread.php?t=1841740
             if (_Default.IsMono)

web/documentserver-example/nodejs/app.js

@@ -234,7 +234,7 @@ app.get("/convert", function (req, res) {
     try {
         if (configServer.get('convertedDocs').indexOf(fileExt) != -1) {
             var key = documentService.generateRevisionId(fileUri);
-            documentService.getConvertedUriAsync(fileUri, fileExt, internalFileExt, key, callback);
+            documentService.getConvertedUri(fileUri, fileExt, internalFileExt, key, true, callback);
         } else {
             writeResult(fileName, null, null);
         }
@@ -290,9 +290,7 @@ app.post("/track", function (req, res) {
 
     var processTrack = function (response, body, fileName, userAddress) {
 
-        var processSave = function (body, fileName, userAddress, newVersion) {
-
-            var downloadUri = body.url;
+        var processSave = function (downloadUri, body, fileName, userAddress, resp, newVersion) {
             var curExt = fileUtility.getFileExtension(fileName);
             var downloadExt = fileUtility.getFileExtension(downloadUri);
 
@@ -300,7 +298,10 @@ app.post("/track", function (req, res) {
                 var key = documentService.generateRevisionId(downloadUri);
 
                 try {
-                    downloadUri = documentService.getConvertedUri(downloadUri, downloadExt, curExt, key);
+                    documentService.getConvertedUriSync(downloadUri, downloadExt, curExt, key, function(dUri){
+                        processSave(dUri, body, fileName, userAddress, resp, newVersion)
+                    });
+                    return;
                 } catch (ex) {
                     console.log(ex);
                     fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress)
@@ -348,6 +349,9 @@ app.post("/track", function (req, res) {
             } catch (ex) {
                 console.log(ex);
             }
+
+            response.write("{\"error\":0}");
+            response.end();
         }
 
         if (body.status == 1) { //Editing
@@ -362,14 +366,14 @@ app.post("/track", function (req, res) {
                     }
                 }
             }
-        } else if (body.status == 2 || body.status == 3) { //MustSave, Corrupted
-            processSave(body, fileName, userAddress, true);
-        } else if (body.status == 6 || body.status == 7) { //MustForceSave, CorruptedForceSave
-            processSave(body, fileName, userAddress);
-        }
 
-        response.write("{\"error\":0}");
-        response.end();
+            response.write("{\"error\":0}");
+            response.end();
+        } else if (body.status == 2 || body.status == 3) { //MustSave, Corrupted
+            processSave(body.url, body, fileName, userAddress, response, true);
+        } else if (body.status == 6 || body.status == 7) { //MustForceSave, CorruptedForceSave
+            processSave(body.url, body, fileName, userAddress, response);
+        }
     }
 
     var readbody = function (request, response, fileName, userAddress) {

web/documentserver-example/nodejs/helpers/documentService.js

@@ -25,7 +25,6 @@
 
 var path = require("path");
 var urllib = require("urllib");
-var syncRequest = require("sync-request");
 var xml2js = require("xml2js");
 var fileUtility = require("./fileUtility");
 var guidManager = require("./guidManager");
@@ -34,52 +33,71 @@ var siteUrl = configServer.get('siteUrl');
 
 var documentService = {};
 
-documentService.convertParams = "?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}";
-documentService.commandParams = "?c={0}&key={1}";
 documentService.userIp = null;
 
-documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    var xml = documentService.sendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId);
+documentService.getConvertedUriSync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+    documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
 
-    var res = documentService.getResponseUri(xml);
-
-    return res.value;
+    documentService.getConvertedUri(documentUri, fromExtension, toExtension, documentRevisionId, false, function (err, data) {
+        if (err) {
+            callback();
+            return;
+        }
+        var res = documentService.getResponseUri(data);
+        callback(res.value);
+    });
 };
 
-documentService.getConvertedUriAsync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId, async, callback) {
     fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
 
     var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
 
     documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
 
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
+    var params = {
+        async: async,
+        url: documentUri,
+        outputtype: toExtension.replace(".", ""),
+        filetype: fromExtension.replace(".", ""),
+        title: title,
+        key: documentRevisionId
+    };
 
-    urllib.request(siteUrl + configServer.get('converterUrl') + params, callback);
+    urllib.request(siteUrl + configServer.get('converterUrl'),
+        {
+            method: "POST",
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: params
+        },
+        callback);
 };
 
-documentService.getExternalUri = function (fileStream, contentLength, contentType, documentRevisionId) {
-    var params = documentService.convertParams.format("", "", "", "", documentRevisionId);
+documentService.getExternalUri = function (fileStream, contentLength, contentType, documentRevisionId, callback) {
+    documentRevisionId = documentService.generateRevisionId(documentRevisionId);
 
-    var urlTostorage = siteUrl + configServer.get('storageUrl') + params;
+    var urlTostorage = siteUrl + configServer.get('storageUrl') + "?key=" + documentRevisionId;
 
-    var response = syncRequest("POST", urlTostorage, {
-        headers: {
-            "Content-Type": contentType == null ? "application/octet-stream" : contentType,
-            "Content-Length": contentLength.toString(),
-            "charset": "utf-8"
+    urllib.request(urlTostorage,
+        {
+            method: "POST",
+            headers: {
+                "Content-Type": contentType == null ? "application/octet-stream" : contentType,
+                "Content-Length": contentLength.toString(),
+                "charset": "utf-8"
+            },
+            data: fileStream
         },
-        body: fileStream
-    });
-
-    var res = documentService.getResponseUri(response.body.toString());
-
-    return res.value;
+        function (err, data) {
+            if (err) {
+                callback();
+                return;
+            }
+            var res = documentService.getResponseUri(data);
+            callback(res.value);
+        });
 };
 
 documentService.generateRevisionId = function (expectedKey) {
@@ -92,24 +110,6 @@ documentService.generateRevisionId = function (expectedKey) {
     return key.substring(0, Math.min(key.length, 20));
 };
 
-documentService.sendRequestToConvertService = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
-
-    var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
-
-    documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
-
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
-
-    var res = syncRequest("GET", siteUrl + configServer.get('converterUrl') + params);
-    return res.getBody("utf8");
-};
-
 documentService.processConvertServiceResponceError = function (errorCode) {
     var errorMessage = "";
     var errorMessageTemplate = "Error occurred in the ConvertService: ";
@@ -200,14 +200,22 @@ documentService.convertXmlStringToJson = function (xml) {
     return res;
 };
 
-documentService.commandRequest = function (method, documentRevisionId) {
+documentService.commandRequest = function (method, documentRevisionId, callback) {
     documentRevisionId = documentService.generateRevisionId(documentRevisionId);
-    var params = documentService.commandParams.format(
-    method,
-    documentRevisionId);
+    var params = {
+        c: method,
+        key: documentRevisionId
+    };
 
-    var res = syncRequest("GET", siteUrl + configServer.get('commandUrl') + params).getBody("utf8");
-    return JSON.parse(res).error;
+    urllib.request(siteUrl + configServer.get('commandUrl'),
+        {
+            method: "POST",
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: params
+        },
+        callback);
 };
 
 module.exports = documentService;

web/documentserver-example/nodejs/public/javascripts/jscript.js

@@ -25,12 +25,12 @@
 
 var language;
 var userid;
-var name;
+var username;
 
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
-    name = getUrlVars()["name"];
+    username = getUrlVars()["name"];
     userid = getUrlVars()["userid"];
     language = getUrlVars()["lang"];
 
@@ -41,26 +41,26 @@ if (typeof jQuery != "undefined") {
 
 
     jq("#language").change(function() {
-        var name = jq('#user option:selected').text();
-        window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&name=" + name;
+        var username = jq('#user option:selected').text();
+        window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&name=" + username;
     });
-    
+
 
     if ("" != userid && undefined != userid)
         jq("#user").val(userid);
     else
         userid = jq("#user").val();
 
-    if ("" != name && undefined != name) {
-        name=getUrlVars()["name"];
+    if ("" != username && undefined != username) {
+        username = getUrlVars()["name"];
     }
     else {
-        name = jq('#user option:selected').text();
+        username = jq('#user option:selected').text();
     }
 
     jq("#user").change(function() {
-        var name = jq('#user option:selected').text();
-        window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&name=" + name;
+        var username = jq('#user option:selected').text();
+        window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&name=" + username;
     });
 
     jq(function () {
@@ -198,7 +198,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -207,7 +207,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -216,7 +216,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");

web/documentserver-example/php/functions.php

@@ -100,23 +100,6 @@ function DoUpload($fileUri) {
 }
 
 
-function generateUrlToConverter($document_uri, $from_extension, $to_extension, $title, $document_revision_id, $is_async) {
-    $urlToConverterParams = array(
-                                "url" => $document_uri,
-                                "outputtype" => trim($to_extension,'.'),
-                                "filetype" => trim($from_extension, '.'),
-                                "title" => $title,
-                                "key" => $document_revision_id);
-
-    $urlToConverter = $GLOBALS['DOC_SERV_CONVERTER_URL'] . "?" . http_build_query($urlToConverterParams);
-
-    if ($is_async)
-        $urlToConverter = $urlToConverter . "&async=true";
-
-    return $urlToConverter;
-}
-
-
 function generateUrlToStorage($document_uri, $from_extension, $to_extension, $title, $document_revision_id) {
 
     return $GLOBALS['DOC_SERV_STORAGE_URL'] . "?" . http_build_query(
@@ -221,16 +204,29 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
 
     $document_revision_id = GenerateRevisionId($document_revision_id);
 
-    $urlToConverter = generateUrlToConverter($document_uri, $from_extension, $to_extension, $title, $document_revision_id, $is_async);
+    $urlToConverter = $GLOBALS['DOC_SERV_CONVERTER_URL'];
+
+    $data = json_encode(
+        array(
+            "async" => $is_async,
+            "url" => $document_uri,
+            "outputtype" => trim($to_extension,'.'),
+            "filetype" => trim($from_extension, '.'),
+            "title" => $title,
+            "key" => $document_revision_id
+        )
+    );
 
     $response_xml_data;
     $countTry = 0;
 
     $opts = array('http' => array(
-            'method'  => 'GET',
-            'timeout' => $GLOBALS['DOC_SERV_TIMEOUT'] 
-        )
-    );
+                'method'  => 'POST',
+                'timeout' => $GLOBALS['DOC_SERV_TIMEOUT'],
+                'header'=> "Content-type: application/json\r\n",
+                'content' => $data
+            )
+        );
 
     if (substr($urlToConverter, 0, strlen("https")) === "https") {
         $opts['ssl'] = array( 'verify_peer'   => FALSE );