#77 Fixed issues with permissions for users. Added actions on users.

Intended permissions are now functional. Just need to add more things to do for the Admin (delete the team, for example). Remove user function doesn't work either yet, plus there needs to be a leave team option. Refactored the role definitions and put them in keystoneguru.php.
RaiderIO · Apr 18, 2019 · 234797d · 234797d
1 parent 1a9eed7
commit 234797d
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 86 deletions.
diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -20,10 +20,6 @@
  */
 class Team extends IconFileModel
 {
-    /**
-     * @var array List of current roles for a user in a team.
-     */
-    private static $_roles = ['member' => 1, 'collaborator' => 2, 'moderator' => 3, 'admin' => 4];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -63,20 +59,29 @@ public function getUserRole($user)
 
     /**
      * Get the roles that a user may assign to other users in this team.
-     * @param $user User
+     * @param $user User The user attempting to change roles.
+     * @param $targetUser User The user that is targeted for a role change.
      * @return array
      */
-    public function getAssignableRoles($user)
+    public function getAssignableRoles($user, $targetUser)
     {
         $userRole = $this->getUserRole($user);
+        $targetUserRole = $this->getUserRole($targetUser);
         $result = [];
 
-        if ($userRole !== false) {
-            // Count down from all roles that exist, starting by the role the user currently has
-            $userRoleKey = self::$_roles[$userRole];
-            for ($i = $userRoleKey; $i > 0; $i--) {
-                // array_search to find key by value
-                $result[] = array_search($i, self::$_roles);
+        // If both users have a valid role (should always be the case)
+        if ($userRole !== false && $targetUserRole !== false) {
+            $roles = config('keystoneguru.team_roles');
+            $userRoleKey = $roles[$userRole];
+            $targetUserRoleKey = $roles[$targetUserRole];
+            // If the current user is a moderator or admin, and (if user is admin or the current user outranks the other user)
+            if ($userRoleKey >= 3 && ($userRoleKey === 4 || $userRoleKey > $targetUserRoleKey)) {
+
+                // Count down from all roles that exist, starting by the role the user currently has
+                for ($i = $userRoleKey; $i > 0; $i--) {
+                    // array_search to find key by value
+                    $result[] = array_search($i, $roles);
+                }
             }
         }
 
@@ -96,16 +101,17 @@ public function getAssignableRoles($user)
     public function canChangeRole($user, $targetUser, $role)
     {
         $result = false;
+        $roles = config('keystoneguru.team_roles');
 
         // Only if it's a valid role
-        if (isset(self::$_roles[$role])) {
+        if (isset($roles[$role])) {
             $userRole = $this->getUserRole($user);
             $targetUserRole = $this->getUserRole($targetUser);
 
             if ($userRole !== false && $targetUserRole !== false) {
-                $userRoleKey = self::$_roles[$userRole];
-                $targetUserRoleKey = self::$_roles[$targetUserRole];
-                $targetRoleKey = self::$_roles[$role];
+                $userRoleKey = $roles[$userRole];
+                $targetUserRoleKey = $roles[$targetUserRole];
+                $targetRoleKey = $roles[$role];
 
                 // User has a bigger role, and then only up to where the current user is (no promotions past their own
                 // rank) the person, and only users who are currently a moderator or admin may change roles
@@ -119,8 +125,9 @@ public function canChangeRole($user, $targetUser, $role)
     public function changeRole($user, $role)
     {
         $teamUser = $this->teamusers()->where('user_id', $user->id)->get()->first();
+        $roles = config('keystoneguru.team_roles');
         // Only when user is part of the team, and when the role is a valid one.
-        if ($teamUser !== null && isset(self::$_roles[$role])) {
+        if ($teamUser !== null && isset($roles[$role])) {
             // Update the role with the new one
             $teamUser->role = $role;
             $teamUser->save();

diff --git a/app/Models/TeamUser.php b/app/Models/TeamUser.php
@@ -2,17 +2,21 @@
 
 namespace App\Models;
 
+use App\User;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
 
 /**
  * @property $id int
  * @property $team_id int
  * @property $user_id int
  * @property $role string
  *
- * @property Collection $team
- * @property Collection $user
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ *
+ * @property Team $team
+ * @property User $user
  *
  * @mixin \Eloquent
  */

diff --git a/config/keystoneguru.php b/config/keystoneguru.php
@@ -53,5 +53,10 @@
      * The amount of hours it takes before a dungeon route that is created through the 'try' functionality expires and
      * is deleted from the server.
      */
-    'try_dungeon_route_expires_hours' => 24
+    'try_dungeon_route_expires_hours' => 24,
+
+    /**
+     * @var array List of current roles for a user in a team.
+     */
+    'team_roles' => ['member' => 1, 'collaborator' => 2, 'moderator' => 3, 'admin' => 4]
 ];
diff --git a/resources/assets/js/custom/inline/dungeonroute/table.js b/resources/assets/js/custom/inline/dungeonroute/table.js
@@ -295,8 +295,6 @@ class DungeonrouteTable extends InlineCode {
             });
         }
 
-        console.log(columns);
-
         return columns;
     }
 

diff --git a/resources/assets/js/handlebars/team_member_table_actions_template.handlebars b/resources/assets/js/handlebars/team_member_table_actions_template.handlebars
@@ -1,7 +1,4 @@
-<select class="form-control selectpicker role_selection" data-username="{{username}}">
-    {{#roles}}
-        {{#select role}}
-            <option value="{{name}}" data-icon="fas {{icon}}">{{label}}</option>
-        {{/select}}
-    {{/roles}}
-</select>
+<button class="btn btn-danger">
+    <span class="d-xl-none"><i class="fas fa-user-minus"></i></span>
+    <span class="d-none d-xl-block"><i class="fas fa-user-minus"></i> {{remove_label}}</span>
+</button>
diff --git a/resources/assets/js/handlebars/team_member_table_permissions_self_template.handlebars b/resources/assets/js/handlebars/team_member_table_permissions_self_template.handlebars
@@ -0,0 +1 @@
+<i class="fas {{icon}}"></i> {{label}}
diff --git a/resources/assets/js/handlebars/team_member_table_permissions_template.handlebars b/resources/assets/js/handlebars/team_member_table_permissions_template.handlebars
@@ -0,0 +1,7 @@
+<select class="form-control selectpicker role_selection" data-username="{{username}}">
+    {{#select role}}
+        {{#roles}}
+            <option value="{{name}}" data-icon="fas {{icon}}">{{label}}</option>
+        {{/roles}}
+    {{/select}}
+</select>
diff --git a/resources/lang/en/js.php b/resources/lang/en/js.php
@@ -168,8 +168,9 @@
     'admin_label' => 'Own',
     'change_role_success' => 'Permissions updated',
 
-    'team_admin' => 'Admin',
-    'team_moderator' => 'Moderator',
-    'team_collaborator' => 'Collaborator',
-    'team_member' => 'Member',
+    'team_admin' => 'Administrate team',
+    'team_moderator' => 'Moderate team',
+    'team_collaborator' => 'Edit routes',
+    'team_member' => 'View routes',
+    'remove_label' => 'Remove'
 ];
diff --git a/resources/views/common/dungeonroute/table.blade.php b/resources/views/common/dungeonroute/table.blade.php
@@ -80,16 +80,16 @@
             &nbsp;
         </div>
         <div class="mb-2 text-right">
-            <div id="table_biglist_btn"
+            <button id="table_biglist_btn"
                  class="btn {{ $cookieViewMode === 'biglist' ? 'btn-primary' : 'btn-default' }} table_list_view_toggle"
                  data-viewmode="biglist">
                 <i class="fas fa-th-list"></i>
-            </div>
-            <div id="table_list_btn"
+            </button>
+            <button id="table_list_btn"
                  class="btn {{ $cookieViewMode === 'list' ? 'btn-primary' : 'btn-default' }}  table_list_view_toggle"
                  data-viewmode="list">
                 <i class="fas fa-list"></i>
-            </div>
+            </button>
         </div>
     </div>
 </div>

diff --git a/resources/views/team/edit.blade.php b/resources/views/team/edit.blade.php
@@ -1,5 +1,7 @@
 <?php
+/** @var \App\Models\Team $model */
 $title = isset($model) ? __('Edit team') : __('New team');
+$userRole = $model->getUserRole(Auth::user());
 ?>
 @extends('layouts.app', ['showAds' => false, 'title' => $title])
 @section('header-title', $title)
@@ -24,66 +26,81 @@
                     $teamuser->created_at->toDateTimeString(),
                     $teamuser->role,
                     // Any and all roles that the user may assign to other users
-                    $model->getAssignableRoles($teamuser->user)
+                    $model->getAssignableRoles(Auth::user(), $teamuser->user)
                 ];
             }
             ?>
         var _data = {!! json_encode($data) !!};
         var _teamId = {!! $model->id !!};
+        var _userIsModerator = {!! $userRole === 'admin' || $userRole === 'moderator' ? 'true' : 'false' !!};
 
         $(function () {
-            $('#team_members_table').DataTable({
-                'data': _data,
-                'columnDefs': [{
-                    'targets': 2,
-                    'render': function (data, type, row, meta) {
-                        // Matching roles to icons
-                        let icons = [{
-                            name: 'member',
-                            icon: 'fa-eye',
-                            label: lang.get('messages.team_member')
-                        }, {
-                            name: 'collaborator',
-                            icon: 'fa-edit',
-                            label: lang.get('messages.team_collaborator')
-                        }, {
-                            name: 'moderator',
-                            icon: 'fa-user-cog',
-                            label: lang.get('messages.team_moderator')
-                        }, {
-                            name: 'admin',
-                            icon: 'fa-crown',
-                            label: lang.get('messages.team_admin')
-                        }];
-
-                        let roles = [];
-
-                        // Match the valid roles with roles above
-                        for (let roleIndex in row[3]) {
-                            let role = row[3][roleIndex];
-                            for (let roleCandidateIndex in icons) {
-                                let roleCandidate = icons[roleCandidateIndex];
-                                if (role === roleCandidate.name) {
-                                    roles.push(roleCandidate);
-                                }
+            let columns = [{
+                'targets': 2,
+                'render': function (data, type, row, meta) {
+
+                    let roles = [];
+
+                    // Match the valid roles with roles above
+                    let assignableRoles = row[3];
+                    for (let roleIndex in assignableRoles) {
+                        if (assignableRoles.hasOwnProperty(roleIndex)) {
+                            // Fetch the role..
+                            let assignableRole = assignableRoles[roleIndex];
+
+                            let icon = _getIcon(assignableRole);
+                            if (icon !== false) {
+                                roles.push(icon);
                             }
                         }
+                    }
 
-                        console.log('roles', roles);
+                    let result = '';
+                    if (roles.length === 0) {
+                        let icon = _getIcon(data);
 
                         // Handlebars the entire thing
-                        let template = Handlebars.templates['team_member_table_actions_template'];
+                        let template = Handlebars.templates['team_member_table_permissions_self_template'];
+                        let templateData = $.extend({
+                            icon: icon.icon,
+                            label: icon.label
+                        }, getHandlebarsDefaultVariables());
+
+                        result = template(templateData);
+                    } else {
+                        // Handlebars the entire thing
+                        let template = Handlebars.templates['team_member_table_permissions_template'];
                         let templateData = $.extend({
                             username: row[0],
                             role: data,
                             is_admin: data === 'admin',
                             roles: roles
                         }, getHandlebarsDefaultVariables());
 
+                        result = template(templateData);
+                    }
+                    return result;
+                },
+                'orderable': false
+            }];
+
+            // Only admins/moderators have the option to remove members from a team
+            if (_userIsModerator) {
+                columns.push({
+                    'targets': 3,
+                    'render': function (data, type, row, meta) {
+                        // Handlebars the entire thing
+                        let template = Handlebars.templates['team_member_table_actions_template'];
+                        let templateData = $.extend({}, getHandlebarsDefaultVariables());
+
                         return template(templateData);
-                    },
-                    'orderable': false
-                }]
+                    }
+                });
+            }
+
+            $('#team_members_table').DataTable({
+                'data': _data,
+                'columnDefs': columns
             });
 
             // Fix members data table being in a separate tab ignoring width
@@ -108,6 +125,48 @@
                 });
             });
         });
+
+        /**
+         * Gets icon data for a role.
+         * @param roleName The name of the role you want icon data for.
+         * @returns {boolean}
+         * @private
+         */
+        function _getIcon(roleName) {
+            // Matching roles to icons
+            let icons = [{
+                name: 'member',
+                icon: 'fa-eye',
+                label: lang.get('messages.team_member')
+            }, {
+                name: 'collaborator',
+                icon: 'fa-edit',
+                label: lang.get('messages.team_collaborator')
+            }, {
+                name: 'moderator',
+                icon: 'fa-user-cog',
+                label: lang.get('messages.team_moderator')
+            }, {
+                name: 'admin',
+                icon: 'fa-crown',
+                label: lang.get('messages.team_admin')
+            }];
+
+            let result = false;
+
+            // For each role there exists
+            for (let roleCandidateIndex in icons) {
+                let roleCandidate = icons[roleCandidateIndex];
+                // Match assignable role with candidate
+                if (roleName === roleCandidate.name) {
+                    // Found what we're looking for, push the result
+                    result = roleCandidate;
+                    break;
+                }
+            }
+
+            return result;
+        }
     </script>
 @endsection
 @endisset
@@ -174,9 +233,16 @@
                     <table id="team_members_table" class="tablesorter default_table table-striped w-100" width="100%">
                         <thead>
                         <tr>
-                            <th width="65%">{{ __('Name') }}</th>
-                            <th width="20%">{{ __('Join date') }}</th>
-                            <th width="15%">{{ __('Permissions') }}</th>
+                            @if($userRole === 'member' || $userRole === 'collaborator')
+                                <th width="65%">{{ __('Name') }}</th>
+                                <th width="20%">{{ __('Join date') }}</th>
+                                <th width="15%">{{ __('Permissions') }}</th>
+                            @else
+                                <th width="50%">{{ __('Name') }}</th>
+                                <th width="20%">{{ __('Join date') }}</th>
+                                <th width="15%">{{ __('Permissions') }}</th>
+                                <th width="15%">{{ __('Actions') }}</th>
+                            @endif
                         </tr>
                         </thead>
                     </table>