Merge pull request #2386 from CanStudios/issue/2385

Fix - course creator seeing preset change error

Author: canstudios-nicolaw

lib/permissions.js

@@ -22,6 +22,7 @@ var ignoreRoutes = [
   /^\/api\/duplicatecourse\/?.*$/,
   /^\/api\/subscribed\/?.*$/,
   /^\/api\/theme\/?.*$/,
+  /^\/api\/themepreset\/?.*$/,
   /^\/api\/menu\/?.*$/,
   /^\/api\/extension\/?.*$/,
   /^\/api\/themetype\/?$/,

lib/role/CourseCreator.json

@@ -2,7 +2,7 @@
   "name": "Course Creator",
   "version": "0.0.1",
   "statement" : [
-    { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/content/*", "action":["create", "delete"], "effect":"allow" },
+    { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/content/*", "action":["create", "read", "update", "delete"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/shared/*", "action":["create","read"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/subscribed/*", "action":["create","read"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/asset/*", "action":["create", "read", "update"], "effect":"allow" },
@@ -14,6 +14,7 @@
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/themetype/*", "action":["update", "read"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/menutype/*", "action":["update", "read"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/theme/*", "action":["create", "update", "read"], "effect":"allow" },
+    { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/themepreset/*", "action":["create", "update", "read", "delete"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/menu/*", "action":["create", "update", "read"], "effect":"allow" },
     { "condition":{}, "resource":"urn:x-adapt:{{tenantid}}/api/extension/*", "action":["create", "update", "read"], "effect":"allow" }
   ]

plugins/content/config/index.js

@@ -36,6 +36,7 @@ ConfigContent.prototype.hasPermission = function (action, userId, tenantId, cont
     }
 
     if (!isAllowed) {
+      contentItem = JSON.parse(contentItem);
       // Check the permissions string
       var resource = permissions.buildResourceString(tenantId, '/api/content/course/' + contentItem._courseId);
       permissions.hasPermission(userId, action, resource, next);