Standardized uuid imports for Consistency (#1584)

app/src/forms/admin/service.js

@@ -1,8 +1,7 @@
 const { ExternalAPIStatuses } = require('../common/constants');
 const { Form, FormVersion, User, UserFormAccess, FormComponentsProactiveHelp, AdminExternalAPI, ExternalAPI, ExternalAPIStatusCode } = require('../common/models');
 const { queryUtils } = require('../common/utils');
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const service = {
   //
   // Forms
@@ -218,7 +217,7 @@ const service = {
         });
       } else {
         const obj = {};
-        id = uuidv4();
+        id = uuid.v4();
         obj.id = id;
         obj.componentName = data && data.componentName;
         obj.externalLink = data && data.externalLink;

app/src/forms/auth/service.js

@@ -1,5 +1,4 @@
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { Form, FormSubmissionUserPermissions, PublicFormAccess, SubmissionMetadata, User, UserFormAccess } = require('../common/models');
 const { queryUtils } = require('../common/utils');
 
@@ -14,7 +13,7 @@ const service = {
       trx = await User.startTransaction();
 
       const obj = {
-        id: uuidv4(),
+        id: uuid.v4(),
         idpUserId: data.idpUserId,
         keycloakId: data.keycloakId,
         username: data.username,

app/src/forms/file/service.js

@@ -1,6 +1,5 @@
 const config = require('config');
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { FileStorage } = require('../common/models');
 const storageService = require('./storage/storageService');
 
@@ -13,7 +12,7 @@ const service = {
       trx = await FileStorage.startTransaction();
 
       const obj = {};
-      obj.id = uuidv4();
+      obj.id = uuid.v4();
       obj.storage = folder;
       obj.originalName = data.originalname;
       obj.mimeType = data.mimetype;

app/src/forms/form/encryptionKey/service.js

@@ -1,5 +1,4 @@
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { FormEncryptionKey } = require('../../common/models');
 
 const { ENCRYPTION_ALGORITHMS } = require('../../../components/encryptionService');
@@ -15,7 +14,7 @@ const service = {
   },
 
   _initModel: (formId, data) => {
-    data.id = uuidv4();
+    data.id = uuid.v4();
     data.formId = formId;
     data.name = PRIVATE_EVENT_STREAM_NAME;
   },

app/src/forms/form/eventStreamConfig/service.js

@@ -1,7 +1,6 @@
 const Problem = require('api-problem');
 
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { FormEventStreamConfig } = require('../../common/models');
 
 const encryptionKeyService = require('../encryptionKey/service');
@@ -45,7 +44,7 @@ const service = {
         }
       } else {
         // add a new configuration.
-        data.id = uuidv4();
+        data.id = uuid.v4();
         data.formId = formId;
         await FormEventStreamConfig.query(trx).insert({
           ...data,

app/src/forms/form/exportService.js

@@ -11,7 +11,7 @@ const os = require('os');
 const config = require('config');
 const fileService = require('../file/service');
 const emailService = require('../email/emailService');
-const { v4: uuidv4 } = require('uuid');
+const uuid = require('uuid');
 const nestedObjectsUtil = require('nested-objects-util');
 
 const service = {
@@ -319,7 +319,7 @@ const service = {
       // (/myfiles folder for local machines / to Object cloud storage for other env) gathering the file storage ID
       // to use it in email for link generation for downloading...
       const path = config.get('files.localStorage.path') ? config.get('files.localStorage.path') : fs.realpathSync(os.tmpdir());
-      const pathToTmpFile = `${path}/${uuidv4()}.csv`;
+      const pathToTmpFile = `${path}/${uuid.v4()}.csv`;
       const outputStream = fs.createWriteStream(pathToTmpFile);
       dataStream.pipe(json2csvParser).pipe(outputStream);
 

app/src/forms/form/externalApi/service.js

@@ -1,6 +1,6 @@
 const Problem = require('api-problem');
 
-const { v4: uuidv4 } = require('uuid');
+const uuid = require('uuid');
 const { ExternalAPIStatuses } = require('../../common/constants');
 
 const { ExternalAPI, ExternalAPIStatusCode, Form, AdminExternalAPI } = require('../../common/models');
@@ -87,7 +87,7 @@ const service = {
   createExternalAPI: async (formId, data, currentUser) => {
     service.validateExternalAPI(data);
 
-    data.id = uuidv4();
+    data.id = uuid.v4();
     // always create as SUBMITTED.
     data.code = ExternalAPIStatuses.SUBMITTED;
     // ensure that new records don't send user tokens.

app/src/forms/form/formMetadata/service.js

@@ -1,7 +1,6 @@
 const Problem = require('api-problem');
 
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { FormMetadata } = require('../../common/models');
 const { typeUtils } = require('../../common/utils');
 
@@ -17,7 +16,7 @@ const service = {
 
   initModel: (formId, data) => {
     return {
-      id: uuidv4(),
+      id: uuid.v4(),
       formId: formId,
       metadata: data.metadata ? data.metadata : {},
     };

app/src/forms/form/service.js

@@ -1,6 +1,6 @@
 const Problem = require('api-problem');
 const { ref } = require('objection');
-const { v4: uuidv4 } = require('uuid');
+const uuid = require('uuid');
 const { EmailTypes } = require('../common/constants');
 const eventService = require('../event/eventService');
 const moment = require('moment');
@@ -77,7 +77,7 @@ const service = {
     try {
       trx = await Form.startTransaction();
       const obj = {};
-      obj.id = uuidv4();
+      obj.id = uuid.v4();
       obj.name = data.name;
       obj.description = data.description;
       obj.active = true;
@@ -107,19 +107,19 @@ const service = {
           if (!exists) {
             throw new Problem(422, `${p.code} is not a valid Identity Provider code`);
           }
-          fips.push({ id: uuidv4(), formId: obj.id, code: p.code, createdBy: currentUser.usernameIdp });
+          fips.push({ id: uuid.v4(), formId: obj.id, code: p.code, createdBy: currentUser.usernameIdp });
         }
         await FormIdentityProvider.query(trx).insert(fips);
       }
       // make this user have ALL the roles...
       const userRoles = Rolenames.map((r) => {
-        return { id: uuidv4(), createdBy: currentUser.usernameIdp, userId: currentUser.id, formId: obj.id, role: r };
+        return { id: uuid.v4(), createdBy: currentUser.usernameIdp, userId: currentUser.id, formId: obj.id, role: r };
       });
       await FormRoleUser.query(trx).insert(userRoles);
 
       // create a unpublished draft
       const draft = {
-        id: uuidv4(),
+        id: uuid.v4(),
         formId: obj.id,
         createdBy: currentUser.usernameIdp,
         schema: data.schema,
@@ -129,7 +129,7 @@ const service = {
       // Map all status codes to the form - hardcoded to include all states
       // TODO: Could make this more dynamic and settable by the user if that feature is required
       const defaultStatuses = Object.values(Statuses).map((status) => ({
-        id: uuidv4(),
+        id: uuid.v4(),
         formId: obj.id,
         code: status,
         createdBy: currentUser.usernameIdp,
@@ -188,7 +188,7 @@ const service = {
 
       // insert any new identity providers
       const fIdps = data.identityProviders.map((p) => ({
-        id: uuidv4(),
+        id: uuid.v4(),
         formId: obj.id,
         code: p.code,
         createdBy: currentUser.usernameIdp,
@@ -286,7 +286,7 @@ const service = {
 
     try {
       const documentTemplate = {
-        id: uuidv4(),
+        id: uuid.v4(),
         formId: formId,
         filename: data.filename,
         template: data.template,
@@ -548,7 +548,7 @@ const service = {
       const isPublicForm = identityProviders.some((idp) => idp.code === 'public');
       const createdBy = isPublicForm ? 'public' : currentUser.usernameIdp;
 
-      const submissionId = uuidv4();
+      const submissionId = uuid.v4();
       const obj = Object.assign(
         {
           id: submissionId,
@@ -573,7 +573,7 @@ const service = {
         }
 
         const itemsToInsert = perms.map((perm) => ({
-          id: uuidv4(),
+          id: uuid.v4(),
           userId: currentUser.id,
           formSubmissionId: submissionId,
           permission: perm,
@@ -586,7 +586,7 @@ const service = {
       if (!data.draft) {
         // Add a SUBMITTED status if it's not a draft
         const stObj = {
-          id: uuidv4(),
+          id: uuid.v4(),
           submissionId: submissionId,
           code: Statuses.SUBMITTED,
           createdBy: createdBy,
@@ -644,7 +644,7 @@ const service = {
         let submissionId;
         // let's create multiple submissions with same metadata
         service.popFormLevelInfo(submissionDataArray).map((singleData) => {
-          submissionId = uuidv4();
+          submissionId = uuid.v4();
           recordsToInsert.push({
             ...recordWithoutData,
             id: submissionId,
@@ -666,7 +666,7 @@ const service = {
         result.map((singleSubmission) => {
           itemsToInsert.push(
             ...perms.map((perm) => ({
-              id: uuidv4(),
+              id: uuid.v4(),
               userId: currentUser.id,
               formSubmissionId: singleSubmission.id,
               permission: perm,
@@ -715,7 +715,7 @@ const service = {
 
       // data.schema, maybe data.formVersionId
       const obj = Object.assign({}, data);
-      obj.id = uuidv4();
+      obj.id = uuid.v4();
       obj.formId = form.id;
       obj.createdBy = currentUser.usernameIdp;
 
@@ -762,7 +762,7 @@ const service = {
       trx = await FormVersionDraft.startTransaction();
 
       version = {
-        id: uuidv4(),
+        id: uuid.v4(),
         formId: form.id,
         version: form.versions.length ? form.versions[0].version + 1 : 1,
         createdBy: currentUser.usernameIdp,
@@ -819,15 +819,15 @@ const service = {
         // Replace API key for the form
         await FormApiKey.query(trx).modify('filterFormId', formId).update({
           formId: formId,
-          secret: uuidv4(),
+          secret: uuid.v4(),
           updatedBy: currentUser.usernameIdp,
           filesApiAccess: false,
         });
       } else {
         // Add new API key for the form
         await FormApiKey.query(trx).insert({
           formId: formId,
-          secret: uuidv4(),
+          secret: uuid.v4(),
           createdBy: currentUser.usernameIdp,
           filesApiAccess: false,
         });
@@ -942,7 +942,7 @@ const service = {
       } else {
         // Add new subscription settings for the form
         await FormSubscription.query(trx).insert({
-          id: uuidv4(),
+          id: uuid.v4(),
           ...subscriptionData,
           createdBy: currentUser.usernameIdp,
         });
@@ -1048,7 +1048,7 @@ const service = {
       } else {
         // Add new email template settings for the form
         await FormEmailTemplate.query(transaction).insert({
-          id: uuidv4(),
+          id: uuid.v4(),
           ...data,
           createdBy: currentUser.usernameIdp,
         });

app/src/forms/permission/service.js

@@ -1,5 +1,4 @@
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { Permissions } = require('../common/constants');
 const { FormSubmissionUser, Permission } = require('../common/models');
 
@@ -48,7 +47,7 @@ const service = {
       await trx.raw(`delete from role_permission where "permission" = '${obj.code}'`);
       // set to specified roles...
       for (const r of data.roles) {
-        await trx.raw(`insert into role_permission (id, "role", "permission", "createdBy") values ('${uuidv4()}', '${r.code}', '${obj.code}', '${currentUser.usernameIdp}');`);
+        await trx.raw(`insert into role_permission (id, "role", "permission", "createdBy") values ('${uuid.v4()}', '${r.code}', '${obj.code}', '${currentUser.usernameIdp}');`);
       }
       await trx.commit();
 
@@ -78,7 +77,7 @@ const service = {
       const users = await FormSubmissionUser.query().select('userId').where('formSubmissionId', submissionId).whereIn('permission', [Permissions.SUBMISSION_READ]);
 
       const itemsToInsert = users.map((user) => ({
-        id: uuidv4(),
+        id: uuid.v4(),
         userId: user.userId,
         formSubmissionId: submissionId,
         permission: Permissions.SUBMISSION_UPDATE,

app/src/forms/rbac/service.js

@@ -1,5 +1,5 @@
 const Problem = require('api-problem');
-const { v4: uuidv4 } = require('uuid');
+const uuid = require('uuid');
 const { FormRoleUser, FormSubmissionUser, User, UserFormAccess, UserSubmissions } = require('../common/models');
 const { Roles } = require('../common/constants');
 const { queryUtils } = require('../common/utils');
@@ -16,7 +16,7 @@ const service = {
       trx = await FormRoleUser.startTransaction();
 
       const obj = Object.assign({}, data);
-      obj.id = uuidv4();
+      obj.id = uuid.v4();
 
       await FormRoleUser.query(trx).insert(obj);
       await trx.commit();
@@ -177,7 +177,7 @@ const service = {
       }
       // add an id and save them
       const items = data.map((d) => {
-        return { id: uuidv4(), createdBy: currentUser.usernameIdp, ...d };
+        return { id: uuid.v4(), createdBy: currentUser.usernameIdp, ...d };
       });
       if (items && items.length) await FormRoleUser.query(trx).insert(items);
       await trx.commit();
@@ -203,7 +203,7 @@ const service = {
       if (Array.isArray(body.permissions) && body.permissions.length !== 0) {
         // add ids and save them
         const items = body.permissions.map((perm) => ({
-          id: uuidv4(),
+          id: uuid.v4(),
           formSubmissionId: formSubmissionId,
           userId: userId,
           createdBy: currentUser.usernameIdp,
@@ -278,7 +278,7 @@ const service = {
 
       // add an id and save them
       const items = data.map((d) => {
-        return { id: uuidv4(), createdBy: currentUser.usernameIdp, ...d };
+        return { id: uuid.v4(), createdBy: currentUser.usernameIdp, ...d };
       });
       if (items && items.length) await FormRoleUser.query(trx).insert(items);
       await trx.commit();

app/src/forms/role/service.js

@@ -1,5 +1,4 @@
-const { v4: uuidv4 } = require('uuid');
-
+const uuid = require('uuid');
 const { Role } = require('../common/models');
 
 const service = {
@@ -48,7 +47,7 @@ const service = {
       await trx.raw(`delete from role_permission where "role" = '${obj.code}'`);
       // set to specified permissions...
       for (const p of data.permissions) {
-        await trx.raw(`insert into role_permission (id, "role", "permission", "createdBy") values ('${uuidv4()}', '${obj.code}', '${p.code}', '${currentUser.usernameIdp}');`);
+        await trx.raw(`insert into role_permission (id, "role", "permission", "createdBy") values ('${uuid.v4()}', '${obj.code}', '${p.code}', '${currentUser.usernameIdp}');`);
       }
 
       await trx.commit();