✨ Role-based login for election manager

avAdmin/admin-controller/admin-controller.js

@@ -38,9 +38,6 @@ angular
       var id = $stateParams.id;
       $scope.electionId = id;
 
-      // get election perms, with a default of no perms
-      $scope.perms = {val: ""};
-
       $scope.state = $state.current.name;
       $scope.current = null;
       $scope.noplugin = true;
@@ -219,13 +216,30 @@ angular
       Plugins.hook('add-dashboard-election-states', plugins_data);
       states = states.concat(plugins_data.states);
 
+
+      $scope.hasPerms = function (optionList) {
+        return optionList.some(function (option ) {
+          return $scope.perms.val.includes(option);
+        });
+      };
+
+      // get election perms, with a default of no perms
+      $scope.perms = {val: ""};
+      ElectionsApi
+        .getEditPerm($scope.electionId)
+        .then(
+          function (perm) {
+            $scope.perms.val = perm.split(":")[4].split("|");
+          }
+        );
+
       $scope.globalPerms = {val: ""};
       // update global perms
       ElectionsApi
         .getEditPerm(null)
         .then(
           function (perm) {
-            $scope.globalPerms.val = perm;
+            $scope.globalPerms.val = perm.split(":")[4].split("|");
           }
         );
 
@@ -258,7 +272,6 @@ angular
 
                         if (
                           perm.indexOf('event-view-activity') !== -1 ||
-                          perm.indexOf('view') !== -1 || 
                           perm.indexOf('edit') !== -1
                         ) {
                           $scope.sidebarlinks = $scope.sidebarlinks.concat([
@@ -268,7 +281,7 @@ angular
 
 
                         // update election perms
-                        $scope.perms.val = perm;
+                        $scope.perms.val = perm.split(":")[4].split("|");
                       }
                     );
                 }
@@ -279,7 +292,13 @@ angular
               {name: 'questions', icon: 'question-circle'},
               {name: 'auth', icon: 'unlock'},
               {name: 'censusConfig', icon: 'newspaper-o'},
-              {name: 'census', icon: 'users'},
+              {
+                name: 'census',
+                icon: 'users',
+                permsFunc: function() {
+                  return $scope.hasPerms(["view-census", "edit"]);
+                }
+              },
               //{name: 'successAction', icon: 'star-o'},
               {name: 'adminFields', icon: 'user'},
               //{name: 'tally', icon: 'pie-chart'},

avAdmin/admin-directives/ballot-box/ballot-box.html

@@ -125,6 +125,7 @@ <h2 ng-i18next>avAdmin.ballotBox.title</h2>
           <td class="small-col text-right actions">
             <span
                 ng-repeat="command in row_commands"
+                ng-if="command.permsFunc()"
                 ng-class="{'disabled': !command.enableFunc(obj)}">
                 <a ng-click="command.actionFunc(obj)">
                     <i class="{{command.iconClass}}"

avAdmin/admin-directives/ballot-box/ballot-box.js

@@ -228,6 +228,9 @@ angular.module('avAdmin')
               ballotBox.num_tally_sheets > 0 &&
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('list-tally-sheets') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["list-tally-sheets", "edit"]);
           }
         },
         {
@@ -313,6 +316,9 @@ angular.module('avAdmin')
                 )
               )
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["override-tally-sheets", "add-tally-sheets"]);
           }
         },
         {
@@ -351,6 +357,9 @@ angular.module('avAdmin')
               ballotBox.num_tally_sheets > 0 &&
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('delete-tally-sheets') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["delete-tally-sheets"]);
           }
         },
         {
@@ -377,6 +386,9 @@ angular.module('avAdmin')
             return (
               ElectionsApi.getCachedEditPerm(scope.electionId).indexOf('delete-ballot-boxes') !== -1
             );
+          },
+          permsFunc: function() {
+            return scope.hasPerms(["delete-ballot-boxes"]);
           }
         }
       ];

avAdmin/admin-directives/dashboard/dashboard.html

@@ -10,7 +10,7 @@ <h2>
          </h2>
        </span>
     </div>
-    <div class="dropdown pull-right actions-div">
+    <div class="dropdown pull-right actions-div"  ng-if="permittedActions().length > 0">
       <button
         class="btn btn-success actionbtn ng-scope btn-primary dropdown-toggle"
         type="button"
@@ -22,7 +22,7 @@ <h2>
       </button>
       <ul class="dropdown-menu">
         <li
-          ng-repeat="action in actions"
+          ng-repeat="action in permittedActions()"
           ng-class="{'disabled': !action.enableFunc()}">
           <a ng-click="action.enableFunc() && action.actionFunc()">
             <i class="{{action.iconClass}}"></i>
@@ -71,9 +71,9 @@ <h2>
           </div>
           <button 
             ng-click="doActionConfirm($index)" 
-            class="actionbtn btn btn-success" 
+            class="actionbtn btn btn-success"
             ng-disabled="!commands[$index].enableFunc()"
-            ng-if="index == $index && nextaction" 
+            ng-if="index == $index && nextaction && commands[$index].permsFunc()" 
             ng-class="['election-status-action-' + index]">
             <div 
               class="small {{ nextaction }}" 
@@ -88,7 +88,7 @@ <h2>
             ng-click="doActionConfirm($index)"
             class="actionbtn btn btn-success"
             ng-disabled="!commands[$index].enableFunc()"
-            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index"
+            ng-if="getStatusIndex('results_ok') === $index && index === 1 + $index && commands[$index].permsFunc()"
           >
             <div 
               class="small" 
@@ -123,7 +123,7 @@ <h2>
                 <strong>{{ election.auth.census|number }}</strong><br/>
                 <button
                   ng-click="sendAuthCodes()"
-                  ng-disabled="perms.val.indexOf('send-auth-all') === -1 && perms.val.indexOf('edit') === -1"
+                  ng-if="scope.hasPerms(['send-auth-all', 'edit'])"
                   class="btn btn-success send-auth pull-left">
                     <i class="fa fa-sw fa-send"></i>
                     <span ng-i18next>
@@ -161,14 +161,15 @@ <h2>
 
             <button
               class="btn btn-block btn-lg btn-success-action" 
-              ng-if="nextaction" 
+              ng-if="nextaction && commands[index].permsFunc()" 
               ng-disabled="!commands[index].enableFunc()"
               ng-i18next="{{ nextaction }}"
               ng-click="doActionConfirm(index)">
             </button>
 
             <button
               ng-click="duplicateElection()"
+              ng-if="hasPerms(['create'])"
               class="btn btn-block btn-lg btn-success"
               ng-i18next>
               avAdmin.dashboard.duplicateElection