From 2103378e5c1bb01408d5f37e9b3c1d9c5c8b9ca3 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 9 Feb 2021 13:14:23 +0000
Subject: [PATCH] Fixing minor bug with permission add.

---
 packages/server/src/api/controllers/permission.js        | 9 +++++----
 packages/server/src/api/index.js                         | 1 +
 packages/server/src/api/routes/tests/permissions.spec.js | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/api/controllers/permission.js b/packages/server/src/api/controllers/permission.js
index e39505765..372e80495 100644
--- a/packages/server/src/api/controllers/permission.js
+++ b/packages/server/src/api/controllers/permission.js
@@ -71,10 +71,11 @@ async function updatePermissionOnRole(
   }
 
   const response = await db.bulkDocs(docUpdates)
-  return response.map(resp => ({
-    ...resp,
-    _id: getExternalRoleID(resp._id),
-  }))
+  return response.map(resp => {
+    resp._id = getExternalRoleID(resp.id)
+    delete resp.id
+    return resp
+  })
 }
 
 exports.fetchBuiltin = function(ctx) {
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 5b9b51363..7b063cb52 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -47,6 +47,7 @@ router.use(async (ctx, next) => {
       message: err.message,
       status: ctx.status,
     }
+    console.trace(err)
   }
 })
 
diff --git a/packages/server/src/api/routes/tests/permissions.spec.js b/packages/server/src/api/routes/tests/permissions.spec.js
index d4ca9aa8a..fc5ce23f9 100644
--- a/packages/server/src/api/routes/tests/permissions.spec.js
+++ b/packages/server/src/api/routes/tests/permissions.spec.js
@@ -48,7 +48,7 @@ describe("/permission", () => {
   describe("test", () => {
     it("should be able to add permission to a role for the table", async () => {
       expect(perms.length).toEqual(1)
-      expect(perms[0].id).toEqual(`${STD_ROLE_ID}`)
+      expect(perms[0]._id).toEqual(`${STD_ROLE_ID}`)
     })
 
     it("should get the resource permissions", async () => {