some uuid library calls slipped through

Author: Aaron Adler

lib/api/attachUrl.js

@@ -1,15 +1,15 @@
 const getUrisFromReq = require('../getUrisFromReq')
 const loadTemplate = require('../loadTemplate')
 const sparql = require('../sparql/sparql')
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 const getOwnedBy = require('../query/ownedBy')
 const config = require('../config')
 
 async function serve (req, res) {
   let { graphUri, uri, url, baseUri } = getUrisFromReq(req, res)
   let source = req.body.url
   let typeString = req.body.type
-  let name = req.body.name || uuid()
+  let name = req.body.name || uuidv4()
 
   // Replace non-alphanumeric characters and spaces with underscores
   let displayId = name.replace(/[^a-zA-Z0-9]/g, '_')

lib/api/expose.js

@@ -1,10 +1,10 @@
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 const exposeLifetime = 10 * 60 * 1000 // 10 minutes
 
 let exposes = {}
 
 function createExpose (filename) {
-  let id = uuid()
+  let id = uuidv4()
   exposes[id] = filename
 
   // Delete expose after lifetime expires

lib/api/stream.js

@@ -1,4 +1,4 @@
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 
 let responses = {}
 
@@ -89,7 +89,7 @@ function serve (req, res) {
 }
 
 function create (plugin) {
-  let id = uuid()
+  let id = uuidv4()
   console.log('creating stream ' + id)
   prepare(id, plugin)
 

lib/apiTokens.js

@@ -1,11 +1,11 @@
 
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 const db = require('./db')
 
 const tokens = Object.create(null)
 
 function createToken (user) {
-  const token = uuid()
+  const token = uuidv4()
 
   tokens[token] = user.id
 

lib/attachments.js

@@ -5,7 +5,7 @@ const sparql = require('./sparql/sparql')
 const filesize = require('filesize')
 const URI = require('sboljs').URI
 const sha1 = require('sha1')
-const {uuid: uuidv4} = require('uuid')
+const {v4: uuidv4} = require('uuid')
 const { fetchSBOLObjectRecursive } = require('./fetch/fetch-sbol-object-recursive')
 
 function addAttachmentToTopLevel (graphUri, baseUri, topLevelUri, name, uploadHash, size, attachmentType, owner, id) {
@@ -21,7 +21,7 @@ function addAttachmentToTopLevel (graphUri, baseUri, topLevelUri, name, uploadHa
     }
   }
 
-  const displayId = cleanId || 'attachment_' + uuid().replace(/-/g, '')
+  const displayId = cleanId || 'attachment_' + uuidv4().replace(/-/g, '')
   const persistentIdentity = baseUri + '/' + displayId
   // TODO: should get version from topLevelUri
   const version = '1'

lib/views/admin/newUser.js

@@ -4,7 +4,7 @@ const config = require('../../config')
 const createUser = require('../../createUser')
 const sendCreatePasswordMail = require('../../mail/createPassword')
 var extend = require('xtend')
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 var sha1 = require('sha1')
 
 module.exports = function (req, res) {
@@ -71,12 +71,12 @@ function post (req, res) {
     email: req.body.email,
     username: req.body.username,
     affiliation: req.body.affiliation,
-    password: uuidV4(),
+    password: uuidv4(),
     isAdmin: req.body.isAdmin !== undefined && req.body.isAdmin !== 'false',
     isCurator: req.body.isCurator !== undefined && req.body.isAdmin !== 'false',
     isMember: req.body.isMember !== undefined && req.body.isAdmin !== 'false'
   }).then((user) => {
-    user.resetPasswordLink = sha1(uuidV4())
+    user.resetPasswordLink = sha1(uuidv4())
 
     return user.save()
   }).then((user) => {

lib/views/resetPassword.js

@@ -6,7 +6,7 @@ var config = require('../config')
 var db = require('../db')
 
 var sha1 = require('sha1')
-var uuid = require('uuid')
+const { v4 : uuid } = require('uuid')
 
 var sendResetPasswordMail = require('../mail/resetPassword')
 
@@ -52,7 +52,7 @@ function resetPasswordPost (req, res) {
   }
 
   db.model.User.findOne({ where: { email: req.body.email } }).then((user) => {
-    user.resetPasswordLink = sha1(uuid.v4())
+    user.resetPasswordLink = sha1(uuidv4())
 
     return user.save()
   }).then((user) => {

lib/views/setup.js

@@ -1,5 +1,5 @@
 const pug = require('pug')
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 const fs = require('fs')
 const Joi = require('joi')
 const config = require('../config')
@@ -160,9 +160,9 @@ async function setupPost (req, res, settings) {
   }
 
   config.set('instanceName', updatedSettings.instanceName)
-  config.set('sessionSecret', uuid())
-  config.set('shareLinkSalt', uuid())
-  config.set('passwordSalt', uuid())
+  config.set('sessionSecret', uuidv4())
+  config.set('shareLinkSalt', uuidv4())
+  config.set('passwordSalt', uuidv4())
   config.set('frontendURL', updatedSettings.frontendURL)
   config.set('instanceUrl', updatedSettings.instanceUrl)
   config.set('webOfRegistries', { [updatedSettings.uriPrefix.slice(0, -1)]: updatedSettings.instanceUrl.slice(0, -1) })

lib/views/stream.js

@@ -1,14 +1,14 @@
 const pug = require('pug')
 const config = require('../config')
 const stream = require('../api/stream')
-const {uuid: uuidv4 } = require('uuid')
+const {v4: uuidv4 } = require('uuid')
 
 function download (req, res, content) {
   let data = content.body
   let filename = content.filename
 
   if (!filename || filename === '') {
-    filename = uuid()
+    filename = uuidv4()
   }
 
   res.attachment(filename)