Merge pull request #1558 from CVEProject/reported_bug_amazon

Fix reported bug with Migration.

Author: jdaigneau5

src/scripts/migrate.js

@@ -133,10 +133,14 @@ async function orgHelper (db) {
 
     // Find associated users with the Org
     const orgUsers = []
+    const admins = []
 
     for (const user of allUsers) {
       if (user.org_UUID === doc.UUID) {
         orgUsers.push(user.UUID)
+        if (user.authority?.active_roles?.includes('ADMIN')) {
+          admins.push(user.UUID)
+        }
       }
     }
 
@@ -185,12 +189,12 @@ async function orgHelper (db) {
         product_list: null, // don't have now
         soft_quota: null, // don't have now
         hard_quota: doc.policies?.id_quota,
+        admins: admins,
         contact_info: {
           additional_contact_users: [], // don't have now
           poc: null, // don't have now
           poc_email: null, // don't have now
           poc_phone: null, // don't have now
-          admins: [], // don't have now
           org_email: email,
           website: site
         },

src/utils/data.js

@@ -62,7 +62,6 @@ async function newUserTransform (user, hash) {
   const tmpOrgUUID = await utils.getOrgUUID(user.cna_short_name)
   user.org_UUID = tmpOrgUUID
   user.UUID = uuid.v4()
-  user.authority = { active_roles: [] }
 
   // shared secret key in development environments
   if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {