Improves server model and cleans up model code calls.

DaneEveritt · DaneEveritt · commit 02458c909d31 · 2017-02-05T19:19:46.000-05:00
diff --git a/app/Http/Controllers/API/User/InfoController.php b/app/Http/Controllers/API/User/InfoController.php
@@ -32,7 +32,7 @@ class InfoController extends BaseController
 {
     public function me(Request $request)
     {
-        return Models\Server::getUserServers()->map(function ($server) {
+        return $request->user()->serverAccessCollection()->map(function ($server) {
             return [
                 'id' => $server->uuidShort,
                 'uuid' => $server->uuid,
diff --git a/app/Http/Controllers/Base/IndexController.php b/app/Http/Controllers/Base/IndexController.php
@@ -48,7 +48,7 @@ public function __construct()
     public function getIndex(Request $request)
     {
         return view('base.index', [
-            'servers' => Server::getUserServers(10),
+            'servers' => $request->user()->serverAccessCollection(10)->load('node', 'allocation'),
         ]);
     }
 
diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php
@@ -52,4 +52,15 @@ class Allocation extends Model
          'port' => 'integer',
          'server_id' => 'integer',
      ];
+
+     /**
+      * Accessor to automatically provide the IP alias if defined.
+      *
+      * @param  null|string $value
+      * @return string
+      */
+     public function getAliasAttribute($value)
+     {
+         return (is_null($this->ip_alias)) ? $this->ip : $this->ip_alias;
+     }
 }
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -103,40 +103,6 @@ public function __construct()
         self::$user = Auth::user();
     }
 
-    /**
-     * Returns array of all servers owned by the logged in user.
-     * Returns all users servers if user is a root admin.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public static function getUserServers($paginate = null)
-    {
-        $query = self::select(
-            'servers.*',
-            'nodes.name as nodeName',
-            'locations.short as a_locationShort',
-            'allocations.ip',
-            'allocations.ip_alias',
-            'allocations.port',
-            'services.name as a_serviceName',
-            'service_options.name as a_serviceOptionName'
-        )->join('nodes', 'servers.node_id', '=', 'nodes.id')
-        ->join('locations', 'nodes.location_id', '=', 'locations.id')
-        ->join('services', 'servers.service_id', '=', 'services.id')
-        ->join('service_options', 'servers.option_id', '=', 'service_options.id')
-        ->join('allocations', 'servers.allocation_id', '=', 'allocations.id');
-
-        if (self::$user->root_admin !== 1) {
-            $query->whereIn('servers.id', Subuser::accessServers());
-        }
-
-        if (is_numeric($paginate)) {
-            return $query->paginate($paginate);
-        }
-
-        return $query->get();
-    }
-
     /**
      * Returns a single server specified by UUID.
      * DO NOT USE THIS TO MODIFY SERVER DETAILS OR SAVE THOSE DETAILS.
@@ -150,7 +116,7 @@ public static function byUuid($uuid)
         $query = self::with('service', 'node')->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
 
         if (! Auth::user()->isRootAdmin()) {
-            $query->whereIn('id', Subuser::accessServers());
+            $query->whereIn('id', Auth::user()->serverAccessArray());
         }
 
         $result = $query->first();
@@ -228,6 +194,16 @@ public function user()
         return $this->belongsTo(User::class, 'owner_id');
     }
 
+    /**
+     * Gets the default allocation for a server.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function allocation()
+    {
+        return $this->hasOne(Allocation::class, 'id', 'allocation_id');
+    }
+
     /**
      * Gets all allocations associated with this server.
      *
diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php
@@ -55,33 +55,8 @@ class Subuser extends Model
       *
       * @var array
       */
-     protected $casts = [
-         'user_id' => 'integer',
-         'server_id' => 'integer',
-     ];
-
-    /**
-     * @var mixed
-     */
-    protected static $user;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        self::$user = Auth::user();
-    }
-
-    /**
-     * Returns an array of each server ID that the user has access to.
-     *
-     * @return array
-     */
-    public static function accessServers()
-    {
-        $union = self::select('server_id')->where('user_id', self::$user->id);
-
-        return Server::select('id')->where('owner', self::$user->id)->union($union)->pluck('id');
-    }
+    protected $casts = [
+        'user_id' => 'integer',
+        'server_id' => 'integer',
+    ];
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -87,16 +87,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
      */
     protected $hidden = ['password', 'remember_token', 'totp_secret'];
 
-    /**
-     * Determines if a user has permissions.
-     *
-     * @return bool
-     */
-    public function permissions()
-    {
-        return $this->hasMany(Permission::class);
-    }
-
     /**
      * Enables or disables TOTP on an account if the token is valid.
      *
@@ -176,4 +166,43 @@ public function daemonToken(Server $server)
 
         return $subuser->daemonSecret;
     }
+
+    /**
+     * Returns all permissions that a user has.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function permissions()
+    {
+        return $this->hasMany(Permission::class);
+    }
+
+    /**
+     * Returns an array of all servers a user is able to access.
+     * Note: does not account for user admin status.
+     *
+     * @return array
+     */
+    public function serverAccessArray()
+    {
+        $union = Subuser::select('server_id')->where('user_id', $this->id);
+
+        return Server::select('id')->where('owner_id', $this->id)->union($union)->pluck('id')->all();
+    }
+
+    /**
+     * Returns an array of all servers a user is able to access.
+     * Note: does not account for user admin status.
+     *
+     * @return Collection
+     */
+    public function serverAccessCollection($paginate = null)
+    {
+        $query = Server::with('service', 'node');
+        if (! $this->isRootAdmin()) {
+            $query->whereIn('id', $this->serverAccessArray());
+        }
+
+        return (is_numeric($paginate)) ? $query->paginate($paginate) : $query->get();
+    }
 }
diff --git a/resources/themes/pterodactyl/base/index.blade.php b/resources/themes/pterodactyl/base/index.blade.php
@@ -62,8 +62,8 @@
                         <tr class="dynamic-update" data-server="{{ $server->uuidShort }}">
                             <td><code>{{ $server->uuidShort }}</code></td>
                             <td><a href="{{ route('server.index', $server->uuidShort) }}">{{ $server->name }}</a></td>
-                            <td>{{ $server->node_idName }}</td>
-                            <td><code>@if(!is_null($server->ip_alias)){{ $server->ip_alias }}@else{{ $server->ip }}@endif:{{ $server->port }}</code></td>
+                            <td>{{ $server->node->name }}</td>
+                            <td><code>{{ $server->allocation->alias }}:{{ $server->allocation->port }}</code></td>
                             <td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>
                             <td class="text-center hidden-sm hidden-xs"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">--</span> %</td>
                             <td class="text-center" data-action="status">
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -245,7 +245,7 @@ class="active"
                 <div class="tab-content">
                     <div class="tab-pane active" id="control-sidebar-servers-tab">
                         <ul class="control-sidebar-menu">
-                            @foreach (Pterodactyl\Models\Server::getUserServers() as $s)
+                            @foreach (Auth::user()->serverAccessCollection() as $s)
                                 <li>
                                     <a
                                         @if(isset($server) && isset($node))
@@ -254,7 +254,7 @@ class="active"
                                             @endif
                                         @endif
                                     href="{{ route('server.index', $s->uuidShort) }}">
-                                        @if($s->owner === Auth::user()->id)
+                                        @if($s->owner_id === Auth::user()->id)
                                             <i class="menu-icon fa fa-user bg-blue"></i>
                                         @else
                                             <i class="menu-icon fa fa-user-o bg-gray"></i>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class InfoController extends BaseController`
`32`	`32`	`{`
`33`	`33`	`public function me(Request $request)`
`34`	`34`	`{`
`35`		`- return Models\Server::getUserServers()->map(function ($server) {`
	`35`	`+ return $request->user()->serverAccessCollection()->map(function ($server) {`
`36`	`36`	`return [`
`37`	`37`	`'id' => $server->uuidShort,`
`38`	`38`	`'uuid' => $server->uuid,`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct()`
`48`	`48`	`public function getIndex(Request $request)`
`49`	`49`	`{`
`50`	`50`	`return view('base.index', [`
`51`		`- 'servers' => Server::getUserServers(10),`
	`51`	`+ 'servers' => $request->user()->serverAccessCollection(10)->load('node', 'allocation'),`
`52`	`52`	`]);`
`53`	`53`	`}`
`54`	`54`