Corrected permissions to go with the more logical thought process

DaneEveritt · DaneEveritt · commit a2a4ab05c88f · 2017-04-09T15:35:49.000-04:00
diff --git a/app/Transformers/Admin/LocationTransformer.php b/app/Transformers/Admin/LocationTransformer.php
@@ -93,7 +93,7 @@ public function includeServers(Location $location)
      */
     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
@@ -94,7 +94,7 @@ public function includeAllocations(Node $node)
      */
     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
@@ -81,7 +81,7 @@ public function transform(ServiceOption $option)
      */
     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 @@ public function includeService(ServiceOption $option)
      */
     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 @@ public function includePacks(ServiceOption $option)
      */
     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
@@ -83,7 +83,7 @@ public function transform($pack)
      */
     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 @@ public function includeOption(Pack $pack)
      */
     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
@@ -114,7 +114,7 @@ public function includeSubusers(Server $server)
      */
     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 @@ public function includeUser(Server $server)
      */
     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 @@ public function includePack(Server $server)
      */
     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 @@ public function includeService(Server $server)
      */
     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 @@ public function includeVariables(Server $server)
      */
     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 @@ public function includeLocation(Server $server)
      */
     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
@@ -76,7 +76,7 @@ public function transform(ServerVariable $variable)
      */
     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
@@ -80,7 +80,7 @@ public function transform(Service $service)
      */
     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 @@ public function includeOptions(Service $service)
      */
     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 @@ public function includeServers(Service $service)
      */
     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
@@ -76,7 +76,7 @@ public function transform(ServiceVariable $variable)
      */
     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
@@ -79,7 +79,7 @@ public function transform(User $user)
      */
     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 @@ public function includeServers(User $user)
      */
     public function includeAccess(User $user)
     {
-        if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) {
+        if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function includeServers(Location $location)`
`93`	`93`	`*/`
`94`	`94`	`public function includeNodes(Location $location)`
`95`	`95`	`{`
`96`		`- if ($this->request && ! $this->request->apiKeyHasPermission('location-list')) {`
	`96`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('node-list')) {`
`97`	`97`	`return;`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function includeAllocations(Node $node)`
`94`	`94`	`*/`
`95`	`95`	`public function includeLocation(Node $node)`
`96`	`96`	`{`
`97`		`- if ($this->request && ! $this->request->apiKeyHasPermission('node-view')) {`
	`97`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('location-view')) {`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function transform(ServiceOption $option)`
`81`	`81`	`*/`
`82`	`82`	`public function includeService(ServiceOption $option)`
`83`	`83`	`{`
`84`		`- if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
	`84`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`
`@@ -95,7 +95,7 @@ public function includeService(ServiceOption $option)`
`95`	`95`	`*/`
`96`	`96`	`public function includePacks(ServiceOption $option)`
`97`	`97`	`{`
`98`		`- if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
	`98`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) {`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`@@ -109,7 +109,7 @@ public function includePacks(ServiceOption $option)`
`109`	`109`	`*/`
`110`	`110`	`public function includeServers(ServiceOption $option)`
`111`	`111`	`{`
`112`		`- if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
	`112`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {`
`113`	`113`	`return;`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function transform($pack)`
`83`	`83`	`*/`
`84`	`84`	`public function includeOption(Pack $pack)`
`85`	`85`	`{`
`86`		`- if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) {`
	`86`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
`87`	`87`	`return;`
`88`	`88`	`}`
`89`	`89`
`@@ -97,7 +97,7 @@ public function includeOption(Pack $pack)`
`97`	`97`	`*/`
`98`	`98`	`public function includeServers(Pack $pack)`
`99`	`99`	`{`
`100`		`- if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) {`
	`100`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function includeSubusers(Server $server)`
`114`	`114`	`*/`
`115`	`115`	`public function includeUser(Server $server)`
`116`	`116`	`{`
`117`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`117`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) {`
`118`	`118`	`return;`
`119`	`119`	`}`
`120`	`120`
`@@ -128,7 +128,7 @@ public function includeUser(Server $server)`
`128`	`128`	`*/`
`129`	`129`	`public function includePack(Server $server)`
`130`	`130`	`{`
`131`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`131`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('pack-view')) {`
`132`	`132`	`return;`
`133`	`133`	`}`
`134`	`134`
`@@ -142,7 +142,7 @@ public function includePack(Server $server)`
`142`	`142`	`*/`
`143`	`143`	`public function includeService(Server $server)`
`144`	`144`	`{`
`145`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`145`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {`
`146`	`146`	`return;`
`147`	`147`	`}`
`148`	`148`
`@@ -156,7 +156,7 @@ public function includeService(Server $server)`
`156`	`156`	`*/`
`157`	`157`	`public function includeOption(Server $server)`
`158`	`158`	`{`
`159`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`159`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
`160`	`160`	`return;`
`161`	`161`	`}`
`162`	`162`
`@@ -184,7 +184,7 @@ public function includeVariables(Server $server)`
`184`	`184`	`*/`
`185`	`185`	`public function includeLocation(Server $server)`
`186`	`186`	`{`
`187`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`187`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('location-view')) {`
`188`	`188`	`return;`
`189`	`189`	`}`
`190`	`190`
`@@ -198,7 +198,7 @@ public function includeLocation(Server $server)`
`198`	`198`	`*/`
`199`	`199`	`public function includeNode(Server $server)`
`200`	`200`	`{`
`201`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`201`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('node-view')) {`
`202`	`202`	`return;`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function transform(ServerVariable $variable)`
`76`	`76`	`*/`
`77`	`77`	`public function includeParent(ServerVariable $variable)`
`78`	`78`	`{`
`79`		`- if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {`
	`79`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function transform(Service $service)`
`80`	`80`	`*/`
`81`	`81`	`public function includeOptions(Service $service)`
`82`	`82`	`{`
`83`		`- if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {`
	`83`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('option-list')) {`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`
`@@ -94,7 +94,7 @@ public function includeOptions(Service $service)`
`94`	`94`	`*/`
`95`	`95`	`public function includeServers(Service $service)`
`96`	`96`	`{`
`97`		`- if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {`
	`97`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
`@@ -108,7 +108,7 @@ public function includeServers(Service $service)`
`108`	`108`	`*/`
`109`	`109`	`public function includePacks(Service $service)`
`110`	`110`	`{`
`111`		`- if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {`
	`111`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) {`
`112`	`112`	`return;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function transform(User $user)`
`79`	`79`	`*/`
`80`	`80`	`public function includeServers(User $user)`
`81`	`81`	`{`
`82`		`- if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) {`
	`82`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {`
`83`	`83`	`return;`
`84`	`84`	`}`
`85`	`85`
`@@ -93,7 +93,7 @@ public function includeServers(User $user)`
`93`	`93`	`*/`
`94`	`94`	`public function includeAccess(User $user)`
`95`	`95`	`{`
`96`		`- if ($this->request && ! $this->request->apiKeyHasPermission('user-view')) {`
	`96`	`+ if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {`
`97`	`97`	`return;`
`98`	`98`	`}`
`99`	`99`