#1592 Fix user visibility for admin

TheHive-Project · Nov 13, 2020 · 382d717 · 382d717
1 parent 11e5067
commit 382d717
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js b/frontend/app/scripts/controllers/admin/organisation/OrgDetailsCtrl.js
@@ -55,11 +55,6 @@
                             '_name': 'users'
                         }
                     ],
-                    config: {
-                        headers: {
-                            'X-Organisation': self.org.name
-                        }
-                    },
                     onFailure: function(err) {
                         if(err && err.status === 400) {
                             self.filtering.resetContext();

diff --git a/frontend/app/scripts/services/api/OrganisationSrv.js b/frontend/app/scripts/services/api/OrganisationSrv.js
@@ -54,11 +54,7 @@
                     {
                         '_name': 'users'
                     }
-                ], {
-                    headers: {
-                        'X-Organisation': orgId
-                    }
-                }).then(function(response) {
+                ]).then(function(response) {
                     return $q.resolve(response.data);
                 });
             };

diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
@@ -159,7 +159,8 @@ object OrganisationOps {
     def dashboards: Traversal.V[Dashboard] = traversal.out[OrganisationDashboard].v[Dashboard]
 
     def visible(implicit authContext: AuthContext): Traversal.V[Organisation] =
-      if (authContext.isPermitted(Permissions.manageOrganisation)) traversal
+      if (authContext.isPermitted(Permissions.manageOrganisation))
+        traversal
       else
         traversal.filter(_.visibleOrganisationsTo.users.current)