cleanup authenticated and added check for enabled moduler

EthanGuo · May 7, 2014 · 60569f3 · 60569f3
1 parent e4e8e46
commit 60569f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/public/system/services/global.js b/public/system/services/global.js
@@ -7,7 +7,7 @@ angular.module('mean.system').factory('Global', [
 
         _this._data = {
             user: window.user,
-            authenticated: window.authenticated.length
+            authenticated: window.user.roles
         };
         return _this._data;
     }

diff --git a/server/controllers/index.js b/server/controllers/index.js
@@ -3,18 +3,11 @@
 var mean = require('meanio');
 
 exports.render = function(req, res) {
-    
+
     var modules = [];
-    var roles = (req.user ? req.user.roles : []);
 
-    var enableAdmin = false;
     // Preparing angular modules list with dependencies
     for (var name in mean.modules) {
-
-        if (name === 'mean-admin' && roles.indexOf('admin') != -1) {
-            enableAdmin = true;
-        }
-
         modules.push({
             name: name,
             module: 'mean.' + name,
@@ -28,10 +21,12 @@ exports.render = function(req, res) {
             name: req.user.name,
             _id: req.user._id,
             username: req.user.username,
-            roles: roles
-        } : 'null',
+            roles: req.user.roles
+        } : {},
         modules: modules,
-        enableAdmin:enableAdmin,
-        authenticated: roles
+        enabledAdmin: function(name) {
+            return (req.user.roles && req.user.roles.indexOf('admin') && mean.enabled(name));
+        }
+
     });
 };
diff --git a/server/views/index.html b/server/views/index.html
@@ -4,6 +4,5 @@
     <script type="text/javascript">
         window.user = {{user|json|safe}};        
         window.modules = {{modules|json|safe}};      
-        window.authenticated = {{authenticated|json|safe}};      
     </script>
 {% endblock %}
diff --git a/server/views/layouts/default.html b/server/views/layouts/default.html
@@ -4,7 +4,7 @@
 
 <body>
     <div class="navbar navbar-inverse navbar-fixed-top" data-ng-include="'/public/system/views/header.html'" data-role="navigation"></div>
-    {% if enableAdmin %}
+    {% if enabledAdmin('mean-admin')  %}
     <section class="admin-menu">
         <div data-ng-include="'/mean-admin/views/index.html'"></div>
     </section>