Merge pull request #97 from FieldDB/fix/lint

fix lint

Author: cesine

.github/workflows/node.js.yml

@@ -27,7 +27,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
     - run: npm ci
-    - run: npm run lint:ci || echo "Lint failed"
+    - run: npm run lint:ci
     - run: DEBUG=replay* npm run coverage
 
     - name: Coveralls

.gitignore

@@ -23,7 +23,6 @@ audio_stimuli
 proguard.cfg
 
 node_modules
-bin
 gen
 
 # Node #

Dockerfile

@@ -14,4 +14,4 @@ ENV NODE_ENV=beta
 
 EXPOSE 3183
 
-CMD [ "node", "bin/www" ]
+CMD [ "node", "bin/www.js" ]

bin/www bin/www.jsbin/www renamed to bin/www.js

@@ -1,31 +1,33 @@
 #!/usr/bin/env node
-var config = require('config');
-var https = require('https');
-var url = require('url');
+const config = require('config');
+const https = require('https');
+
+let server;
+const service = require('../auth_service');
 
-var server;
-var service = require('../auth_service');
 service.set('port', config.httpsOptions.port);
 
-var whenReady = new Promise(function(resolve) {
+const whenReady = new Promise((resolve) => {
   if (process.env.NODE_ENV === 'production') {
-    server = service.listen(config.httpsOptions.port, function() {
+    server = service.listen(config.httpsOptions.port, () => {
+      // eslint-disable-next-line no-console
       console.log('Running in production mode behind an Nginx proxy, Listening on http port %d', server.address().port);
       resolve(server);
     });
   } else {
     /**
      * Ask https to turn on the service
      */
-    server = https.createServer(config.httpsOptions, service).listen(service.get('port'), function() {
-      console.log('HTTPS Express server listening on https://localhost:' + server.address().port);
+    server = https.createServer(config.httpsOptions, service).listen(service.get('port'), () => {
+      // eslint-disable-next-line no-console
+      console.log(`HTTPS Express server listening on https://localhost:${server.address().port}`);
       resolve(server);
     });
   }
 });
 
 module.exports = {
   ready: whenReady,
-  server: server,
-  service: service,
+  server,
+  service,
 };

config/default.js

@@ -69,17 +69,17 @@ module.exports = {
       from: 'none@localhost', // sender address
       to: '', // list of receivers
       subject: 'Welcome to localhost!', // Subject line
-      text: 'Your username is: ', // plaintext // body
-      html: 'Your username is: ',
+      text: 'Your username is: insert_username', // plaintext // body
+      html: 'Your username is: insert_username',
     };
   },
   welcomeToCorpusTeamMailOptions: function welcomeToCorpusTeamMailOptions() {
     return {
       from: 'none@localhost', // sender address
       to: '', // list of receivers
       subject: '[LingSync.org] Someone has granted you access to their corpus', // Subject line
-      text: "The new corpus's identifier is: ", // plaintext // body
-      html: "The new corpus's identifier is: ",
+      text: "The new corpus's identifier is: insert_corpus_identifier", // plaintext // body
+      html: "The new corpus's identifier is: insert_corpus_identifier",
     };
   },
   suspendedUserMailOptions: function suspendedUserMailOptions() {
@@ -96,17 +96,17 @@ module.exports = {
       from: 'none@localhost', // sender address
       to: '', // list of receivers
       subject: 'Welcome to localhost!', // Subject line
-      text: 'Your username is: ', // plaintext // body
-      html: 'Your username is: ',
+      text: 'Your username is: insert_username', // plaintext // body
+      html: 'Your username is: insert_username',
     };
   },
   welcomeToCorpusTeamMailOptionsPhophlo: function welcomeToCorpusTeamMailOptionsPhophlo() {
     return {
       from: 'none@localhost', // sender address
       to: '', // list of receivers
       subject: '[LingSync.org] Someone has granted you access to their corpus', // Subject line
-      text: "The new corpus's identifier is: ", // plaintext // body
-      html: "The new corpus's identifier is: ",
+      text: "The new corpus's identifier is: insert_corpus_identifier", // plaintext // body
+      html: "The new corpus's identifier is: insert_corpus_identifier",
     };
   },
   suspendedUserMailOptionsPhophlo: function suspendedUserMailOptionsPhophlo() {