From a2a4ab05c88ff3e2e474db07edf32499f17e446f Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 9 Apr 2017 15:35:49 -0400 Subject: [PATCH] Corrected permissions to go with the more logical thought process --- app/Transformers/Admin/LocationTransformer.php | 2 +- app/Transformers/Admin/NodeTransformer.php | 2 +- app/Transformers/Admin/OptionTransformer.php | 6 +++--- app/Transformers/Admin/PackTransformer.php | 4 ++-- app/Transformers/Admin/ServerTransformer.php | 12 ++++++------ app/Transformers/Admin/ServerVariableTransformer.php | 2 +- app/Transformers/Admin/ServiceTransformer.php | 6 +++--- .../Admin/ServiceVariableTransformer.php | 2 +- app/Transformers/Admin/UserTransformer.php | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Transformers/Admin/LocationTransformer.php b/app/Transformers/Admin/LocationTransformer.php index 0ef0e8875..f3fd95885 100644 --- a/app/Transformers/Admin/LocationTransformer.php +++ b/app/Transformers/Admin/LocationTransformer.php @@ -93,7 +93,7 @@ class LocationTransformer extends TransformerAbstract */ public function includeNodes(Location $location) { - if ($this->request && ! $this->request->apiKeyHasPermission('location-list')) { + if ($this->request && ! $this->request->apiKeyHasPermission('node-list')) { return; } diff --git a/app/Transformers/Admin/NodeTransformer.php b/app/Transformers/Admin/NodeTransformer.php index da49a17dd..672a05e79 100644 --- a/app/Transformers/Admin/NodeTransformer.php +++ b/app/Transformers/Admin/NodeTransformer.php @@ -94,7 +94,7 @@ class NodeTransformer extends TransformerAbstract */ public function includeLocation(Node $node) { - if ($this->request && ! $this->request->apiKeyHasPermission('node-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('location-view')) { return; } diff --git a/app/Transformers/Admin/OptionTransformer.php b/app/Transformers/Admin/OptionTransformer.php index a5dd9a4b8..5b86b53d6 100644 --- a/app/Transformers/Admin/OptionTransformer.php +++ b/app/Transformers/Admin/OptionTransformer.php @@ -81,7 +81,7 @@ class OptionTransformer extends TransformerAbstract */ public function includeService(ServiceOption $option) { - if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) { return; } @@ -95,7 +95,7 @@ class OptionTransformer extends TransformerAbstract */ public function includePacks(ServiceOption $option) { - if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) { return; } @@ -109,7 +109,7 @@ class OptionTransformer extends TransformerAbstract */ public function includeServers(ServiceOption $option) { - if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) { return; } diff --git a/app/Transformers/Admin/PackTransformer.php b/app/Transformers/Admin/PackTransformer.php index 99603b6de..8d059faaf 100644 --- a/app/Transformers/Admin/PackTransformer.php +++ b/app/Transformers/Admin/PackTransformer.php @@ -83,7 +83,7 @@ class PackTransformer extends TransformerAbstract */ public function includeOption(Pack $pack) { - if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { return; } @@ -97,7 +97,7 @@ class PackTransformer extends TransformerAbstract */ public function includeServers(Pack $pack) { - if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) { return; } diff --git a/app/Transformers/Admin/ServerTransformer.php b/app/Transformers/Admin/ServerTransformer.php index 9bb23896c..366c3d63d 100644 --- a/app/Transformers/Admin/ServerTransformer.php +++ b/app/Transformers/Admin/ServerTransformer.php @@ -114,7 +114,7 @@ class ServerTransformer extends TransformerAbstract */ public function includeUser(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) { return; } @@ -128,7 +128,7 @@ class ServerTransformer extends TransformerAbstract */ public function includePack(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) { return; } @@ -142,7 +142,7 @@ class ServerTransformer extends TransformerAbstract */ public function includeService(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) { return; } @@ -156,7 +156,7 @@ class ServerTransformer extends TransformerAbstract */ public function includeOption(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { return; } @@ -184,7 +184,7 @@ class ServerTransformer extends TransformerAbstract */ public function includeLocation(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('location-view')) { return; } @@ -198,7 +198,7 @@ class ServerTransformer extends TransformerAbstract */ public function includeNode(Server $server) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('node-view')) { return; } diff --git a/app/Transformers/Admin/ServerVariableTransformer.php b/app/Transformers/Admin/ServerVariableTransformer.php index 835ba41be..3211e0295 100644 --- a/app/Transformers/Admin/ServerVariableTransformer.php +++ b/app/Transformers/Admin/ServerVariableTransformer.php @@ -76,7 +76,7 @@ class ServerVariableTransformer extends TransformerAbstract */ public function includeParent(ServerVariable $variable) { - if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { return; } diff --git a/app/Transformers/Admin/ServiceTransformer.php b/app/Transformers/Admin/ServiceTransformer.php index 61d544fa6..2df1fc8cc 100644 --- a/app/Transformers/Admin/ServiceTransformer.php +++ b/app/Transformers/Admin/ServiceTransformer.php @@ -80,7 +80,7 @@ class ServiceTransformer extends TransformerAbstract */ public function includeOptions(Service $service) { - if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('option-list')) { return; } @@ -94,7 +94,7 @@ class ServiceTransformer extends TransformerAbstract */ public function includeServers(Service $service) { - if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) { return; } @@ -108,7 +108,7 @@ class ServiceTransformer extends TransformerAbstract */ public function includePacks(Service $service) { - if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) { return; } diff --git a/app/Transformers/Admin/ServiceVariableTransformer.php b/app/Transformers/Admin/ServiceVariableTransformer.php index c9105f68f..7f41a1079 100644 --- a/app/Transformers/Admin/ServiceVariableTransformer.php +++ b/app/Transformers/Admin/ServiceVariableTransformer.php @@ -76,7 +76,7 @@ class ServiceVariableTransformer extends TransformerAbstract */ public function includeVariables(ServiceVariable $variable) { - if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) { return; } diff --git a/app/Transformers/Admin/UserTransformer.php b/app/Transformers/Admin/UserTransformer.php index 5349aa144..0d26961b9 100644 --- a/app/Transformers/Admin/UserTransformer.php +++ b/app/Transformers/Admin/UserTransformer.php @@ -79,7 +79,7 @@ class UserTransformer extends TransformerAbstract */ public function includeServers(User $user) { - if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) { return; } @@ -93,7 +93,7 @@ class UserTransformer extends TransformerAbstract */ public function includeAccess(User $user) { - if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) { + if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) { return; }