Merge branch 'fix_critical_issues' into 'master'

fixing imports

See merge request !176

routes/account.ts

@@ -2,7 +2,6 @@ import fs from 'fs'
 import async from 'async'
 import bcrypt from 'bcryptjs'
 import * as passportSaml from 'passport-saml'
-import uuidv4 = require('uuid/v4');
 import dbconn from '../config/dbconn'
 import methods from '../functions/methods'
 import gitlab from '../functions/gitlab'
@@ -436,9 +435,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
               if (!req.files) {
                 callback(null, newLogoFile)
               } else {
-                let fileName = uuidv4();
-                newLogoFile.mv(logoDir + fileName, function(err:any) {
-                  newLogoFile = logoDir + fileName
+//                let fileName = uuidv4();
+                newLogoFile.mv(logoDir + newLogoFile.name, function(err:any) {
+                  newLogoFile = logoDir + newLogoFile.name
                   callback(err, newLogoFile)
                 })
               }
@@ -532,9 +531,9 @@ export = function (app:any, config:any, passport:any, lang:string) {
                 callback(null, newLogoFile)
               } else {
                 newLogoFile = req.files.logo
-                let fileName = uuidv4();
-                newLogoFile.mv(logoDir + fileName, function(err:any) {
-                  newLogoFile = logoDir + fileName
+//                let fileName = uuidv4();
+                newLogoFile.mv(logoDir + newLogoFile.name, function(err:any) {
+                  newLogoFile = logoDir + newLogoFile.name
                   callback(err, newLogoFile)
                 })
               }