nodejs: mime v2 lookup renamed to getType (0a2056b1b1)

web/documentserver-example/nodejs/Dockerfile

@@ -1,28 +0,0 @@
-FROM node:buster
-LABEL maintainer Ascensio System SIA <support@onlyoffice.com>
-
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8 \
-    NODE_ENV=production-linux \
-    NODE_CONFIG_DIR=/etc/onlyoffice/documentserver-example/
-
-WORKDIR /var/www/onlyoffice/documentserver-example/
-COPY . /var/www/onlyoffice/documentserver-example/
-
-RUN groupadd --system --gid 1001 ds && \
-    useradd --system -g ds --no-create-home --shell /sbin/nologin --uid 1001 ds && \
-    chown -R ds:ds /var/www/onlyoffice/documentserver-example/ && \
-    mkdir -p /var/lib/onlyoffice/documentserver-example/ && \
-    chown -R ds:ds /var/lib/onlyoffice/ && \
-    mv files /var/lib/onlyoffice/documentserver-example/ && \
-    mkdir -p /etc/onlyoffice/documentserver-example/ && \
-    chown -R ds:ds /etc/onlyoffice/ && \
-    mv config/* /etc/onlyoffice/documentserver-example/ && \
-    npm install
-
-EXPOSE 3000
-
-USER ds
-
-ENTRYPOINT /var/www/onlyoffice/documentserver-example/docker-entrypoint.sh npm start

web/documentserver-example/nodejs/docker-entrypoint.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-export NODE_CONFIG='{
-	"server": {
-		"siteUrl": "'${DS_URL:-"/"}'",
-		"token": {
-			"enable": '${JWT_ENABLED:-false}',
-			"secret": "'${JWT_SECRET:-secret}'",
-			"authorizationHeader": "'${JWT_HEADER:-Authorization}'"
-		}
-	}
-}'
-exec "$@"

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

@@ -75,8 +75,7 @@ documentService.getConvertedUri = function (documentUri, fromExtension, toExtens
         params.token = documentService.getToken(params);
     }
 
-    //parse url to allow request by relative url after https://github.com/node-modules/urllib/pull/321/commits/514de1924bf17a38a6c2db2a22a6bc3494c0a959
-    urllib.request(urlModule.parse(uri),
+    urllib.request(uri,
         {
             method: "POST",
             headers: headers,
@@ -181,8 +180,7 @@ documentService.commandRequest = function (method, documentRevisionId, callback)
         params.token = documentService.getToken(params);
     }
 
-    //parse url to allow request by relative url after https://github.com/node-modules/urllib/pull/321/commits/514de1924bf17a38a6c2db2a22a6bc3494c0a959
-    urllib.request(urlModule.parse(uri),
+    urllib.request(uri,
         {
             method: "POST",
             headers: headers,
@@ -205,11 +203,11 @@ documentService.checkJwtHeader = function (req) {
   return decoded;
 }
 
-documentService.fillJwtByUrl = function (uri, opt_dataObject) {
+documentService.fillJwtByUrl = function (uri, opt_dataObject, opt_iss, opt_payloadhash) {
   var parseObject = urlModule.parse(uri, true);
-  var payload = {query: parseObject.query, payload: opt_dataObject};
+  var payload = {query: parseObject.query, payload: opt_dataObject, payloadhash: opt_payloadhash};
 
-  var options = {algorithm: cfgSignatureSecretAlgorithmRequest, expiresIn: cfgSignatureSecretExpiresIn};
+  var options = {algorithm: cfgSignatureSecretAlgorithmRequest, expiresIn: cfgSignatureSecretExpiresIn, issuer: opt_iss};
   return jwt.sign(payload, cfgSignatureSecret, options);
 }