Merge branch 'dev' into emathew/1400-registryOrg-createUserByOrg

Author: david-rocca

src/controller/registry-org.controller/registry-org.controller.js

@@ -94,8 +94,14 @@ async function createOrg (req, res, next) {
     const registryOrgRepo = req.ctx.repositories.getRegistryOrgRepository()
     const body = req.ctx.body
 
+    // Short circuit if UUID provided
+    const bodyKeys = Object.keys(body).map(k => k.toLowerCase())
+    if (bodyKeys.includes('uuid')) {
+      return res.status(400).json(error.uuidProvided('org'))
+    }
+
     const newOrg = new RegistryOrg()
-    Object.keys(body).map(k => k.toLowerCase()).forEach(k => {
+    bodyKeys.forEach(k => {
       if (k === 'long_name') {
         newOrg.long_name = body[k]
       } else if (k === 'short_name') {
@@ -138,8 +144,6 @@ async function createOrg (req, res, next) {
           website: '',
           ...contactInfo
         }
-      } else if (k === 'uuid') {
-        return res.status(400).json(error.uuidProvided('org'))
       }
     })
 

src/controller/registry-user.controller/registry-user.controller.js

@@ -71,6 +71,12 @@ async function createUser (req, res, next) {
     const registryUserRepo = req.ctx.repositories.getRegistryUserRepository()
     const body = req.ctx.body
 
+    // Short circuit if UUID provided
+    const bodyKeys = Object.keys(body).map((k) => k.toLowerCase())
+    if (bodyKeys.includes('uuid')) {
+      return res.status(400).json(error.uuidProvided('user'))
+    }
+
     // TODO: check if affiliated orgs and program orgs exist, and if their membership limit is reached
 
     const newUser = new RegistryUser()
@@ -89,8 +95,6 @@ async function createUser (req, res, next) {
         // TODO: dedupe
       } else if (k === 'cve_program_org_membership') {
         // TODO: dedupe
-      } else if (k === 'uuid') {
-        return res.status(400).json(error.uuidProvided('user'))
       }
     })