fix(rules): all bot rules start with bot.

botpress · Jun 9, 2018 · 98643a0 · 98643a0
1 parent 9455970
commit 98643a0
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 47 deletions.
diff --git a/packages/core/botpress-util-roles/src/resources.js b/packages/core/botpress-util-roles/src/resources.js
@@ -26,60 +26,48 @@ const _RESOURCES = [
     operations: [r, w]
   },
   {
-    name: 'modules',
-    description: 'Bot extensions, such as NLU or HITL',
+    name: 'bot',
+    description: 'Bot properties, such as content, flows etc.',
     children: [
       {
         name: '*',
-        description: 'All modules',
-        operations: [r]
+        description: 'All bot properties',
+        operations: [r, w]
       },
       {
-        name: 'list',
-        description: 'The list of the installed modules',
+        name: 'notifications',
+        description: 'Bot notifications, such as runtime errors',
         operations: [r]
       },
       {
-        name: 'list.community',
-        description: 'The list of the publicly available modules',
+        name: 'modules.*',
+        description: 'Bot extensions, such as NLU or HITL',
         operations: [r]
-      }
-    ]
-  },
-  {
-    name: 'middleware',
-    description: 'Installed bot middlewares',
-    children: [
+      },
       {
-        name: '*',
+        name: 'middleware.*',
         description: 'All middleware operations',
         operations: [r, w]
       },
       {
-        name: 'list',
+        name: 'middleware.list',
         description: 'Get the list of the installed middlewares',
         operations: [r]
       },
       {
-        name: 'customizations',
+        name: 'middleware.customizations',
         description: 'Change the order of the middlewares and their enabled/disabled state',
         operations: [w]
-      }
-    ]
-  },
-  {
-    name: 'notifications',
-    description: 'Bot notifications, such as runtime errors',
-    operations: [r]
-  },
-  {
-    name: 'bot',
-    description: 'Bot properties, such as content, flows etc.',
-    children: [
+      },
       {
-        name: '*',
-        description: 'All bot properties',
-        operations: [r, w]
+        name: 'modules.list',
+        description: 'The list of the installed modules',
+        operations: [r]
+      },
+      {
+        name: 'modules.list.community',
+        description: 'The list of the publicly available modules',
+        operations: [r]
       },
       {
         name: 'information',

diff --git a/packages/core/botpress/src/server/secured.js b/packages/core/botpress/src/server/secured.js
@@ -9,7 +9,7 @@ let logsSecret = nanoid()
 module.exports = (bp, app) => {
   // modules
 
-  app.secure('read', 'modules.list').get('/api/modules', (req, res) => {
+  app.secure('read', 'bot.modules.list').get('/api/modules', (req, res) => {
     const modules = _.map(bp._loadedModules, module => {
       return {
         name: util.getModuleShortname(module.name),
@@ -26,33 +26,33 @@ module.exports = (bp, app) => {
     res.send(modules)
   })
 
-  app.secure('read', 'modules.list.community').get('/api/module/all', (req, res) => {
+  app.secure('read', 'bot.modules.list.community').get('/api/module/all', (req, res) => {
     bp.modules.listAllCommunityModules().then(modules => res.send(modules))
   })
 
-  app.secure('read', 'modules.list.community').get('/api/module/hero', (req, res) => {
+  app.secure('read', 'bot.modules.list.community').get('/api/module/hero', (req, res) => {
     bp.modules.getRandomCommunityHero().then(hero => res.send(hero))
   })
 
-  app.secure('read', 'modules.list.community').get('/api/bot/contributor', (req, res) => {
+  app.secure('read', 'bot.modules.list.community').get('/api/bot/contributor', (req, res) => {
     res.send(bp.bot.getContributor())
   })
 
   // middleware
 
-  app.secure('read', 'middleware.list').get('/api/middlewares', (req, res) => {
+  app.secure('read', 'bot.middleware.list').get('/api/middlewares', (req, res) => {
     res.send(bp.middlewares.list())
   })
 
-  app.secure('write', 'middleware.customizations').post('/api/middlewares/customizations', (req, res) => {
+  app.secure('write', 'bot.middleware.customizations').post('/api/middlewares/customizations', (req, res) => {
     bp.stats.track('api', 'middlewares', 'customizations')
     const { middlewares } = req.body
     bp.middlewares.setCustomizations(middlewares)
     bp.middlewares.load()
     res.send(bp.middlewares.list())
   })
 
-  app.secure('write', 'middleware.customizations').delete('/api/middlewares/customizations', (req, res) => {
+  app.secure('write', 'bot.middleware.customizations').delete('/api/middlewares/customizations', (req, res) => {
     bp.stats.track('api', 'middlewares', 'customizations')
     bp.middlewares.resetCustomizations()
     bp.middlewares.load()
@@ -62,11 +62,11 @@ module.exports = (bp, app) => {
   // notifications
 
   // DEPRECATED in Botpress 1.1
-  app.secure('read', 'notifications').get('/api/notifications', async (req, res) => {
+  app.secure('read', 'bot.notifications').get('/api/notifications', async (req, res) => {
     res.send(await bp.notifications.getInbox())
   })
 
-  app.secure('read', 'notifications').get('/api/notifications/inbox', async (req, res) => {
+  app.secure('read', 'bot.notifications').get('/api/notifications/inbox', async (req, res) => {
     res.send(await bp.notifications.getInbox())
   })
 

diff --git a/packages/core/botpress/src/web/components/Layout/Sidebar.jsx b/packages/core/botpress/src/web/components/Layout/Sidebar.jsx
@@ -23,7 +23,7 @@ const BASIC_MENU_ITEMS = [
   {
     name: 'Modules',
     path: '/manage',
-    rule: { res: 'modules.list', op: 'read' },
+    rule: { res: 'bot.modules.list', op: 'read' },
     icon: 'build'
   },
   window.GHOST_ENABLED && {
@@ -50,7 +50,7 @@ const BASIC_MENU_ITEMS = [
   {
     name: 'Middleware',
     path: '/middleware',
-    rule: { res: 'middleware.list', op: 'read' },
+    rule: { res: 'bot.middleware.list', op: 'read' },
     icon: 'settings'
   }
 ].filter(Boolean)

diff --git a/packages/core/botpress/src/web/components/Middlewares/index.jsx b/packages/core/botpress/src/web/components/Middlewares/index.jsx
@@ -113,8 +113,8 @@ class Middlewares extends Component {
       return
     }
     this.initialized = true
-    this.canRead = operationAllowed({ user: this.props.user, op: 'read', res: 'middleware.list' })
-    this.canEdit = operationAllowed({ user: this.props.user, op: 'write', res: 'middleware.customizations' })
+    this.canRead = operationAllowed({ user: this.props.user, op: 'read', res: 'bot.middleware.list' })
+    this.canEdit = operationAllowed({ user: this.props.user, op: 'write', res: 'bot.middleware.customizations' })
 
     if (this.canRead) {
       axios.get('/api/middlewares').then(({ data }) => this.setMiddlewares(data))

diff --git a/packages/core/botpress/src/web/views/Dashboard/index.jsx b/packages/core/botpress/src/web/views/Dashboard/index.jsx
@@ -32,7 +32,7 @@ class Dashboard extends React.Component {
   }
 
   queryAllModules() {
-    if (!operationAllowed({ user: this.props.user, op: 'read', res: 'modules.list.community' })) {
+    if (!operationAllowed({ user: this.props.user, op: 'read', res: 'bot.modules.list.community' })) {
       return Promise.resolve()
     }
     return axios.get('/api/module/all').then(result =>