From d397c3fa54087f605ff4f6feae26838548e01c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@collabora.com>
Date: Mon, 18 Sep 2023 11:31:23 -0400
Subject: [PATCH] nodejs: use let and const instead of var

Close #16
---
 webapp/nodejs/app.js            | 18 ++++++++-------
 webapp/nodejs/bin/www           | 34 ++++++++++++++--------------
 webapp/nodejs/public/index.html | 16 +++++++-------
 webapp/nodejs/routes/index.js   | 39 +++++++++++++++++----------------
 webapp/nodejs/routes/wopi.js    |  8 ++++---
 5 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/webapp/nodejs/app.js b/webapp/nodejs/app.js
index 99893e6..9dc6536 100644
--- a/webapp/nodejs/app.js
+++ b/webapp/nodejs/app.js
@@ -1,16 +1,18 @@
-var express = require('express');
-var path = require('path');
-var logger = require('morgan');
-var bodyParser = require('body-parser');
+'use strict';
 
-var indexRouter = require('./routes/index');
-var wopiRouter = require('./routes/wopi');
+let express = require('express');
+let path = require('path');
+let logger = require('morgan');
+let bodyParser = require('body-parser');
+
+let indexRouter = require('./routes/index');
+let wopiRouter = require('./routes/wopi');
 
 // maximum request body size handled by the bodyParser package
 // increase it if you need to handle larger files
-var maxDocumentSize = '100kb';
+const maxDocumentSize = '100kb';
 
-var app = express();
+let app = express();
 
 app.use(logger('dev'));
 app.use(express.json());
diff --git a/webapp/nodejs/bin/www b/webapp/nodejs/bin/www
index 88b7e3b..624da94 100755
--- a/webapp/nodejs/bin/www
+++ b/webapp/nodejs/bin/www
@@ -1,22 +1,24 @@
 #!/usr/bin/env node
 
-var app = require('../app');
-var debug = require('debug')('untitled:server');
-var http = require('http');
-var https = require('https');
-var fs = require('fs');
-var env = require('process').env;
+'use strict';
 
-var port = normalizePort(process.env.PORT || '3000');
+let app = require('../app');
+let debug = require('debug')('untitled:server');
+let http = require('http');
+let https = require('https');
+let fs = require('fs');
+let env = require('process').env;
+
+let port = normalizePort(process.env.PORT || '3000');
 app.set('port', port);
 
-var server;
-var proto;
+let server;
+let proto;
 
-var hasCerts = env["SSL_KEY_FILE"] && env["SSL_CRT_FILE"];
+let hasCerts = env["SSL_KEY_FILE"] && env["SSL_CRT_FILE"];
 if (hasCerts) {
-  var privateKey = fs.readFileSync(env["SSL_KEY_FILE"]);
-  var certificate = fs.readFileSync(env["SSL_CRT_FILE"]);
+  let privateKey = fs.readFileSync(env["SSL_KEY_FILE"]);
+  let certificate = fs.readFileSync(env["SSL_CRT_FILE"]);
 
   server = https.createServer({
     key: privateKey,
@@ -32,7 +34,7 @@ server.on('error', onError);
 server.on('listening', onListening);
 
 function normalizePort(val) {
-  var port = parseInt(val, 10);
+  let port = parseInt(val, 10);
 
   if (isNaN(port)) {
     // named pipe
@@ -52,7 +54,7 @@ function onError(error) {
     throw error;
   }
 
-  var bind = typeof port === 'string'
+  let bind = typeof port === 'string'
     ? 'Pipe ' + port
     : 'Port ' + port;
 
@@ -75,8 +77,8 @@ function onError(error) {
 }
 
 function onListening() {
-  var addr = server.address();
-  var bind = typeof addr === 'string'
+  let addr = server.address();
+  let bind = typeof addr === 'string'
     ? 'pipe ' + addr
     : `${proto}://localhost:${addr.port}/`;
   console.log(`Listening on ${bind}`);
diff --git a/webapp/nodejs/public/index.html b/webapp/nodejs/public/index.html
index fec9dcb..f45f592 100644
--- a/webapp/nodejs/public/index.html
+++ b/webapp/nodejs/public/index.html
@@ -27,12 +27,12 @@
 
 <script type="text/javascript">
 
-var locationOrigin = window.location.origin;
-var scheme = locationOrigin.startsWith('https') ? 'https' : 'http';
+let locationOrigin = window.location.origin;
+let scheme = locationOrigin.startsWith('https') ? 'https' : 'http';
 
 $("#collabora-online-server-form").submit(function(event) {
   event.preventDefault();
-  var wopiClientHost = $("#collabora-online-server").val();
+  let wopiClientHost = $("#collabora-online-server").val();
   if (!wopiClientHost) {
     alert('No server address entered');
     return;
@@ -45,18 +45,18 @@
     alert('Collabora Online server address scheme does not match the current page url scheme');
     return;
   }
-  var wopiSrc = locationOrigin + '/wopi/files/1';
+  let wopiSrc = locationOrigin + '/wopi/files/1';
   $.getJSON("/collaboraUrl?server=" + wopiClientHost)
     .done(function( resp ) {
-      var wopiClientUrl = resp['url'];
-      var accessToken =  resp['token'];
-      var wopiUrl = wopiClientUrl + 'WOPISrc=' + wopiSrc;
+      let wopiClientUrl = resp['url'];
+      let accessToken =  resp['token'];
+      let wopiUrl = wopiClientUrl + 'WOPISrc=' + wopiSrc;
       $('#collabora-submit-form').attr('action', wopiUrl)
       $('#access-token').attr('value', accessToken);
       $('#collabora-submit-form').submit();
     })
     .fail(function( jqxhr, textStatus, error ) {
-      var err = textStatus + ", " + error;
+      let err = textStatus + ", " + error;
       console.log( "Request Failed: " + err );
       alert('Not possible to retrieve the complete Collabora Online url');
     });
diff --git a/webapp/nodejs/routes/index.js b/webapp/nodejs/routes/index.js
index 71e15dc..a0afbf7 100644
--- a/webapp/nodejs/routes/index.js
+++ b/webapp/nodejs/routes/index.js
@@ -1,9 +1,11 @@
-var express = require('express');
-var router = express.Router();
-var http = require('http');
-var https = require('https');
-var Dom = require('@xmldom/xmldom').DOMParser;
-var xpath = require('xpath');
+'use strict';
+
+let express = require('express');
+let router = express.Router();
+let http = require('http');
+let https = require('https');
+let Dom = require('@xmldom/xmldom').DOMParser;
+let xpath = require('xpath');
 
 
 router.get('/', function(req, res) {
@@ -11,42 +13,41 @@ router.get('/', function(req, res) {
 });
 
 router.get('/collaboraUrl', function(req, res) {
-    var collaboraOnlineHost = req.query.server;
-    var httpClient = collaboraOnlineHost.startsWith('https') ? https : http;
-    var data = '';
-    var request = httpClient.get(collaboraOnlineHost + '/hosting/discovery', function(response) {
+    let collaboraOnlineHost = req.query.server;
+    let httpClient = collaboraOnlineHost.startsWith('https') ? https : http;
+    let data = '';
+    let request = httpClient.get(collaboraOnlineHost + '/hosting/discovery', function(response) {
         response.on('data', function(chunk) { data += chunk.toString(); });
         response.on('end', function() {
-            var err;
             if (response.statusCode !== 200) {
-                err = 'Request failed. Satus Code: ' + response.statusCode;
+                let err = 'Request failed. Satus Code: ' + response.statusCode;
                 response.resume();
                 res.status(response.statusCode).send(err);
                 console.log(err)
                 return;
             }
             if (!response.complete) {
-                err = 'No able to retrieve the discovery.xml file from the Collabora Online server with the submitted address.';
+                let err = 'No able to retrieve the discovery.xml file from the Collabora Online server with the submitted address.';
                 res.status(404).send(err);
                 console.log(err);
                 return;
             }
-            var doc = new Dom().parseFromString(data);
+            let doc = new Dom().parseFromString(data);
             if (!doc) {
-                err = 'The retrieved discovery.xml file is not a valid XML file'
+                let err = 'The retrieved discovery.xml file is not a valid XML file'
                 res.status(404).send(err)
                 console.log(err);
                 return;
             }
-            var mimeType = 'text/plain';
-            var nodes = xpath.select("/wopi-discovery/net-zone/app[@name='" + mimeType + "']/action", doc);
+            let mimeType = 'text/plain';
+            let nodes = xpath.select("/wopi-discovery/net-zone/app[@name='" + mimeType + "']/action", doc);
             if (!nodes || nodes.length !== 1) {
-                err = 'The requested mime type is not handled'
+                let err = 'The requested mime type is not handled'
                 res.status(404).send(err);
                 console.log(err);
                 return;
             }
-            var onlineUrl = nodes[0].getAttribute('urlsrc');
+            let onlineUrl = nodes[0].getAttribute('urlsrc');
             res.json({
                 url: onlineUrl,
                 token: 'test'
diff --git a/webapp/nodejs/routes/wopi.js b/webapp/nodejs/routes/wopi.js
index 1361b40..186cea6 100644
--- a/webapp/nodejs/routes/wopi.js
+++ b/webapp/nodejs/routes/wopi.js
@@ -1,5 +1,7 @@
-var express = require('express');
-var router = express.Router();
+'use strict';
+
+let express = require('express');
+let router = express.Router();
 
 /* *
  *  wopi CheckFileInfo endpoint
@@ -35,7 +37,7 @@ router.get('/files/:fileId/contents', function(req, res) {
 	// in a real case you should use the file id
 	// for retrieving the file from the storage and
 	// send back the file content as response
-	var fileContent = 'Hello world!';
+	const fileContent = 'Hello world!';
 	res.send(fileContent);
 });