From 636d89f54072f57ad8c2ea90c41e323c2d2bde7f Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Sun, 24 May 2020 13:27:02 +0200
Subject: [PATCH] #1317 Hide mfa related columns in user admin if
 auth.multifactor.enabled = false

---
 frontend/app/scripts/app.js                                   | 3 +++
 .../app/scripts/components/organisation/OrgUserListCmp.js     | 1 +
 .../scripts/controllers/admin/organisation/OrgDetailsCtrl.js  | 3 ++-
 frontend/app/views/components/org/user.list.html              | 4 ++--
 frontend/app/views/partials/admin/organisation/details.html   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js
index e0ac4d9f34..e97d50330e 100644
--- a/frontend/app/scripts/app.js
+++ b/frontend/app/scripts/app.js
@@ -237,6 +237,9 @@ angular.module('thehive', [
                     },
                     fields: function(CustomFieldsSrv){
                         return CustomFieldsSrv.all();
+                    },
+                    appConfig: function(VersionSrv) {
+                        return VersionSrv.get();
                     }
                 },
                 permissions: ['manageOrganisation', 'manageUser', 'manageCaseTemplate']
diff --git a/frontend/app/scripts/components/organisation/OrgUserListCmp.js b/frontend/app/scripts/components/organisation/OrgUserListCmp.js
index 1c25395e82..be4e2790af 100644
--- a/frontend/app/scripts/components/organisation/OrgUserListCmp.js
+++ b/frontend/app/scripts/components/organisation/OrgUserListCmp.js
@@ -202,6 +202,7 @@
             templateUrl: 'views/components/org/user.list.html',
             bindings: {
                 users: '<',
+                mfaEnabled: '<',
                 onReload: '&',
                 onEdit: '&'
             }
diff --git a/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js b/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
index 04165446fc..034857d815 100644
--- a/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
+++ b/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
@@ -2,13 +2,14 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('OrgDetailsCtrl',
-        function($scope, $q, $uibModal, OrganisationSrv, NotificationSrv, UserSrv, organisation, users, templates, fields) {
+        function($scope, $q, $uibModal, OrganisationSrv, NotificationSrv, UserSrv, organisation, users, templates, fields, appConfig) {
             var self = this;
 
             this.org = organisation;
             this.users = users;
             this.templates = templates;
             this.fields = fields;
+            this.canChangeMfa = appConfig.config.capabilities.indexOf('mfa') !== -1;
 
             this.getUserInfo = UserSrv.getCache;
 
diff --git a/frontend/app/views/components/org/user.list.html b/frontend/app/views/components/org/user.list.html
index b4c1c9c5f3..4f439324d4 100644
--- a/frontend/app/views/components/org/user.list.html
+++ b/frontend/app/views/components/org/user.list.html
@@ -18,7 +18,7 @@
                     <th></th>
                     <th>Password</th>
                     <th>API Key</th>
-                    <th class="text-center" style="width: 100px">MFA</th>
+                    <th class="text-center" style="width: 100px" ng-if="$ctrl.mfaEnabled">MFA</th>
                     <th style="width: 180px"></th>
                 </tr>
             </thead>
@@ -84,7 +84,7 @@ <h4 class="media-heading">
                             </div>
                         </span>
                     </td>
-                    <td class="text-center">
+                    <td class="text-center" ng-if="$ctrl.mfaEnabled">
                         <span ng-if="!user.hasMFA">
                             No
                         </span>
diff --git a/frontend/app/views/partials/admin/organisation/details.html b/frontend/app/views/partials/admin/organisation/details.html
index a5d9d3015d..b4d4cf0f6e 100644
--- a/frontend/app/views/partials/admin/organisation/details.html
+++ b/frontend/app/views/partials/admin/organisation/details.html
@@ -65,7 +65,7 @@ <h3 class="box-title">
                                     </div>
                                 </div>
                             </div>
-                            <org-user-list users="$vm.users" on-reload="$vm.reloadUsers()" on-edit="$vm.showUserDialog(user)"></org-user-list>
+                            <org-user-list users="$vm.users" on-reload="$vm.reloadUsers()" on-edit="$vm.showUserDialog(user)" mfa-enabled="$vm.canChangeMfa"></org-user-list>
                         </div>
                     </uib-tab>
                     <uib-tab index="1" if-permission="manageCaseTemplate">