fixes

Author: ThomasKranitsas

app.js

@@ -92,6 +92,10 @@ app.use((err, req, res, next) => {
     }
   }
 
+  if (!_.isUndefined(err.metadata)) {
+    errorResponse.metadata = err.metadata
+  }
+
   res.status(status).json(errorResponse)
 })
 

src/common/helper.js

@@ -427,26 +427,23 @@ function partialMatch (filter, value) {
  * Check if the user has agreed to all challenge terms
  * @param {Number} userId the user ID
  * @param {Array<String>} terms an array of term UUIDs to check
- * @param {String} roleId the role ID
  */
-async function checkAgreedTerms (userId, terms, roleId) {
+async function checkAgreedTerms (userId, terms) {
   const unAgreedTerms = []
-  const unAgreedTermIds = []
+  const missingTerms = []
   for (const term of terms) {
     const res = await getRequest(`${config.TERMS_API_URL}/${term.id}`, { userId })
     if (!_.get(res, 'body.agreed', false)) {
       unAgreedTerms.push(_.get(res, 'body.title', term))
-      unAgreedTermIds.push({
+      missingTerms.push({
         termId: term.id,
-        roleId
+        roleId: term.roleId
       })
     }
   }
 
   if (unAgreedTerms.length > 0) {
-    throw new errors.ForbiddenError(`The user has not yet agreed to the following terms: [${unAgreedTerms.join(', ')}]`, null, {
-      missingTerms: unAgreedTermIds
-    })
+    throw new errors.ForbiddenError(`The user has not yet agreed to the following terms: [${unAgreedTerms.join(', ')}]`, null, { missingTerms })
   }
 }
 

src/services/ResourceService.js

@@ -252,7 +252,7 @@ async function init (currentUser, challengeId, resource, isCreated) {
   let resources
   // Verify the member has agreed to the challenge terms
   if (isCreated) {
-    await helper.checkAgreedTerms(memberId, _.filter(_.get(challenge, 'terms', []), t => t.roleId === resourceRole.id), resourceRole.id)
+    await helper.checkAgreedTerms(memberId, _.filter(_.get(challenge, 'terms', []), t => t.roleId === resourceRole.id))
   }
   if (!currentUser.isMachine && !helper.hasAdminRole(currentUser)) {
     // Check if user has agreed to the challenge terms