feat(about): add switch toggle for operlist command to user or oper

zanzhz1101 · Jun 2, 2018 · 102b85f · 102b85f
1 parent 64d70ee
commit 102b85f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/config/env/torrents.js b/config/env/torrents.js
@@ -1123,6 +1123,17 @@ module.exports = {
      */
     userRoles: ['user', 'oper', 'admin'],
 
+    /**
+     * @state
+     *
+     * setting roles for state access
+     *
+     * @operList:           roles for state: about.operlist
+     */
+    state: {
+      operList: ['user', 'oper', 'admin']
+    },
+
     /**
      * @clientBlackList
      *

diff --git a/modules/about/client/config/about.client.routes.js b/modules/about/client/config/about.client.routes.js
@@ -5,9 +5,11 @@
     .module('about.routes')
     .config(routeConfig);
 
-  routeConfig.$inject = ['$stateProvider'];
+  routeConfig.$inject = ['$stateProvider', 'MeanTorrentConfigProvider'];
+
+  function routeConfig($stateProvider, MeanTorrentConfigProvider) {
+    var stateConfig = MeanTorrentConfigProvider.meanTorrentConfig().state;
 
-  function routeConfig($stateProvider) {
     $stateProvider
       .state('about', {
         abstract: true,
@@ -151,7 +153,7 @@
         url: '/operlist',
         templateUrl: '/modules/about/client/views/operlist.client.view.html',
         data: {
-          roles: ['user', 'oper', 'admin'],
+          roles: stateConfig.operList,
           pageTitle: 'PAGETITLE.OPERLIST'
         }
       });

diff --git a/...ices/meantorrent-config.client.service.js → ...ices/meantorrent-config.client.service.js b/...ices/meantorrent-config.client.service.js → ...ices/meantorrent-config.client.service.js
@@ -4,7 +4,7 @@
   // Authentication service for user variables
 
   angular
-    .module('torrents.services')
+    .module('core')
     .provider('MeanTorrentConfig', MeanTorrentConfig);
 
   //MeanTorrentConfig.$inject = ['$window'];

diff --git a/modules/users/server/policies/admin.server.policy.js b/modules/users/server/policies/admin.server.policy.js
@@ -46,6 +46,7 @@ exports.invokeRolesPolicies = function () {
       {
         roles: ['user'],
         allows: [
+          {resources: '/api/users', permissions: ['get']},
           {resources: '/api/users/:userId', permissions: ['get']},
           {resources: '/api/users/:userId/uptotal', permissions: ['get']},
           {resources: '/api/users/:userId/followers', permissions: ['get']},