More code updates

app/Http/Controllers/API/Admin/LocationController.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\LocationTransformer;
-
-class LocationController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('location-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Location::all())
-            ->transformWith(new LocationTransformer($request))
-            ->withResourceName('location')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/Admin/NodeController.php

@@ -1,159 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Node;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\NodeRepository;
-use Pterodactyl\Transformers\Admin\NodeTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class NodeController extends Controller
-{
-    /**
-     * Controller to handle returning all nodes on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('node-list', $request->apiKey());
-
-        $nodes = Node::paginate(config('pterodactyl.paginate.api.nodes'));
-        $fractal = Fractal::create()->collection($nodes)
-            ->transformWith(new NodeTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($nodes));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('node-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(Node::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new NodeTransformer($request))
-            ->withResourceName('node')
-            ->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function viewConfig(Request $request, $id)
-    {
-        $this->authorize('node-view-config', $request->apiKey());
-
-        $node = Node::findOrFail($id);
-
-        return response()->json(json_decode($node->getConfigurationAsJson()));
-    }
-
-    /**
-     * Create a new node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('node-create', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $node = $repo->create(array_merge(
-                $request->only([
-                    'public', 'disk_overallocate', 'memory_overallocate',
-                ]),
-                $request->intersect([
-                    'name', 'location_id', 'fqdn',
-                    'scheme', 'memory', 'disk',
-                    'daemonBase', 'daemonSFTP', 'daemonListen',
-                ])
-            ));
-
-            $fractal = Fractal::create()->item($node)->transformWith(new NodeTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('node')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this node. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a node from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('node-delete', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this node. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Admin/ServerController.php

@@ -1,414 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\TransferException;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\ServerRepository;
-use Pterodactyl\Transformers\Admin\ServerTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle returning all servers on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('server-list', $request->apiKey());
-
-        $servers = Server::paginate(config('pterodactyl.paginate.api.servers'));
-        $fractal = Fractal::create()->collection($servers)
-            ->transformWith(new ServerTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($servers));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('server-view', $request->apiKey());
-
-        $server = Server::findOrFail($id);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer($request))
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Create a new server on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('server-create', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->create($request->all());
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a server from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('server-delete', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->delete($id, $request->has('force_delete'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the details for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function details(Request $request, $id)
-    {
-        $this->authorize('server-edit-details', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateDetails($id, $request->intersect([
-                'owner_id', 'name', 'description', 'reset_token',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Set the new docker container for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\RedirectResponse|array
-     */
-    public function container(Request $request, $id)
-    {
-        $this->authorize('server-edit-container', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateContainer($id, $request->intersect('docker_image'));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server container. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Toggles the install status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function install(Request $request, $id)
-    {
-        $this->authorize('server-install', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->toggleInstall($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to toggle the install status for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Setup a server to have a container rebuild.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function rebuild(Request $request, $id)
-    {
-        $this->authorize('server-rebuild', $request->apiKey());
-        $server = Server::with('node')->findOrFail($id);
-
-        try {
-            $server->node->guzzleClient([
-                'X-Access-Server' => $server->uuid,
-                'X-Access-Token' => $server->node->daemonSecret,
-            ])->request('POST', '/server/rebuild');
-
-            return response('', 204);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        }
-    }
-
-    /**
-     * Manage the suspension status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function suspend(Request $request, $id)
-    {
-        $this->authorize('server-suspend', $request->apiKey());
-
-        $repo = new ServerRepository;
-        $action = $request->input('action');
-        if (! in_array($action, ['suspend', 'unsuspend'])) {
-            return response()->json([
-                'error' => 'The action provided was invalid. Action should be one of: suspend, unsuspend.',
-            ], 400);
-        }
-
-        try {
-            $repo->toggleAccess($id, ($action === 'unsuspend'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to ' . $action . ' this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the build configuration for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function build(Request $request, $id)
-    {
-        $this->authorize('server-edit-build', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->changeBuild($id, $request->intersect([
-                'allocation_id', 'add_allocations', 'remove_allocations',
-                'memory', 'swap', 'io', 'cpu',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the build settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the startup command as well as variables.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function startup(Request $request, $id)
-    {
-        $this->authorize('server-edit-startup', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->updateStartup($id, $request->all(), true);
-
-            return response('', 204);
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the startup settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Admin/ServiceController.php

@@ -1,59 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Nest;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\ServiceTransformer;
-
-class ServiceController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('service-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Nest::all())
-            ->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('service-view', $request->apiKey());
-
-        $service = Nest::findOrFail($id);
-        $fractal = Fractal::create()->item($service);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/Admin/UserController.php

@@ -1,170 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\User;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\oldUserRepository;
-use Pterodactyl\Transformers\Admin\UserTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class UserController extends Controller
-{
-    /**
-     * Controller to handle returning all users on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user-list', $request->apiKey());
-
-        $users = User::paginate(config('pterodactyl.paginate.api.users'));
-        $fractal = Fractal::create()->collection($users)
-            ->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($users));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('user-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(User::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->toArray();
-    }
-
-    /**
-     * Create a new user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('user-create', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->create($request->only([
-                'custom_id', 'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update a user.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $user
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(Request $request, $user)
-    {
-        $this->authorize('user-edit', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->update($user, $request->intersect([
-                'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to update this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a user from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('user-delete', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this user. Please try again.',
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/API/Remote/EggRetrievalController.php

@@ -11,13 +11,13 @@ namespace Pterodactyl\Http\Controllers\API\Remote;
 
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggConfigurationService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\EggConfigurationService;
 
-class OptionRetrievalController extends Controller
+class EggRetrievalController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Options\EggConfigurationService
+     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
      */
     protected $configurationFileService;
 
@@ -29,8 +29,8 @@ class OptionRetrievalController extends Controller
     /**
      * OptionUpdateController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface       $repository
-     * @param \Pterodactyl\Services\Services\Options\EggConfigurationService $configurationFileService
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\EggConfigurationService       $configurationFileService
      */
     public function __construct(
         EggRepositoryInterface $repository,
@@ -41,7 +41,7 @@ class OptionRetrievalController extends Controller
     }
 
     /**
-     * Return a JSON array of service options and the SHA1 hash of thier configuration file.
+     * Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
      *
      * @return \Illuminate\Http\JsonResponse
      */
@@ -58,7 +58,7 @@ class OptionRetrievalController extends Controller
     }
 
     /**
-     * Return the configuration file for a single service option for the Daemon.
+     * Return the configuration file for a single Egg for the Daemon.
      *
      * @param string $uuid
      * @return \Illuminate\Http\JsonResponse

app/Http/Controllers/API/User/CoreController.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\OverviewTransformer;
-
-class CoreController extends Controller
-{
-    /**
-     * Controller to handle base user request for all of their servers.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user.server-list', $request->apiKey());
-
-        $servers = $request->user()->access('service', 'node', 'allocation', 'option')->get();
-
-        return Fractal::collection($servers)
-            ->transformWith(new OverviewTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-}

app/Http/Controllers/API/User/ServerController.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\ServerTransformer;
-use Pterodactyl\Repositories\old_Daemon\PowerRepository;
-use Pterodactyl\Repositories\old_Daemon\CommandRepository;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return array
-     */
-    public function index(Request $request, $uuid)
-    {
-        $this->authorize('user.server-view', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle request for server power toggle.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function power(Request $request, $uuid)
-    {
-        $this->authorize('user.server-power', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('power-' . $request->input('action'), $server);
-
-        $repo = new PowerRepository($server, $request->user());
-        $repo->do($request->input('action'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function command(Request $request, $uuid)
-    {
-        $this->authorize('user.server-command', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('send-command', $server);
-
-        $repo = new CommandRepository($server, $request->user());
-        $repo->send($request->input('command'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-}

app/Http/Controllers/Admin/ServersController.php

@@ -91,6 +91,11 @@ class ServersController extends Controller
      */
     protected $locationRepository;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $nestRepository;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
      */
@@ -111,11 +116,6 @@ class ServersController extends Controller
      */
     protected $service;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $serviceRepository;
-
     /**
      * @var \Pterodactyl\Services\Servers\StartupModificationService
      */
@@ -144,7 +144,7 @@ class ServersController extends Controller
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $nodeRepository
      * @param \Pterodactyl\Services\Servers\ReinstallServerService            $reinstallService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface     $repository
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $nestRepository
      * @param \Pterodactyl\Services\Servers\StartupModificationService        $startupModificationService
      * @param \Pterodactyl\Services\Servers\SuspensionService                 $suspensionService
      */
@@ -164,7 +164,7 @@ class ServersController extends Controller
         NodeRepositoryInterface $nodeRepository,
         ReinstallServerService $reinstallService,
         ServerRepositoryInterface $repository,
-        NestRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $nestRepository,
         StartupModificationService $startupModificationService,
         SuspensionService $suspensionService
     ) {
@@ -179,11 +179,11 @@ class ServersController extends Controller
         $this->detailsModificationService = $detailsModificationService;
         $this->deletionService = $deletionService;
         $this->locationRepository = $locationRepository;
+        $this->nestRepository = $nestRepository;
         $this->nodeRepository = $nodeRepository;
         $this->reinstallService = $reinstallService;
         $this->repository = $repository;
         $this->service = $service;
-        $this->serviceRepository = $serviceRepository;
         $this->startupModificationService = $startupModificationService;
         $this->suspensionService = $suspensionService;
     }
@@ -218,19 +218,19 @@ class ServersController extends Controller
             return redirect()->route('admin.nodes');
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
         ]);
 
         return view('admin.servers.new', [
             'locations' => $this->locationRepository->all(),
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -331,12 +331,12 @@ class ServersController extends Controller
             abort(404);
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
             'server_variables' => $parameters->data,
@@ -344,7 +344,7 @@ class ServersController extends Controller
 
         return view('admin.servers.view.startup', [
             'server' => $parameters->server,
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -402,7 +402,7 @@ class ServersController extends Controller
     public function setDetails(Request $request, Server $server)
     {
         $this->detailsModificationService->edit($server, $request->only([
-            'owner_id', 'name', 'description', 'reset_token',
+            'owner_id', 'name', 'description',
         ]));
 
         $this->alert->success(trans('admin/server.alerts.details_updated'))->flash();

app/Http/Controllers/Admin/UserController.php

@@ -159,6 +159,7 @@ class UserController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function update(UserFormRequest $request, User $user)
     {

app/Http/Controllers/Daemon/ServiceController.php

@@ -1,85 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Daemon;
-
-use Pterodactyl\Models\Egg;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Nest;
-use Pterodactyl\Http\Controllers\Controller;
-
-class ServiceController extends Controller
-{
-    /**
-     * Returns a listing of all services currently on the system,
-     * as well as the associated files and the file hashes for
-     * caching purposes.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function listServices(Request $request)
-    {
-        $response = [];
-        foreach (Nest::all() as $service) {
-            $response[$service->folder] = [
-                'main.json' => sha1($this->getConfiguration($service->id)->toJson()),
-                'index.js' => sha1($service->index_file),
-            ];
-        }
-
-        return response()->json($response);
-    }
-
-    /**
-     * Returns the contents of the requested file for the given service.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $folder
-     * @param string                   $file
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\FileResponse
-     */
-    public function pull(Request $request, $folder, $file)
-    {
-        $service = Nest::where('folder', $folder)->firstOrFail();
-
-        if ($file === 'index.js') {
-            return response($service->index_file)->header('Content-Type', 'text/plain');
-        } elseif ($file === 'main.json') {
-            return response()->json($this->getConfiguration($service->id));
-        }
-
-        return abort(404);
-    }
-
-    /**
-     * Returns a `main.json` file based on the configuration
-     * of each service option.
-     *
-     * @param int $id
-     * @return \Illuminate\Support\Collection
-     */
-    protected function getConfiguration($id)
-    {
-        $options = Egg::where('service_id', $id)->get();
-
-        return $options->mapWithKeys(function ($item) use ($options) {
-            return [
-                $item->tag => array_filter([
-                    'symlink' => $options->where('id', $item->config_from)->pluck('tag')->pop(),
-                    'startup' => json_decode($item->config_startup),
-                    'stop' => $item->config_stop,
-                    'configs' => json_decode($item->config_files),
-                    'log' => json_decode($item->config_logs),
-                    'query' => 'none',
-                ]),
-            ];
-        });
-    }
-}