Move server creation over to new service/repository setup.

Moves tons of functions around, but the basic implementation is working again.

Some features are still missing, and the service never actually commits the server to the database right now.

This push is mostly just to get the code into Github and backed up.

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

@@ -28,9 +28,9 @@ use Fractal;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\Daemon\PowerRepository;
+use Pterodactyl\Repositories\old_Daemon\PowerRepository;
 use Pterodactyl\Transformers\User\ServerTransformer;
-use Pterodactyl\Repositories\Daemon\CommandRepository;
+use Pterodactyl\Repositories\old_Daemon\CommandRepository;
 
 class ServerController extends Controller
 {

app/Http/Controllers/Admin/ServersController.php

@@ -32,6 +32,7 @@ use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
 use GuzzleHttp\Exception\TransferException;
@@ -41,6 +42,7 @@ use Pterodactyl\Repositories\ServerRepository;
 use Pterodactyl\Repositories\DatabaseRepository;
 use Pterodactyl\Exceptions\AutoDeploymentException;
 use Pterodactyl\Exceptions\DisplayValidationException;
+use Pterodactyl\Services\Servers\ServerService;
 
 class ServersController extends Controller
 {
@@ -64,6 +66,11 @@ class ServersController extends Controller
      */
     protected $repository;
 
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerService
+     */
+    protected $service;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
      */
@@ -73,6 +80,7 @@ class ServersController extends Controller
         ConfigRepository $config,
         DatabaseRepositoryInterface $databaseRepository,
         LocationRepositoryInterface $locationRepository,
+        ServerService $service,
         ServerRepositoryInterface $repository,
         ServiceRepositoryInterface $serviceRepository
     ) {
@@ -80,6 +88,7 @@ class ServersController extends Controller
         $this->databaseRepository = $databaseRepository;
         $this->locationRepository = $locationRepository;
         $this->repository = $repository;
+        $this->service = $service;
         $this->serviceRepository = $serviceRepository;
     }
 
@@ -125,31 +134,33 @@ class ServersController extends Controller
     /**
      * Create server controller method.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Response\RedirectResponse
+     * @param \Illuminate\Http\Request $request
      */
     public function store(Request $request)
     {
-        try {
-            $repo = new ServerRepository;
-            $server = $repo->create($request->except('_token'));
-
-            return redirect()->route('admin.servers.view', $server->id);
-        } catch (DisplayValidationException $ex) {
-            return redirect()->route('admin.servers.new')->withErrors(json_decode($ex->getMessage()))->withInput();
-        } catch (DisplayException $ex) {
-            Alert::danger($ex->getMessage())->flash();
-        } catch (AutoDeploymentException $ex) {
-            Alert::danger('Auto-Deployment Exception: ' . $ex->getMessage())->flash();
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-            Alert::danger('A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.')->flash();
-        } catch (\Exception $ex) {
-            Log::error($ex);
-            Alert::danger('An unhandled exception occured while attemping to add this server. Please try again.')->flash();
-        }
+        $this->service->create($request->all());
 
         return redirect()->route('admin.servers.new')->withInput();
+        //        try {
+//            $repo = new ServerRepository;
+//            $server = $repo->create($request->except('_token'));
+//
+//            return redirect()->route('admin.servers.view', $server->id);
+//        } catch (DisplayValidationException $ex) {
+//            return redirect()->route('admin.servers.new')->withErrors(json_decode($ex->getMessage()))->withInput();
+//        } catch (DisplayException $ex) {
+//            Alert::danger($ex->getMessage())->flash();
+//        } catch (AutoDeploymentException $ex) {
+//            Alert::danger('Auto-Deployment Exception: ' . $ex->getMessage())->flash();
+//        } catch (TransferException $ex) {
+//            Log::warning($ex);
+//            Alert::danger('A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.')->flash();
+//        } catch (\Exception $ex) {
+//            Log::error($ex);
+//            Alert::danger('An unhandled exception occured while attemping to add this server. Please try again.')->flash();
+//        }
+//
+//        return redirect()->route('admin.servers.new')->withInput();
     }
 
     /**
@@ -310,8 +321,9 @@ class ServersController extends Controller
      * @param  int                       $id
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function setDetails(Request $request, $id)
+    public function setDetails(ServerFormRequest $request, Models\Server $server)
     {
+        dd($server);
         $repo = new ServerRepository;
         try {
             $repo->updateDetails($id, array_merge(

app/Http/Controllers/Server/AjaxController.php

@@ -79,7 +79,7 @@ class AjaxController extends Controller
             $prevDir['link_show'] = implode('/', $goBack) . '/';
         }
 
-        $controller = new Repositories\Daemon\FileRepository($uuid);
+        $controller = new Repositories\old_Daemon\FileRepository($uuid);
 
         try {
             $directoryContents = $controller->returnDirectoryListing($this->directory);
@@ -112,7 +112,7 @@ class AjaxController extends Controller
         $server = Models\Server::byUuid($uuid);
         $this->authorize('save-files', $server);
 
-        $controller = new Repositories\Daemon\FileRepository($uuid);
+        $controller = new Repositories\old_Daemon\FileRepository($uuid);
 
         try {
             $controller->saveFileContents($request->input('file'), $request->input('contents'));

app/Http/Controllers/Server/ServerController.php

@@ -32,7 +32,7 @@ use Illuminate\Http\Request;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\ServerRepository;
-use Pterodactyl\Repositories\Daemon\FileRepository;
+use Pterodactyl\Repositories\old_Daemon\FileRepository;
 use Pterodactyl\Exceptions\DisplayValidationException;
 
 class ServerController extends Controller

app/Http/Requests/Admin/ServerFormRequest.php

@@ -0,0 +1,83 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Http\Requests\Admin;
+
+use Illuminate\Validation\Rule;
+use Pterodactyl\Models\Server;
+
+class ServerFormRequest extends AdminFormRequest
+{
+    /**
+     * Rules to be applied to this request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        if ($this->method() === 'PATCH') {
+            return Server::getUpdateRulesForId($this->id);
+        }
+
+        return Server::getCreateRules();
+    }
+
+    /**
+     * Run validation after the rules above have been applied.
+     *
+     * @param \Illuminate\Validation\Validator $validator
+     */
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            $validator->sometimes('node_id', 'required|numeric|bail|exists:nodes,id', function ($input) {
+                return ! ($input->auto_deploy);
+            });
+
+            $validator->sometimes('allocation_id', [
+                'required',
+                'numeric',
+                'bail',
+                Rule::exists('allocations', 'id')->where(function ($query) {
+                    $query->where('node_id', $this->input('node_id'));
+                    $query->whereNull('server_id');
+                }),
+            ], function ($input) {
+                return ! ($input->auto_deploy);
+            });
+
+            $validator->sometimes('allocation_additional.*', [
+                'sometimes',
+                'required',
+                'numeric',
+                Rule::exists('allocations', 'id')->where(function ($query) {
+                    $query->where('node_id', $this->input('node_id'));
+                    $query->whereNull('server_id');
+                }),
+            ], function ($input) {
+                return ! ($input->auto_deploy);
+            });
+        });
+    }
+}