Fixed a typing issue for authority

Author: david-rocca

src/controller/org.controller/index.js

@@ -1008,7 +1008,9 @@ router.post(
     .isString().withMessage(errorMsgs.MUST_BE_STRING).trim()
     .notEmpty().withMessage(errorMsgs.NOT_EMPTY)
     .isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }).withMessage(errorMsgs.SHORTNAME_LENGTH),
-  body(['name']).isString().trim().notEmpty(),
+  body(['name'])
+    .isString().withMessage(errorMsgs.MUST_BE_STRING).trim()
+    .notEmpty().withMessage(errorMsgs.NOT_EMPTY),
   body(['authority.active_roles']).optional()
     .custom(isFlatStringArray)
     .customSanitizer(toUpperCaseArray)

src/controller/org.controller/org.controller.js

@@ -1,5 +1,6 @@
 require('dotenv').config()
 const mongoose = require('mongoose')
+const _ = require('lodash')
 const logger = require('../../middleware/logger')
 const getConstants = require('../../constants').getConstants
 const errors = require('./error')
@@ -238,9 +239,9 @@ async function registryCreateOrg (req, res, next) {
         logger.error(JSON.stringify({ uuid: req.ctx.uuid, message: 'CVE JSON schema validation FAILED.' }))
         await session.abortTransaction()
         if (!Array.isArray(body?.authority) || body?.authority.some(item => typeof item !== 'string')) {
-          return res.status(400).json({ message: 'Parameters were invalid', details: [{ param: 'authority', msg: 'Parameter must be a one-dimensional array of strings' }] })
+          return res.status(400).json({ error: 'BAD_INPUT', message: 'Parameters were invalid', details: [{ param: 'authority', msg: 'Parameter must be a one-dimensional array of strings' }] })
         }
-        return res.status(400).json({ message: 'Parameters were invalid', errors: result.errors })
+        return res.status(400).json({ error: 'BAD_INPUT', message: 'Parameters were invalid', errors: result.errors })
       }
 
       // Check to see if the org already exists

src/middleware/schemas/ADPOrg.json

@@ -9,7 +9,7 @@
     {
       "properties": {
         "authority": {
-          "const": "ADP"
+          "const": ["ADP"]
         }
       }
     }

src/middleware/schemas/BaseOrg.json

@@ -62,7 +62,11 @@
       }
     },
     "authority": {
-      "$ref": "#/definitions/authority"
+      "type": "array",
+      "uniqueItems": true,
+      "items": {
+        "$ref": "#/definitions/authority"
+      }
     },
     "root_or_tlr": {
       "type": "boolean"

src/middleware/schemas/BulkDownloadOrg.json

@@ -9,7 +9,7 @@
     {
       "properties": {
         "authority": {
-          "const": "BULK_DOWNLOAD"
+          "const": ["BULK_DOWNLOAD"]
         }
       }
     }

src/middleware/schemas/CNAOrg.json

@@ -9,7 +9,7 @@
     {
       "properties": {
         "authority": {
-          "const": "CNA"
+          "const": ["CNA"]
         },
         "oversees": {
           "type": "array",

src/middleware/schemas/SecretariatOrg.json

@@ -9,7 +9,7 @@
     {
       "properties": {
         "authority": {
-          "const": "SECRETARIAT"
+          "const": ["SECRETARIAT"]
         },
         "oversees": {
           "type": "array",

src/repositories/baseOrgRepository.js

@@ -642,14 +642,22 @@ class BaseOrgRepository extends BaseRepository {
     if (Array.isArray(org.authority)) {
       // User passed in an array, we need to decide how we handle this.
       if (org.authority.includes('SECRETARIAT')) {
-        org.authority = 'SECRETARIAT'
+        org.authority = ['SECRETARIAT']
         validateObject = SecretariatOrgModel.validateOrg(org)
       } else {
         // We are not a secretariat, so we need to take most priv
         if (org.authority.includes('CNA') || org.authority.length === 0) {
-          org.authority = 'CNA'
+          org.authority = ['CNA']
           validateObject = CNAOrgModel.validateOrg(org)
         }
+        if (org.authority.includes('ADP')) {
+          org.authority = ['ADP']
+          validateObject = ADPOrgModel.validateOrg(org)
+        }
+        if (org.authority.includes('BULK_DOWNLOAD')) {
+          org.authority = ['BULK_DOWNLOAD']
+          validateObject = BulkDownloadModel.validateOrg(org)
+        }
       }
     } else {
       if (org.authority === 'ADP') {

test/integration-tests/constants.js

@@ -373,7 +373,7 @@ const testRegistryOrg = {
     org_email: '[email protected]',
     website: 'https://test.org'
   },
-  authority: 'CNA',
+  authority: ['CNA'],
   hard_quota: 100000
 }
 
@@ -387,7 +387,7 @@ const testRegistryOrg2 = {
     org_email: '[email protected]',
     website: 'https://test.org'
   },
-  authority: 'CNA',
+  authority: ['CNA'],
   hard_quota: 100000
 }
 
@@ -415,7 +415,7 @@ const existingRegistryOrg = {
     org_email: '[email protected]',
     website: 'https://test.org'
   },
-  authority: 'CNA',
+  authority: ['CNA'],
   hard_quota: 100000
 }
 

test/integration-tests/registry-org/registryOrgCRUDTest.js

@@ -11,7 +11,7 @@ const secretariatHeaders = { ...constants.headers, 'content-type': 'application/
 const testRegistryOrg = {
   short_name: 'registry_org_test',
   long_name: 'Registry Org Test',
-  authority: 'CNA',
+  authority: ['CNA'],
   hard_quota: 1000
 }
 let createdOrg