Various fixes/improvements

Author: psi-4ward

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-alpine
+FROM node:14-alpine
 
 ENV PSITRANSFER_UPLOAD_DIR=/data \
     NODE_ENV=production
@@ -13,6 +13,7 @@ ADD *.js package.json package-lock.json README.md /app/
 ADD lib /app/lib
 ADD app /app/app
 ADD lang /app/lang
+ADD plugins /app/plugins
 ADD public /app/public
 
 # Rebuild the frontend apps

app/src/Download.vue

@@ -129,7 +129,7 @@
 
       downloadAll(format) {
         document.location.href = this.$root.baseURI
-          + '/files/' + this.sid + '++'
+          + 'files/' + this.sid + '++'
           + MD5(
             this.files
               .filter(f => !f.downloaded || f.metadata.retention !== 'one-time')

app/src/Upload.vue

@@ -19,11 +19,11 @@
         |  {{ $root.lang.login }}
     div(v-else-if="$root.configFetched")
       .well(v-show="state === 'uploaded'")
-        .pull-right.btn-group
+        .pull-right.btn-group.upload-success-btns
           a.btn.btn-primary(@click.prevent="showQrCode" href="#" :title="$root.lang.showQrCode")
             icon.fa-fw(name="qrcode")
             | QR-Code
-          a.btn.btn-primary(@click="sendMail = !sendMail" :title="$root.lang.sendViaMail")
+          a.btn.btn-primary(:href="mailLnk" :title="$root.lang.sendViaMail")
             icon.fa-fw(name="envelope")
             |  {{ $root.lang.email }}
           clipboard.btn.btn-primary(:value='shareUrl' :title="$root.lang.copyToClipboard")
@@ -45,7 +45,6 @@
         .col-sm-7
           files
         .col-sm-5
-          send-mail(v-if="sendMail" style="margin-bottom: 20px")
           settings
           .text-right(v-show='showUploadBtn')
             button#uploadBtn.btn.btn-lg.btn-success(@click="$store.dispatch('upload/upload')")
@@ -63,7 +62,6 @@
 
   import Settings from './Upload/Settings.vue';
   import Files from './Upload/Files.vue';
-  import SendMail from "./Upload/SendMail.vue";
   import Clipboard from './common/Clipboard.vue'
   import 'vue-awesome/icons/cloud-upload-alt';
   import 'vue-awesome/icons/upload';
@@ -78,7 +76,6 @@
   export default {
     name: 'Upload',
     components: {
-      SendMail,
       Settings,
       Files,
       Clipboard,
@@ -88,7 +85,6 @@
       return {
         uploadPassword: '',
         uploadPasswordWrong: null,
-        sendMail: false,
       }
     },
 
@@ -164,3 +160,20 @@
 
   }
 </script>
+
+<style>
+  @media all and (max-width: 500px) {
+    .well {
+      padding: 19px 8px;
+    }
+    .upload-success-btns {
+      width: 100%;
+      margin-bottom: 10px;
+    }
+
+    .upload-success-btns .btn {
+      padding: 7px 5px;
+      font-size: 12px;
+    }
+  }
+</style>

app/src/Upload/SendMail.vue

@@ -59,18 +59,7 @@ const config =  {
   // Limit upload size
   "maxFileSize": null, // Math.pow(2, 30) * 2, // 2GB
   "maxBucketSize": null, // Math.pow(2, 30) * 2, // 10GB
-  "plugins": ['file-downloaded-webhook', 'file-uploaded-webhook', 'mail-notifications'],
-  // Nodemailer smtp transport config: https://nodemailer.com/smtp/
-  "mailer": {
-    "host": "localhost",
-    "port": 25,
-    "secure": false, // true for 465, false for other ports
-    "auth": {
-      "user": "", // generated ethereal user
-      "pass": "", // generated ethereal password
-    },
-  },
-  "mailFrom": "PsiTransfer <[email protected]>",
+  "plugins": ['file-downloaded-webhook', 'file-uploaded-webhook'],
 };
 
 // Load NODE_ENV specific config

config.js

@@ -31,6 +31,7 @@ module.exports = {
   oneTimeDownloadExpired: "Einmal-Download: Datei ist nicht mehr verfügbar.",
   fileSizeExceed: "Dateigröße %% überschreitet das Maximum von %%",
   bucketSizeExceed: "Uploadgröße %% überschreitet das Maximum von %%",
+  mailInvalid: "Das Format der E-Mail Adresse ist ungültig",
   mailTo: "Senden an",
   mailToPlaceholder: "E-Mail Adressen",
   mailFrom: "Meine E-Mail Adresse",

lang/de.js

@@ -31,6 +31,7 @@ module.exports = {
   oneTimeDownloadExpired: "One-Time Download: File is not available anymore.",
   fileSizeExceed: "File size %% exceeds maximum of %%",
   bucketSizeExceed: "Upload size %% exceeds maximum of %%",
+  mailInvalid: "The e-mail address looks faulty",
   mailTo: "Send to",
   mailToPlaceholder: "E-Mail addresses",
   mailFrom: "My E-Mail address",

lang/en.js

@@ -52,6 +52,12 @@ if (config.forceHttps) {
 // Static files
 app.use(`${ config.baseUrl }app`, express.static(path.join(__dirname, '../public/app')));
 app.use(`${ config.baseUrl }assets`, express.static(path.join(__dirname, '../public/assets')));
+// Resolve language
+app.use((req, res, next) => {
+  const lang = req.acceptsLanguages(...Object.keys(config.languages)) || config.defaultLanguage;
+  req.translations = config.languages[lang];
+  next();
+});
 
 // robots.txt
 app.get(`${ config.baseUrl }robots.txt`, (req, res) => {
@@ -68,20 +74,18 @@ app.get(`${ config.baseUrl }`, (req, res) => {
   if (config.uploadAppPath !== `${ config.baseUrl }`) {
     res.status(304).redirect(config.uploadAppPath);
   } else {
-    res.send(uploadPage(pugVars));
+    res.send(uploadPage({...pugVars, lang: req.translations}));
   }
 });
 
 app.get(config.uploadAppPath, (req, res) => {
-  res.send(uploadPage(pugVars));
+  res.send(uploadPage({...pugVars, lang: req.translations}));
 });
 
 // Return translations
 app.get(`${ config.baseUrl }lang.json`, (req, res) => {
-  const lang = req.acceptsLanguages(...Object.keys(config.languages));
-  const translations = config.languages[lang];
-  eventBus.emit('getLang', translations);
-  res.json(translations);
+  eventBus.emit('getLang', req.translations);
+  res.json(req.translations);
 });
 
 // Config
@@ -115,7 +119,7 @@ app.get(`${ config.baseUrl }config.json`, (req, res) => {
 
 app.get(`${ config.baseUrl }admin`, (req, res, next) => {
   if (!config.adminPass) return next();
-  res.send(adminPage(pugVars));
+  res.send(adminPage({...pugVars, lang: req.translations}));
 });
 
 app.get(`${ config.baseUrl }admin/data.json`, (req, res, next) => {
@@ -171,7 +175,7 @@ app.get(`${ config.baseUrl }:sid`, (req, res, next) => {
     });
   } else {
     if (!db.get(req.params.sid)) return next();
-    res.send(downloadPage(pugVars));
+    res.send(downloadPage({...pugVars, lang: req.translations}));
   }
 });
 
@@ -188,10 +192,10 @@ app.get(`${ config.baseUrl }files/:fid`, async (req, res, next) => {
     const format = req.params.fid.endsWith('.zip') ? 'zip' : 'tar.gz';
     const bucket = db.get(sid);
 
-    if (!bucket) return res.status(404).send(errorPage({ ...pugVars, error: 'Download bucket not found.' }));
+    if (!bucket) return res.status(404).send(errorPage({ ...pugVars, error: 'Download bucket not found.', lang: req.translations }));
 
     if (req.params.fid !== sid + '++' + MD5(bucket.map(f => f.key).join()).toString() + '.' + format) {
-      res.status(404).send(errorPage({ ...pugVars, error: 'Invalid link' }));
+      res.status(404).send(errorPage({ ...pugVars, error: 'Invalid link', lang: req.translations }));
       return;
     }
     debug(`Download Bucket ${ sid }`);
@@ -234,7 +238,8 @@ app.get(`${ config.baseUrl }files/:fid`, async (req, res, next) => {
           sid,
           file: filename,
           metadata: bucket[0].metadata,
-          bucket
+          bucket,
+          url: req.protocol + '://' + req.get('host') + req.originalUrl,
         });
       });
     }
@@ -262,12 +267,13 @@ app.get(`${ config.baseUrl }files/:fid`, async (req, res, next) => {
       eventBus.emit('fileDownloaded', {
         sid,
         file: info.metadata.name,
-        metadata: info.metadata
+        metadata: info.metadata,
+        url: req.protocol + '://' + req.get('host') + req.originalUrl,
       });
     });
   }
   catch (e) {
-    res.status(404).send(errorPage({ ...pugVars, error: e.message }));
+    res.status(404).send(errorPage({ ...pugVars, error: e.message, lang: req.translations }));
   }
 });
 
@@ -353,7 +359,7 @@ app.use(`${ config.baseUrl }files`,
 );
 
 app.use((req, res, next) => {
-  res.status(404).send(errorPage({ ...pugVars, error: 'Download bucket not found.' }));
+  res.status(404).send(errorPage({ ...pugVars, error: 'Download bucket not found.', lang: req.translations }));
 });
 
 module.exports = app;

lib/endpoints.js

@@ -25,7 +25,6 @@
     "http-errors": "^1.8.0",
     "method-override": "^3.0.0",
     "morgan": "^1.10.0",
-    "nodemailer": "^6.4.10",
     "pug": "^3.0.0",
     "to-object-reducer": "^1.0.1",
     "uuid": "^8.2.0"