wip

# Conflicts:
#	public/css/app.css
#	public/js/1042.js
#	public/js/1304.js
#	public/js/1438.js
#	public/js/1582.js
#	public/js/1973.js
#	public/js/2232.js
#	public/js/2306.js
#	public/js/2426.js
#	public/js/2658.js
#	public/js/2668.js
#	public/js/2693.js
#	public/js/2940.js
#	public/js/2999.js
#	public/js/3038.js
#	public/js/3292.js
#	public/js/3739.js
#	public/js/4144.js
#	public/js/43.js
#	public/js/4379.js
#	public/js/4485.js
#	public/js/4596.js
#	public/js/4695.js
#	public/js/47.js
#	public/js/4710.js
#	public/js/4766.js
#	public/js/4791.js
#	public/js/4804.js
#	public/js/4946.js
#	public/js/5641.js
#	public/js/565.js
#	public/js/5766.js
#	public/js/5865.js
#	public/js/6038.js
#	public/js/6282.js
#	public/js/6289.js
#	public/js/6340.js
#	public/js/6424.js
#	public/js/6511.js
#	public/js/6545.js
#	public/js/684.js
#	public/js/6861.js
#	public/js/701.js
#	public/js/7054.js
#	public/js/7210.js
#	public/js/7399.js
#	public/js/7611.js
#	public/js/7767.js
#	public/js/8027.js
#	public/js/8309.js
#	public/js/8371.js
#	public/js/8607.js
#	public/js/8786.js
#	public/js/883.js
#	public/js/908.js
#	public/js/9195.js
#	public/js/9281.js
#	public/js/9353.js
#	public/js/app.js

.env.example

@@ -26,6 +26,7 @@ SESSION_LIFETIME=120
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_CLIENT=predis
 
 MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io

.github/workflows/master.yml

@@ -0,0 +1,41 @@
+name: Run tests & build files
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Run tests
+    uses: ./.github/workflows/run-tests.yml
+
+  deploy:
+    needs: test
+    name: Prepare build assets
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: pcntl
+
+      - run: composer install
+        name: Install dependencies
+
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - run: npm install
+      - run: npm run production
+
+      - name: Commit build assets
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "GitHub Actions"
+          git add .
+          git commit -m "Run Laravel Mix en build front-end assets"
+          git push origin

.github/workflows/run-tests.yml

@@ -0,0 +1,33 @@
+name: "Run tests"
+
+on:
+  push:
+  workflow_call:
+
+jobs:
+  test:
+    name: Pest (PHP ${{ matrix.php }} – ${{ matrix.os }})
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.0, 8.1]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, mysql
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer install
+
+      - name: Execute tests
+        run: vendor/bin/pest

.gitignore

@@ -1,8 +1,10 @@
 /node_modules
+/node_modules.nosync
 /public/hot
 /public/storage
 /storage/*.key
 /vendor
+/vendor.nosync
 .env
 .env.backup
 .phpunit.result.cache
@@ -12,4 +14,9 @@ npm-debug.log
 yarn-error.log
 .idea
 .php_cs.cache
+.php-cs-fixer.cache
 /public/js/resources*.js
+/storage/views/header.blade.php
+/storage/views/footer.blade.php
+rr
+.rr.yaml

README.md

@@ -3,7 +3,7 @@
 With Ploi Core, you'll power-launch your webhosting company. 
 Using the ploi.io system as backbone you will be able to serve your customers your custom panel & feeling.
 
-<p align="center"><img src="https://ploi-core.io/images/featured.png" width="100%"></p>
+<p align="center"><img src="https://ploi-core.io/images/og.jpg" width="100%"></p>
 
 ## Documentation
 

app/Actions/Server/CreateServerAction.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\DataTransferObjects\ServerData;
+use App\Jobs\Servers\CreateServer;
+use App\Mail\Admin\Server\AdminServerCreatedEmail;
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+
+class CreateServerAction
+{
+    public function execute(ServerData $serverData): Server
+    {
+        [$provider, $providerRegion, $providerPlan] = $this->determineProviderRegionPlan($serverData);
+
+        $server = $serverData->getUser()->servers()->create([
+            'name' => $serverData->name,
+            'database_type' => $serverData->database_type,
+        ]);
+
+        $server->provider()->associate($provider);
+        $server->providerRegion()->associate($providerRegion);
+        $server->providerPlan()->associate($providerPlan);
+        $server->save();
+
+        dispatch(new CreateServer($server));
+
+        $this->sendAdminServerCreatedEmails($server);
+
+        return $server;
+    }
+
+    protected function determineProviderRegionPlan(ServerData $serverData): array
+    {
+        $provider = $serverData->getUser()->package->providers()->findOrFail($serverData->provider_id);
+        $region = $provider->regions()->findOrFail($serverData->provider_region_id);
+        $plan = $provider->plans()->findOrFail($serverData->provider_plan_id);
+
+        return [$provider, $region, $plan];
+    }
+
+    protected function sendAdminServerCreatedEmails(Server $server): void
+    {
+        if (! setting('receive_email_on_server_creation')) {
+            return;
+        }
+
+        $admins = User::query()->where('role', User::ADMIN)->get();
+
+        foreach ($admins as $admin) {
+            Mail::to($admin)->send(new AdminServerCreatedEmail(auth()->user(), $server));
+        }
+    }
+}

app/Actions/Site/CreateSiteAction.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Actions\Site;
+
+use App\DataTransferObjects\SiteData;
+use App\Jobs\Sites\CreateSite;
+use App\Mail\Admin\Site\AdminSiteCreatedEmail;
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Mail;
+
+class CreateSiteAction
+{
+    public function execute(SiteData $siteData): ?Site
+    {
+        $server = $this->determineServer($siteData);
+
+        if ( ! $server ) {
+            return null;
+        }
+
+        $site = $server->sites()->create($siteData->toArray());
+
+        $siteData->getUser()->sites()->save($site);
+
+        dispatch(new CreateSite($site));
+
+        $siteData->getUser()->systemLogs()->create([
+            'title' => 'New site :site created',
+            'description' => 'A new site has been created',
+        ])->model()->associate($site)->save();
+
+        $this->sendAdminSiteCreatedEmails($server, $site, $siteData->getUser());
+
+        return $site;
+    }
+
+    protected function determineServer(SiteData $siteData): ?Server
+    {
+        if ( $siteData->server_id ) {
+            return $siteData->getUser()->servers()->findOrFail($siteData->server_id);
+        }
+
+        $server = Server::query()
+            ->where('maximum_sites', '>', 0)
+            ->where(function ($query) use ($siteData) {
+                return $query
+                    ->where(fn ($query) => $query->whereHas('users', fn ($query) => $query->where('user_id', $siteData->getUser()->id)))
+                    ->orWhere(function ($query) {
+                        return $query->doesntHave('users');
+                    });
+            })
+            ->withCount('sites')
+            ->inRandomOrder()
+            ->first();
+
+        return $server && $server->sites_count < $server->maximum_sites
+            ? $server
+            : null;
+    }
+
+    protected function sendAdminSiteCreatedEmails(Server $server, Model|Site $site, User $user): void
+    {
+        if ( ! setting('receive_email_on_site_creation') ) {
+            return;
+        }
+
+        $admins = User::where('role', User::ADMIN)->get();
+
+        foreach ($admins as $admin) {
+            Mail::to($admin)->send(new AdminSiteCreatedEmail(user: $user, server: $server, site: $site));
+        }
+    }
+}

app/Casts/SiteAlias.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+class SiteAlias implements CastsAttributes
+{
+    public function get($model, string $key, $value, array $attributes)
+    {
+        if (!$value) {
+            return [];
+        }
+
+        $data = json_decode($value, true);
+
+        sort($data);
+
+        return $data;
+    }
+
+    public function set($model, string $key, $value, array $attributes)
+    {
+        return json_encode($value);
+    }
+}

app/Console/Commands/Core/Cleanup.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands\Core;
+
+use App\Models\SystemLog;
+use Illuminate\Console\Command;
+
+class Cleanup extends Command
+{
+    protected $signature = 'core:cleanup';
+
+    protected $description = 'Clean up any old logs';
+
+    public function handle()
+    {
+        if (!setting('rotate_logs_after')) {
+            return Command::SUCCESS;
+        }
+
+        $rotationDate = $this->getRotationDate();
+
+        $rotated = SystemLog::query()
+            ->where('created_at', '<', $rotationDate)
+            ->delete();
+
+        $this->info('Rotated ' . $rotated . ' system logs!');
+
+        return Command::SUCCESS;
+    }
+
+    protected function getRotationDate()
+    {
+        switch (setting('rotate_logs_after')) {
+            case 'weeks-1':
+                return now()->subWeek();
+                break;
+            case 'months-1':
+                return now()->subMonth();
+                break;
+            case 'months-3':
+                return now()->subMonths(3);
+                break;
+            case 'months-6':
+                return now()->subMonths(6);
+                break;
+            case 'years-1':
+                return now()->subYear();
+                break;
+            case 'years-2':
+                return now()->subYears(2);
+                break;
+            case 'years-3':
+                return now()->subYears(3);
+                break;
+            case 'years-4':
+                return now()->subYears(4);
+                break;
+        }
+    }
+}

app/Console/Commands/Core/Install.php

@@ -7,6 +7,7 @@ use App\Models\User;
 use RuntimeException;
 use App\Models\Package;
 use App\Services\Ploi\Ploi;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use App\Services\VersionChecker;
@@ -17,7 +18,7 @@ use Illuminate\Support\Facades\Artisan;
 class Install extends Command
 {
     protected $company;
-    protected $signature = 'core:install';
+    protected $signature = 'core:install {--force}';
     protected $description = 'Installation command for Ploi Core';
     protected $versionChecker;
     protected $installationFile = 'app/installation';
@@ -37,7 +38,15 @@ class Install extends Command
         $this->createInstallationFile();
         $this->linkStorage();
 
-        $this->info('Succes! Installation has finished.');
+        $this->info('Success! Installation has finished.');
+        $this->line(' ');
+        $this->writeSeparationLine();
+        $this->info('Make sure to also setup emailing, the cronjob and the queue worker.');
+        $this->line(' ');
+        $this->info('Setting up emailing: https://docs.ploi-core.io/getting-started/setting-up-email');
+        $this->info('Setting up cronjob & queue worker: https://docs.ploi-core.io/getting-started/installation');
+        $this->writeSeparationLine();
+        $this->line(' ');
         $this->info('Visit your platform at ' . env('APP_URL'));
     }
 
@@ -48,28 +57,32 @@ class Install extends Command
 
     protected function askAboutAdministrationAccount()
     {
-        $this->info('Let\'s start by setting up your administration account.');
+        if (!User::query()->where('role', User::ADMIN)->count()) {
+            $this->info('Let\'s start by setting up your administration account.');
 
-        $name = $this->ask('What is your name', $this->company['user_name']);
+            $name = $this->ask('What is your name', $this->company['user_name']);
-        $email = $this->ask('What is your e-mail address', $this->company['email']);
+            $email = $this->ask('What is your e-mail address', $this->company['email']);
-        $password = $this->secret('What password do you desire');
+            $password = $this->secret('What password do you desire');
 
-        $check = User::where('email', $email)->count();
+            $check = User::where('email', $email)->count();
 
-        if ($check) {
+            if ($check) {
-            $this->line('');
+                $this->line('');
-            $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
+                $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
-            $this->comment('Aborting installation..');
+                $this->comment('Aborting installation..');
 
-            exit();
+                exit();
+            }
+
+            User::forceCreate([
+                'name' => $name,
+                'email' => $email,
+                'password' => $password,
+                'role' => User::ADMIN
+            ]);
+        } else {
+            $this->line('Already found a administrator user in your system. Use that user to login.');
         }
-
-        User::forceCreate([
-            'name' => $name,
-            'email' => $email,
-            'password' => $password,
-            'role' => User::ADMIN
-        ]);
     }
 
     protected function askAboutDefaultPackages()
@@ -140,7 +153,9 @@ class Install extends Command
             ->get((new Ploi)->url . 'ping');
 
         if (!$response->ok() || !$response->json()) {
-            return false;
+            return [
+                'error' => Arr::get($response->json(), 'message', 'An unknown error has occurred.')
+            ];
         }
 
         return $response->json();
@@ -155,7 +170,7 @@ class Install extends Command
 
     protected function intro()
     {
-        $this->info('*---------------------------------------------------------------------------*');
+        $this->writeSeparationLine();
         $this->line('Ploi Core Installation');
         $this->line('Ploi Core version: ' . $this->versionChecker->currentVersion);
         $this->line('Ploi Core remote: ' . $this->versionChecker->remoteVersion);
@@ -165,13 +180,13 @@ class Install extends Command
         $this->line('Website: https://ploi-core.io');
         $this->line('E-mail: core@ploi.io');
         $this->line('Terms of service: https://ploi-core.io/terms');
-        $this->info('*---------------------------------------------------------------------------*');
+        $this->writeSeparationLine();
         $this->line('');
     }
 
     protected function isInstalled()
     {
-        if (file_exists(storage_path($this->installationFile))) {
+        if (file_exists(storage_path($this->installationFile)) && !$this->option('force')) {
             $this->line('');
             $this->comment('Ploi Core has already been installed before.');
             $this->comment('If you still want to start installation, remove this file to continue: ./storage/' . $this->installationFile);
@@ -187,9 +202,9 @@ class Install extends Command
     {
         if (!config('app.key')) {
             $this->call('key:generate');
-        }
 
-        $this->info('Application key has been set');
+            $this->info('Application key has been set');
+        }
     }
 
     protected function checkApplicationUrl()
@@ -276,6 +291,18 @@ class Install extends Command
             exit();
         }
 
+        if (isset($this->company['error'])) {
+            $this->error($this->company['error']);
+
+            exit();
+        }
+
+        if ($this->company['user']['subscription'] !== 'unlimited') {
+            $this->error('Your subscription does not cover the usage of Ploi Core. Please upgrade your subscription to Unlimited.');
+
+            exit();
+        }
+
         $this->writeToEnvironmentFile('PLOI_TOKEN', $ploiApiToken);
         $this->writeToEnvironmentFile('PLOI_CORE_TOKEN', $ploiCoreKey);
 
@@ -288,7 +315,7 @@ class Install extends Command
     protected function runDatabaseMigrations()
     {
         $this->info('Running database migrations..');
-        $this->call('migrate');
+        $this->call('migrate', ['--force' => true]);
         $this->info('Database migrations successful');
     }
 
@@ -379,4 +406,9 @@ class Install extends Command
     {
         $this->laravel['config'][$key] = $value;
     }
+
+    protected function writeSeparationLine()
+    {
+        $this->info('*---------------------------------------------------------------------------*');
+    }
 }

app/Console/Commands/Core/Synchronize.php

@@ -9,7 +9,7 @@ class Synchronize extends Command
 {
     protected $signature = 'core:synchronize';
 
-    protected $description = 'Synchronze data';
+    protected $description = 'Synchronize data';
 
     public function handle()
     {

app/Console/Commands/Core/Trial.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Console\Commands\Core;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class Trial extends Command
+{
+    protected $signature = 'core:trial';
+
+    protected $description = 'Check for expired trials';
+
+    public function handle()
+    {
+        User::query()
+            ->where('trial_ends_at', '<', now())
+            ->each(function (User $user) {
+                $user->trial_ends_at = null;
+                $user->package_id = setting('default_package');
+                $user->save();
+            });
+    }
+}

app/Console/Kernel.php

@@ -2,8 +2,10 @@
 
 namespace App\Console;
 
+use App\Console\Commands\Core\Trial;
 use App\Jobs\Core\Ping;
 use App\Console\Commands\Core\Css;
+use App\Console\Commands\Core\Cleanup;
 use App\Console\Commands\Core\Install;
 use App\Console\Commands\Core\CssBackup;
 use App\Console\Commands\Core\Synchronize;
@@ -17,6 +19,8 @@ class Kernel extends ConsoleKernel
         CssBackup::class,
         Install::class,
         Synchronize::class,
+        Cleanup::class,
+        Trial::class,
     ];
 
     protected function schedule(Schedule $schedule)
@@ -24,5 +28,8 @@ class Kernel extends ConsoleKernel
         $schedule->call(function () {
             dispatch(new Ping())->delay(now()->addMinutes(rand(1, 30)));
         })->dailyAt('02:00');
+
+        $schedule->command('core:cleanup')->daily();
+        $schedule->command('core:trial')->dailyAt('10:00');
     }
 }

app/DataTransferObjects/ServerData.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\DataTransferObjects;
+
+use App\DataTransferObjects\Support\Concerns\BelongsToUser;
+use App\DataTransferObjects\Support\Data;
+use App\Models\Provider;
+use App\Models\ProviderPlan;
+use App\Models\ProviderRegion;
+use App\Models\User;
+use Spatie\LaravelData\Attributes\Validation\AlphaDash;
+use Spatie\LaravelData\Attributes\Validation\Exists;
+use Spatie\LaravelData\Attributes\Validation\In;
+use Spatie\LaravelData\Attributes\Validation\IntegerType;
+use Spatie\LaravelData\Attributes\Validation\Max;
+use Spatie\LaravelData\Attributes\Validation\NotIn;
+use Spatie\LaravelData\Attributes\Validation\StringType;
+
+class ServerData extends Data
+{
+    use BelongsToUser;
+
+    public function __construct(
+        #[StringType, AlphaDash, Max( 40 )]
+        public string $name,
+        #[NotIn( 0 ), Exists( Provider::class, 'id' )]
+        public int $provider_id,
+        #[NotIn( 0 ), Exists( ProviderRegion::class, 'id' )]
+        public int $provider_region_id,
+        #[NotIn( 0 ), Exists( ProviderPlan::class, 'id' )]
+        public int $provider_plan_id,
+        #[StringType, In( ['mysql', 'mariadb', 'postgresql', 'postgresql13'] )]
+        public string $database_type,
+        #[Exists( User::class, 'id' ), IntegerType]
+        public ?int $user_id = null,
+    ) {}
+}

app/DataTransferObjects/SiteData.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\DataTransferObjects;
+
+use App\DataTransferObjects\Support\Concerns\BelongsToUser;
+use App\DataTransferObjects\Support\Data;
+use App\DataTransferObjects\Support\Rules\CustomRule;
+use App\DataTransferObjects\Support\WithUser;
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\User;
+use App\Rules\Hostname;
+use App\Rules\ValidateMaximumSites;
+use Illuminate\Support\Arr;
+use Spatie\LaravelData\Attributes\Validation\Exists;
+use Spatie\LaravelData\Attributes\Validation\IntegerType;
+use Spatie\LaravelData\Attributes\Validation\StringType;
+
+class SiteData extends Data
+{
+    use BelongsToUser;
+
+    public function __construct(
+        public ?int $id = null,
+        public ?string $status = null,
+        #[Exists( Server::class, 'id' ), IntegerType]
+        public ?int $server_id = null,
+        #[StringType, CustomRule(Hostname::class, ValidateMaximumSites::class)]
+        public ?string $domain = null,
+        #[Exists(User::class, 'id'), IntegerType]
+        public ?int $user_id = null,
+    ) {}
+
+    public static function authorize(): bool
+    {
+        if ( auth()->guest() ) {
+            return true;
+        }
+
+        return auth()->user()->can('create', Site::class);
+    }
+
+    public function toArray(): array
+    {
+        return Arr::only(parent::toArray(), [
+            'id',
+            'status',
+            'server_id',
+            'domain',
+        ]);
+    }
+}

app/DataTransferObjects/Support/Casts/CarbonCast.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\DataTransferObjects\Support\Casts;
+
+use Illuminate\Support\Carbon;
+use Spatie\LaravelData\Casts\Cast;
+use Spatie\LaravelData\Support\DataProperty;
+
+class CarbonCast implements Cast
+{
+    public function cast(DataProperty $property, mixed $value): mixed
+    {
+        return Carbon::parse($value);
+    }
+}

app/DataTransferObjects/Support/Concerns/BelongsToUser.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\DataTransferObjects\Support\Concerns;
+
+use App\Models\User;
+
+trait BelongsToUser
+{
+    public function getUser(): ?User
+    {
+        return User::find($this->user_id);
+    }
+}

app/DataTransferObjects/Support/Data.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\DataTransferObjects\Support;
+
+use Illuminate\Contracts\Pagination\Paginator;
+use Illuminate\Pagination\AbstractCursorPaginator;
+use Illuminate\Pagination\AbstractPaginator;
+use Illuminate\Support\Enumerable;
+use Spatie\LaravelData\DataCollection;
+
+class Data extends \Spatie\LaravelData\Data
+{
+    public static function collection(Paginator|Enumerable|array|AbstractCursorPaginator|DataCollection|AbstractPaginator $items): \App\DataTransferObjects\Support\DataCollection
+    {
+        return new \App\DataTransferObjects\Support\DataCollection(static::class, $items);
+    }
+}

app/DataTransferObjects/Support/DataCollection.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\DataTransferObjects\Support;
+
+use Spatie\LaravelData\Support\TransformationType;
+
+class DataCollection extends \Spatie\LaravelData\DataCollection
+{
+    public function transform(TransformationType $type): array
+    {
+        $transformer = new DataCollectionTransformer(
+            $this->dataClass,
+            $type,
+            $this->getInclusionTree(),
+            $this->getExclusionTree(),
+            $this->items,
+            $this->through,
+            $this->filter
+        );
+
+        return $transformer->transform();
+    }
+}

app/DataTransferObjects/Support/DataCollectionTransformer.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\DataTransferObjects\Support;
+
+use Illuminate\Support\Arr;
+
+class DataCollectionTransformer extends \Spatie\LaravelData\Transformers\DataCollectionTransformer
+{
+    protected function wrapPaginatedArray(array $paginated): array
+    {
+        return [
+            'data' => $paginated['data'],
+            'links' => [
+                'first' => $paginated['first_page_url'],
+                'last' => $paginated['last_page_url'],
+                'prev' => $paginated['prev_page_url'],
+                'next' => $paginated['next_page_url'],
+            ],
+            'meta' => [
+                'current_page' => $paginated['current_page'],
+                'from' => $paginated['from'],
+                'last_page' => $paginated['last_page'],
+                'links' => $paginated['links'],
+                'path' => $paginated['path'],
+                'per_page' => $paginated['per_page'],
+                'to' => $paginated['to'],
+                'total' => $paginated['total'],
+            ],
+        ];
+
+        return [
+            'data' => $paginated['data'],
+            'links' => $paginated['links'] ?? [],
+            'meta' => Arr::except($paginated, [
+                'data',
+                'links',
+            ]),
+        ];
+    }
+}

app/DataTransferObjects/Support/Rules/CustomRule.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\DataTransferObjects\Support\Rules;
+
+use Attribute;
+use Spatie\LaravelData\Attributes\Validation\ValidationAttribute;
+
+#[Attribute( Attribute::TARGET_PROPERTY )]
+class CustomRule extends ValidationAttribute
+{
+    protected array $rules = [];
+
+    public function __construct(...$rules)
+    {
+        $this->rules = $rules;
+    }
+
+    public function getRules(): array
+    {
+        return collect($this->rules)
+            ->map(fn (string $rule) => new $rule())
+            ->all();
+    }
+}

app/DataTransferObjects/Support/Transformers/CarbonTransformer.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\DataTransferObjects\Support\Transformers;
+
+use Spatie\LaravelData\Support\DataProperty;
+use Spatie\LaravelData\Transformers\Transformer;
+
+class CarbonTransformer implements Transformer
+{
+    public function transform(DataProperty $property, mixed $value): mixed
+    {
+        return $value->toISOString();
+    }
+}

app/DataTransferObjects/UserData.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\DataTransferObjects;
+
+use App\DataTransferObjects\Support\Data;
+use App\Models\Package;
+use App\Models\User;
+use Illuminate\Support\Carbon;
+use Spatie\LaravelData\Attributes\Validation\Email;
+use Spatie\LaravelData\Attributes\Validation\Exists;
+use Spatie\LaravelData\Attributes\Validation\IntegerType;
+use Spatie\LaravelData\Attributes\Validation\Max;
+use Spatie\LaravelData\Attributes\Validation\StringType;
+use Spatie\LaravelData\Attributes\Validation\Unique;
+
+class UserData extends Data
+{
+    public function __construct(
+        public ?int $id = null,
+        public ?string $avatar = null,
+        #[StringType, Max(255)]
+        public ?string $name = null,
+        #[StringType, Email, Max(255), Unique(User::class)]
+        public ?string $email = null,
+        #[Exists( Package::class, 'id'), IntegerType]
+        public ?int $package_id = null,
+        #[StringType]
+        public ?string $blocked = null,
+        public ?Carbon $created_at = null,
+    ) {}
+}

app/Exceptions/Handler.php

@@ -2,7 +2,11 @@
 
 namespace App\Exceptions;
 
+use Exception;
 use Throwable;
+use Illuminate\Http\Request;
+use App\Http\Middleware\HandleInertiaRequests;
+use Symfony\Component\HttpFoundation\Response;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -29,10 +33,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param \Throwable $exception
+     * @param Throwable $exception
      * @return void
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function report(Throwable $exception)
     {
@@ -42,24 +46,21 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
-     * @param \Throwable $exception
+     * @param Throwable $exception
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      *
-     * @throws \Throwable
+     * @throws Throwable
      */
     public function render($request, Throwable $exception)
     {
         $response = parent::render($request, $exception);
 
-        if (in_array($response->status(), [404, 403])) {
+        // Only return an Inertia-response when there are special Vue-templates (403 and 404) and when it isn't an API request.
-            \Route::any($request->path(), function () use ($exception, $request) {
+        if (in_array($response->status(), [403, 404]) && ! $request->routeIs('api.*')) {
-                return parent::render($request, $exception);
+            return app(HandleInertiaRequests::class)
-            })->middleware('web');
+                ->handle($request, fn () => inertia()->render('Errors/' . $response->status(), ['status' => $response->status()])
-
+                ->toResponse($request));
-            return inertia()->render('Errors/' . $response->status(), ['status' => $response->status()])
-                ->toResponse($request)
-                ->setStatusCode($response->status());
         }
 
         return $response;

app/Helpers/Setting.php

@@ -1,17 +1,19 @@
 <?php
 
+use App\Models\Setting;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Arr;
 
 if (!function_exists('setting')) {
     /**
      * @param null $key
      * @param null $default
-     * @return array|ArrayAccess|bool|\Illuminate\Contracts\Foundation\Application|mixed
+     * @return array|ArrayAccess|bool|Application|mixed
      */
     function setting($key = null, $default = null)
     {
         if (is_array($key)) {
-            \App\Models\Setting::updateOrCreate([
+            Setting::updateOrCreate([
                 'key' => key($key)
             ], [
                 'value' => Arr::first($key)
@@ -20,6 +22,7 @@ if (!function_exists('setting')) {
             try {
                 cache()->forget('core.settings');
             } catch (Exception $e) {
+                //
             }
 
             return true;
@@ -28,7 +31,7 @@ if (!function_exists('setting')) {
         $value = Arr::get(app('settings'), $key, $default);
 
         // Boolean casting
-        if ($value === "0" || $value === "1") {
+        if ($value === "0" || $value === "1" && $key !== 'trial_package') {
             return (bool) $value;
         }
 

app/Http/Controllers/Admin/DashboardController.php

@@ -10,14 +10,17 @@ use App\Http\Controllers\Controller;
 
 class DashboardController extends Controller
 {
-    public function index()
+    public function __invoke()
     {
         return inertia('Admin/Dashboard', [
             'servers' => Server::count(),
             'sites' => Site::count(),
             'users' => User::count(),
-            'logs' => SystemLog::latest()->limit(10)->with('model')->get()
+            'logs' => SystemLog::query()
-                ->map(function (SystemLog $systemLog) {
+                ->latest()
+                ->with('model')
+                ->paginate(5)
+                ->through(function (SystemLog $systemLog) {
                     return [
                         'title' => __($systemLog->title, [
                             'site' => $systemLog->model->domain ?? '-Unknown-'

app/Http/Controllers/Admin/ProviderController.php

@@ -14,6 +14,8 @@ class ProviderController extends Controller
 
         return inertia('Admin/Services/Provider/Edit', [
             'provider' => $provider,
+            'availablePlans' => $provider->plans()->pluck('label', 'id'),
+            'availableRegions' => $provider->regions()->pluck('label', 'id'),
         ]);
     }
 

app/Http/Controllers/Admin/ServerController.php

@@ -4,12 +4,39 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\User;
 use App\Models\Server;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Resources\Admin\ServerResource;
 use App\Http\Requests\Admin\ServerAttachRequest;
 
 class ServerController extends Controller
 {
+    public function index()
+    {
+        return inertia('Admin/Servers/Index', [
+            'filters' => request()->all('search'),
+            'servers' => ServerResource::collection(
+                Server::query()
+                    ->when(request()->input('search'), function (Builder $query, $value) {
+                        return $query
+                            ->where('name', 'like', '%' . $value . '%')
+                            ->orWhere('ip', 'like', '%' . $value . '%')
+                            ->orWhereHas('users', function (Builder $query) use ($value) {
+                                return $query
+                                    ->where('name', 'LIKE', '%' . $value . '%')
+                                    ->orWhere('email', 'LIKE', '%' . $value . '%');
+                            });
+                    })
+                    ->with('users:id,name')
+                    ->withCount('sites')
+                    ->latest()
+                    ->paginate(config('core.pagination.per_page'))
+                    ->withQueryString()
+            )
+        ]);
+    }
+
     public function edit($id)
     {
         $server = Server::findOrFail($id);

app/Http/Controllers/Admin/ServiceController.php

@@ -12,12 +12,12 @@ class ServiceController extends Controller
     public function index()
     {
         return inertia('Admin/Services/Index', [
-            'servers' => Server::withCount('sites')->latest()->paginate(5, ['*'], 'servers_per_page'),
+            'servers' => Server::query()->withCount('sites', 'users')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'servers_per_page'),
-            'sites' => Site::with('server:id,name')->latest()->paginate(5, ['*'], 'sites_per_page'),
+            'sites' => Site::with('server:id,name')->withCount('users')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'sites_per_page'),
             'providers' => Provider::query()
                 ->withCount('regions', 'plans', 'servers')
                 ->latest()
-                ->paginate(5, ['*'], 'providers_per_page'),
+                ->paginate(config('core.pagination.per_page'), ['*'], 'providers_per_page'),
         ]);
     }
 }

app/Http/Controllers/Admin/SettingController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\Package;
 use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
 use App\Http\Requests\Admin\SettingRequest;
@@ -21,10 +22,15 @@ class SettingController extends Controller
             'allow_registration' => setting('allow_registration'),
             'default_package' => setting('default_package'),
             'receive_email_on_server_creation' => setting('receive_email_on_server_creation'),
+            'receive_email_on_site_creation' => setting('receive_email_on_site_creation'),
             'isolate_per_site_per_user' => setting('isolate_per_site_per_user'),
             'enable_api' => setting('enable_api'),
             'api_token' => setting('api_token') ? decrypt(setting('api_token')) : null,
-            'default_language' => setting('default_language', 'en')
+            'rotate_logs_after' => setting('rotate_logs_after') ? setting('rotate_logs_after') : null,
+            'default_language' => setting('default_language', 'en'),
+            'has_logo' => (bool)setting('logo'),
+            'trial' => setting('trial'),
+            'trial_package' => setting('trial_package'),
         ];
 
         $packages = Package::pluck('name', 'id');
@@ -47,10 +53,14 @@ class SettingController extends Controller
             'documentation',
             'default_package',
             'receive_email_on_server_creation',
+            'receive_email_on_site_creation',
             'isolate_per_site_per_user',
             'enable_api',
             'api_token',
-            'default_language'
+            'default_language',
+            'rotate_logs_after',
+            'trial',
+            'trial_package'
         ]) as $key => $value) {
             if ($key === 'api_token') {
                 $value = encrypt($value);
@@ -87,4 +97,51 @@ class SettingController extends Controller
 
         return redirect()->route('admin.settings')->with('success', __('Settings have been updated'));
     }
+
+    public function terms()
+    {
+        return inertia('Admin/Terms', [
+            'terms_settings' => [
+                'logo' => setting('logo'),
+                'name' => setting('name'),
+                'terms_required' => setting('accept_terms_required'),
+                'terms' => setting('terms'),
+                'privacy' => setting('privacy')
+            ]
+        ]);
+    }
+
+    public function updateTerms(Request $request)
+    {
+        setting(['accept_terms_required' => $request->input('terms_required'),]);
+        setting(['terms' => $request->input('terms'),]);
+        setting(['privacy' => $request->input('privacy'),]);
+
+        return redirect()->route('admin.settings.terms')->with('success', __('Terms have been updated'));
+    }
+
+    public function termsTemplate(Request $request)
+    {
+        $template = file_get_contents(storage_path('templates/terms-of-service.md'));
+        $template = str_replace([
+            '{NAME}',
+            '{WEBSITE}',
+            '{DATE}'
+        ], [
+            setting('name'),
+            config('app.url'),
+            date('Y-m-d')
+        ], $template);
+
+        return ['content' => $template];
+    }
+
+    public function removeLogo(Request $request)
+    {
+        Storage::delete(setting('logo'));
+
+        setting(['logo' => null]);
+
+        return redirect()->back()->with('success', 'Logo has ben removed');
+    }
 }

app/Http/Controllers/Admin/SiteController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Resources\Admin\SiteResource;
 use App\Models\Site;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -10,6 +11,23 @@ use App\Http\Requests\Admin\ServerAttachRequest;
 
 class SiteController extends Controller
 {
+    public function index()
+    {
+        return inertia('Admin/Sites/Index', [
+            'filters' => request()->all('search'),
+            'sites' => SiteResource::collection(
+                Site::query()
+                    ->when(request()->input('search'), function ($query, $value) {
+                        return $query->where('domain', 'like', '%' . $value . '%');
+                    })
+                    ->with('server:id,name', 'users:id,name')
+                    ->latest()
+                    ->paginate(config('core.pagination.per_page'))
+                    ->withQueryString()
+            )
+        ]);
+    }
+
     public function edit($id)
     {
         $site = Site::findOrFail($id);

app/Http/Controllers/Admin/SynchronizeProviderController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Provider;
-use App\Services\Ploi\Ploi;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -11,15 +10,15 @@ class SynchronizeProviderController extends Controller
 {
     public function index()
     {
-        if (config('app.demo')) {
+        if ($this->isDemo()) {
             return redirect('/')->with('info', __('This feature is not available in demo mode.'));
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $availableProviders = $this->getPloi()->user()->serverProviders()->getData();
 
-        $availableProviders = $ploi->user()->serverProviders()->getData();
+        $currentProviders = Provider::query()
-
+            ->whereNotIn('id', array_keys((array)$availableProviders))
-        $currentProviders = Provider::whereNotIn('id', array_keys((array)$availableProviders))->get();
+            ->get();
 
         return inertia('Admin/Services/Providers', [
             'availableProviders' => $availableProviders,
@@ -29,7 +28,7 @@ class SynchronizeProviderController extends Controller
 
     public function synchronize(Request $request, $providerId)
     {
-        $ploiProvider = (new Ploi)->user()->serverProviders($providerId)->getData();
+        $ploiProvider = $this->getPloi()->user()->serverProviders($providerId)->getData();
 
         $provider = Provider::updateOrCreate([
             'ploi_id' => $ploiProvider->id,

app/Http/Controllers/Admin/SynchronizeServerController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -11,15 +10,15 @@ class SynchronizeServerController extends Controller
 {
     public function index()
     {
-        if (config('app.demo')) {
+        if ($this->isDemo()) {
             return redirect('/')->with('info', __('This feature is not available in demo mode.'));
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
 
-        $availableServers = $ploi->synchronize()->servers()->getData();
+        $currentServers = Server::query()
-
+            ->whereNotIn('id', array_keys((array)$availableServers))
-        $currentServers = Server::whereNotIn('id', array_keys((array)$availableServers))->get();
+            ->get();
 
         return inertia('Admin/Services/Servers', [
             'availableServers' => $availableServers,
@@ -29,15 +28,37 @@ class SynchronizeServerController extends Controller
 
     public function synchronizeServer(Request $request)
     {
-        Server::updateOrCreate([
+        Server::query()
-            'ploi_id' => $request->input('id')
+            ->updateOrCreate([
-        ], [
+                'ploi_id' => $request->input('id')
-            'status' => $request->input('status'),
+            ], [
-            'name' => $request->input('name'),
+                'status' => $request->input('status'),
-            'ip' => $request->input('ip_address'),
+                'name' => $request->input('name'),
-            'ssh_port' => $request->input('ssh_port', 22),
+                'ip' => $request->input('ip_address'),
-            'internal_ip' => $request->input('internal_ip'),
+                'ssh_port' => $request->input('ssh_port', 22),
-            'available_php_versions' => $request->input('installed_php_versions')
+                'internal_ip' => $request->input('internal_ip'),
-        ]);
+                'available_php_versions' => $request->input('installed_php_versions')
+            ]);
+    }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
+
+        foreach ($availableServers as $availableServer) {
+            Server::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableServer->id
+                ], [
+                    'status' => $availableServer->status,
+                    'name' => $availableServer->name,
+                    'ip' => $availableServer->ip_address,
+                    'ssh_port' => $availableServer->ssh_port,
+                    'internal_ip' => $availableServer->internal_ip,
+                    'available_php_versions' => $availableServer->installed_php_versions
+                ]);
+        }
+
+        return response('ok');
     }
 }

app/Http/Controllers/Admin/SynchronizeSiteController.php

@@ -2,12 +2,85 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\Site;
+use App\Models\Server;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 class SynchronizeSiteController extends Controller
 {
     public function index()
     {
-        return inertia('Admin/Services/Sites');
+        if ($this->isDemo()) {
+            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
+        }
+
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        $currentSites = Site::query()
+            ->whereNotIn('id', array_keys((array)$availableSites))
+            ->get();
+
+        return inertia('Admin/Services/Sites', [
+            'availableSites' => $availableSites,
+            'currentSites' => $currentSites
+        ]);
+    }
+
+    public function synchronizeSite(Request $request)
+    {
+        $server = Server::query()->where('ploi_id', $request->input('server_id'))->firstOrFail();
+
+        /* @var $site \App\Models\Site */
+        $site = Site::query()
+            ->updateOrCreate([
+                'ploi_id' => $request->input('id')
+            ], [
+                'domain' => $request->input('domain'),
+                'php_version' => $request->input('php_version'),
+                'project' => $request->input('project_type')
+            ]);
+
+        $site->status = $request->input('status');
+        $site->server_id = $server->id;
+        $site->save();
+
+        $certificates = $this->getPloi()->server($request->input('server_id'))->sites($request->input('id'))->certificates()->get()->getData();
+
+        if ($certificates) {
+            foreach ($certificates as $certificate) {
+                $site->certificates()->updateOrCreate([
+                    'ploi_id' => $certificate->id,
+                ], [
+                    'status' => $certificate->status,
+                    'ploi_id' => $certificate->id,
+                    'domain' => $certificate->domain,
+                    'type' => $certificate->type,
+                ]);
+            }
+        }
+
+        return response('ok');
+    }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        foreach ($availableSites as $availableSite) {
+            $server = Server::query()->where('ploi_id', $availableSite->server_id)->firstOrFail();
+
+            $site = Site::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableSite->id
+                ], [
+                    'domain' => $availableSite->domain,
+                    'php_version' => $availableSite->php_version,
+                ]);
+
+            $site->status = $availableSite->status;
+            $site->server_id = $server->id;
+            $site->save();
+        }
     }
 }

app/Http/Controllers/Admin/SystemController.php

@@ -2,31 +2,37 @@
 
 namespace App\Http\Controllers\Admin;
 
+use Inertia\Response;
 use Illuminate\Http\Request;
 use App\Jobs\Core\UpdateSystem;
 use App\Services\VersionChecker;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Laravel\Horizon\Contracts\MasterSupervisorRepository;
 
 class SystemController extends Controller
 {
-    public function index()
+    public function index(Request $request, MasterSupervisorRepository $masterSupervisorRepository): Response|RedirectResponse
     {
-        if (config('app.demo')) {
+        if ($request->input('flush', false)) {
-            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
+            app(VersionChecker::class)->flushVersionData();
+
+            return redirect()->route('admin.system')->with('success', __('Refreshed versions'));
         }
 
-        $version = (new VersionChecker)->getVersions();
+        $version = app(VersionChecker::class)->getVersions();
 
         return inertia('Admin/System', [
             'version' => [
                 'out_of_date' => $version->isOutOfDate(),
                 'current' => $version->currentVersion,
                 'remote' => $version->remoteVersion
-            ]
+            ],
+            'horizonRunning' => (bool) $masterSupervisorRepository->all(),
         ]);
     }
 
-    public function update(Request $request)
+    public function update(Request $request): RedirectResponse
     {
         dispatch(new UpdateSystem);
 

app/Http/Controllers/Admin/UserController.php

@@ -11,12 +11,14 @@ class UserController extends Controller
 {
     public function index()
     {
-        $users = User::with('package:id,name')
+        $users = User::query()
+            ->withCount('sites', 'servers')
+            ->with('package:id,name')
             ->when(request()->input('search'), function ($query, $value) {
                 return $query->where('name', 'like', '%' . $value . '%')->orWhere('email', 'like', '%' . $value . '%');
             })
             ->latest()
-            ->paginate(5);
+            ->paginate(config('core.pagination.per_page'));
 
         return inertia('Admin/Users/Index', [
             'filters' => request()->all('search'),
@@ -45,8 +47,8 @@ class UserController extends Controller
             $user->save();
         }
 
-        if ($package = $request->input('package')) {
+        if ($request->input('package') && Package::find($request->input('package'))) {
-            $user->package_id = $package;
+            $user->package_id = $request->input('package');
             $user->save();
         }
 
@@ -55,7 +57,17 @@ class UserController extends Controller
 
     public function show($id)
     {
-        // TODO: Implement show feature for a user
+        $user = User::query()->findOrFail($id);
+
+        $servers = $user->servers()->withCount('sites')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_servers');
+
+        $sites = $user->sites()->with('server:id,name')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_sites');
+
+        return inertia('Admin/Users/Show', [
+            'user' => $user,
+            'sites' => $sites,
+            'servers' => $servers,
+        ]);
     }
 
     public function edit($id)

app/Http/Controllers/Api/ServerController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\Server\CreateServerAction;
+use App\DataTransferObjects\ServerData;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class ServerController extends Controller
+{
+    public function store(Request $request): Response
+    {
+        $data = $request->validate([
+            'name' => ['required'],
+            'provider_id' => ['required'],
+            'provider_region_id' => ['required'],
+            'provider_plan_id' => ['required'],
+            'database_type' => ['required'],
+            'user_id' => ['required'],
+        ]);
+
+        $server = app(CreateServerAction::class)->execute(
+            ServerData::validate($data)
+        );
+
+        return response(content: ['data' => ServerData::from($server)->toArray()], status: 201);
+    }
+}

app/Http/Controllers/Api/SiteController.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\Site\CreateSiteAction;
+use App\DataTransferObjects\SiteData;
+use App\Http\Controllers\Controller;
+use App\Models\Site;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class SiteController extends Controller
+{
+    public function index(): mixed
+    {
+        return SiteData::collection(Site::paginate());
+    }
+
+    public function store(Request $request): Response|JsonResponse
+    {
+        // Required parameters are validated at the controller level. For example in the API you need to manually pass a user_id,
+        // whilst in the "authenticated part" the user id is takes as Auth::id(). Validation of universal rules is done at the
+        // data-object level (e.g. exists:server_id).
+        $data = $request->validate([
+            'server_id' => ['required'],
+            'domain' => ['required'],
+            'user_id' => ['required'],
+        ]);
+
+        $site = app(CreateSiteAction::class)->execute(
+            SiteData::validate($data)
+        );
+
+        $site->refresh();
+
+        return $site
+            ? response(content: ['data' => SiteData::from($site)->toArray()], status: 201)
+            : response()->json([
+                'message' => __('It seems there is no free server room for this site to take place. Please get in touch with support to resolve this.'),
+            ], 422);
+    }
+
+    public function show(Site $site): Response
+    {
+        return response(content: ['data' => SiteData::from($site)]);
+    }
+}

app/Http/Controllers/Api/UserController.php

@@ -2,27 +2,62 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\User;
+use App\DataTransferObjects\UserData;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Api\UserRequest;
+use App\Models\User;
-use App\Http\Resources\Api\UserResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Arr;
 
 class UserController extends Controller
 {
-    public function index()
+    public function index(): mixed
     {
-        return UserResource::collection(User::latest()->paginate());
+        return UserData::collection(User::latest()->paginate());
     }
 
-    public function store(UserRequest $request)
+    public function show(User $user): Response
     {
-        $user = User::create($request->validated());
+        return response(content: ['data' => UserData::from($user)], status: 200);
-
-        return new UserResource($user);
     }
 
-    public function show($id)
+    public function store(Request $request): Response
     {
-        return new UserResource(User::findOrFail($id));
+        $data = $request->validate([
+            'name' => ['required'],
+            'email' => ['required'],
+            'package_id' => ['nullable'],
+        ]);
+
+        $userData = UserData::validate($data);
+
+        $user = User::create($userData->toArray());
+
+        return response(content: ['data' => UserData::from($user)], status: 201);
+    }
+
+    public function update(User $user, Request $request): Response
+    {
+        $data = $request->validate([
+            'name' => [],
+            'email' => [],
+            'package_id' => [],
+            'blocked' => [],
+        ]);
+
+        $userData = UserData::validate($data);
+
+        $user->update(
+            Arr::only($userData->toArray(), array_keys($data))
+        );
+
+        return response(content: ['data' => UserData::from($user)], status: 200);
+    }
+
+    public function destroy(User $user): Response
+    {
+        $user->delete();
+
+        return response(status: 200);
     }
 }

app/Http/Controllers/Auth/AuthenticateTwoFactorController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class AuthenticateTwoFactorController extends Controller
+{
+    public function index()
+    {
+        return inertia('Auth/ConfirmTwoFactorAuthentication');
+    }
+
+    public function confirm(Request $request): RedirectResponse
+    {
+        $request->validate([
+            'code' => 'totp'
+        ]);
+
+        session()->put('auth.two_factor_authenticated_at', now());
+
+        return redirect()->away(RouteServiceProvider::HOME);
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\Password;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
@@ -27,27 +28,55 @@ class RegisterController extends Controller
 
     protected function validator(array $data)
     {
-        return Validator::make($data, [
+        $rules = [
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
+            'password' => [
-        ]);
+                'required',
+                'string',
+                'confirmed',
+                Password::defaults()
+            ],
+        ];
+
+        if (setting('accept_terms_required')) {
+            $rules['terms'] = [
+                'accepted'
+            ];
+        }
+
+        return Validator::make($data, $rules);
     }
 
     protected function create(array $data)
     {
-        return User::create([
+        $fields = [
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => $data['password'],
-        ]);
+        ];
+
+        if ($days = setting('trial')) {
+            $fields['trial_ends_at'] = now()->addDays($days);
+        }
+
+        return User::create($fields);
     }
 
     protected function registered(Request $request, $user)
     {
-        if (setting('default_package') && setting('default_package') != 'false') {
+        if (
+            setting('default_package') &&
+            setting('default_package') != 'false' &&
+            !setting('trial')
+        ) {
             $user->package_id = setting('default_package');
             $user->save();
         }
+
+        if (setting('trial') && setting('trial_package')) {
+            $user->package_id = setting('trial_package');
+            $user->save();
+        }
     }
 }

app/Http/Controllers/Controller.php

@@ -2,11 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Traits\HasPloi;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class Controller extends BaseController
 {
-    use ValidatesRequests, AuthorizesRequests;
+    use ValidatesRequests, AuthorizesRequests, HasPloi;
+
+    protected function isDemo()
+    {
+        return config('app.demo');
+    }
 }

app/Http/Controllers/PageController.php

@@ -2,10 +2,29 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Str;
+
 class PageController extends Controller
 {
     public function installationIncomplete()
     {
         return inertia('Core/InstallationIncomplete');
     }
+
+    public function show($slug)
+    {
+        if ($slug === 'terms-of-service' && setting('terms')) {
+            return inertia('Pages/Terms', [
+                'content' => Str::markdown(setting('terms'))
+            ]);
+        }
+
+        if ($slug === 'privacy-policy' && setting('privacy')) {
+            return inertia('Pages/Privacy', [
+                'content' => Str::markdown(setting('privacy'))
+            ]);
+        }
+
+        abort(404);
+    }
 }

app/Http/Controllers/Profile/ProfileBillingController.php

@@ -22,7 +22,11 @@ class ProfileBillingController extends Controller
         $packages = Package::query()
             ->where(function ($query) {
                 return $query
-                    ->where('price_monthly', '>', 0)
+                    ->where(function ($query) {
+                        return $query
+                            ->where('price_monthly', '>', 0)
+                            ->orWhere('price_yearly', '>', 0);
+                    })
                     ->whereNotNull('plan_id');
             })
             ->when($request->input('sortBy.' . $sortByType), function ($query, $value) use ($sortByType) {
@@ -55,7 +59,14 @@ class ProfileBillingController extends Controller
             ->transform(function (Package $package) {
                 $currency = $this->transformCurrency($package->currency);
 
+                $package->period = 'monthly';
+
+                if ($package->price_yearly > 0) {
+                    $package->period = 'yearly';
+                }
+
                 $package->price_monthly = ($currency ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
+                $package->price_yearly = ($currency ?? '[Unknown currency]') . number_format($package->price_yearly, 2, ',', '.');
 
                 return $package;
             });
@@ -66,11 +77,14 @@ class ProfileBillingController extends Controller
             return inertia('Profile/BillingError');
         }
 
+        $subscription = $user->subscription();
+
         return inertia('Profile/Billing', [
             'packages' => $packages,
             'countries' => countries(),
-            'subscription' => $user->subscription('default'),
+            'subscription' => $subscription,
             'public_key' => config('cashier.key'),
+            'ends' => $subscription ? Carbon::createFromTimeStamp($subscription->asStripeSubscription()->current_period_end)->format('F jS, Y') ?? null : null,
             'data_client_secret' => $clientSecret,
             'card' => [
                 'last_four' => $user->card_last_four,
@@ -111,6 +125,16 @@ class ProfileBillingController extends Controller
         return redirect()->route('profile.billing.index')->with('success', 'Your card has been added, you can now update your plan');
     }
 
+    public function deleteCard(Request $request)
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        $user->deletePaymentMethods();
+
+        return redirect()->route('profile.billing.index')->with('success', 'Your credit card has been removed from your account');
+    }
+
     public function updatePlan(Request $request)
     {
         /** @var User $user */
@@ -198,8 +222,10 @@ class ProfileBillingController extends Controller
             Package::CURRENCY_AUD => 'AUD $',
             Package::CURRENCY_GBP => 'GBP £',
             Package::CURRENCY_INR => 'INR ₹',
+            Package::CURRENCY_THB => 'THB ',
+            Package::CURRENCY_BRL=> 'BRL R$ ',
         ];
 
-        return $currencies[strtolower($key)];
+        return $currencies[strtolower($key)] ?? '$';
     }
 }

app/Http/Controllers/Profile/ProfileController.php

@@ -2,10 +2,11 @@
 
 namespace App\Http\Controllers\Profile;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UserProfileRequest;
 use App\Http\Resources\UserProfileResource;
+use App\Models\User;
+use Illuminate\Http\Request;
 
 class ProfileController extends Controller
 {
@@ -37,4 +38,21 @@ class ProfileController extends Controller
 
         return $mode;
     }
+
+    public function destroy(Request $request)
+    {
+        /* @var $user User */
+        $user = $request->user();
+
+        $user->sites()->detach();
+        $user->servers()->detach();
+        $user->supportTicketReplies()->delete();
+        $user->supportTickets()->delete();
+
+        $user->delete();
+
+        auth()->logout();
+
+        return redirect()->route('login');
+    }
 }

app/Http/Controllers/Profile/ProfilePasswordController.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Profile;
-
-use Illuminate\Http\Request;
-use App\Rules\MatchOldPassword;
-use App\Http\Controllers\Controller;
-
-class ProfilePasswordController extends Controller
-{
-    public function index()
-    {
-        return inertia('Profile/Security');
-    }
-
-    public function update(Request $request)
-    {
-        $request->validate([
-            'current_password' => ['required', new MatchOldPassword],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-
-        $request->user()->update(['password' => $request->input('password')]);
-
-        return redirect()->route('profile.security.index')->with('success', __('Your password has been updated'));
-    }
-}

app/Http/Controllers/Profile/ProfileSecurityController.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Controllers\Profile;
+
+use App\Http\Controllers\Controller;
+use App\Rules\MatchOldPassword;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class ProfileSecurityController extends Controller
+{
+    public function index(Request $request)
+    {
+        $twoFactorAuth = $request->user()->twoFactorAuth()->first();
+
+        // Only show recovery codes once.
+        $recoveryCodes = $twoFactorAuth?->recovery_codes_generated_at?->gt(now()->subSecond(1))
+            ? $request->user()->getRecoveryCodes()
+            : [];
+
+        return inertia('Profile/Security', [
+            'twoFactor' => [
+                'secret' => [
+                    'qr_code' => $twoFactorAuth?->toQr(),
+                    'uri' => $twoFactorAuth?->toUri(),
+                    'string' => $twoFactorAuth?->toString(),
+                ],
+                'recoveryCodes' => $recoveryCodes,
+                'enabled' => $request->user()->hasTwoFactorEnabled(),
+            ],
+        ]);
+    }
+
+    public function updatePassword(Request $request): RedirectResponse
+    {
+        $request->validate([
+            'current_password' => ['required', new MatchOldPassword],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
+        ]);
+
+        $request->user()->update(['password' => $request->input('password')]);
+
+        return redirect()->route('profile.security.index')->with('success', __('Your password has been updated'));
+    }
+}

app/Http/Controllers/Profile/TwoFactorAuthentication/ConfirmTwoFactorAuthenticationController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Controllers\Profile\TwoFactorAuthentication;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class ConfirmTwoFactorAuthenticationController extends Controller
+{
+    public function __invoke(Request $request): RedirectResponse
+    {
+        $request->validate([
+            'code' => 'required|numeric',
+        ]);
+
+        $activated = $request->user()->confirmTwoFactorAuth($request->input('code'));
+
+        if ($activated) {
+            session()->put('auth.two_factor_authenticated_at', now());
+
+            return redirect()
+                ->route('profile.security.index')
+                ->with('success', __('Your two factor authentication has been activated'));
+        }
+
+        return redirect()
+            ->route('profile.security.index')
+            ->with('error', __('Please check your confirmation code'));
+    }
+}

app/Http/Controllers/Profile/TwoFactorAuthentication/RegenerateRecoveryCodesController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Profile\TwoFactorAuthentication;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class RegenerateRecoveryCodesController extends Controller
+{
+    public function __invoke(Request $request): RedirectResponse
+    {
+        $request->user()->generateRecoveryCodes();
+
+        return redirect()
+            ->route('profile.security.index')
+            ->with('success', __('Your recovery codes have been regenerated'));
+    }
+}

app/Http/Controllers/Profile/TwoFactorAuthentication/TwoFactorAuthenticationController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Profile\TwoFactorAuthentication;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+
+class TwoFactorAuthenticationController extends Controller
+{
+    public function create(Request $request): RedirectResponse
+    {
+        if ($request->user()->hasTwoFactorEnabled()) {
+            return redirect()->route('profile.security.index')->with('error', __('Your two factor authentication is already enabled'));
+        }
+
+        $request->user()->createTwoFactorAuth();
+
+        return redirect()->route('profile.security.index')->with('success', __('Your two factor authentication has been enabled'));
+    }
+
+    public function destroy(Request $request): RedirectResponse
+    {
+        $request->user()->disableTwoFactorAuth();
+
+        return redirect()
+            ->route('profile.security.index')
+            ->with('success', __('Two factor authentication has been disabled'));
+    }
+}

app/Http/Controllers/ServerController.php

@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\User;
+use App\Actions\Server\CreateServerAction;
-use Illuminate\Http\Request;
+use App\DataTransferObjects\ServerData;
-use App\Jobs\Servers\CreateServer;
-use App\Jobs\Servers\DeleteServer;
-use App\Http\Requests\ServerRequest;
-use Illuminate\Support\Facades\Mail;
-use App\Http\Resources\ServerResource;
-use App\Mail\Server\ServerCreatedEmail;
 use App\Http\Requests\ServerUpdateRequest;
-use App\Mail\Admin\Server\AdminServerCreatedEmail;
+use App\Http\Resources\ServerResource;
+use App\Jobs\Servers\DeleteServer;
+use App\Models\Server;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ServerController extends Controller
 {
@@ -30,33 +29,23 @@ class ServerController extends Controller
         ]);
     }
 
-    public function store(ServerRequest $request)
+    public function store(Request $request): RedirectResponse
     {
-        $provider = $request->user()->package->providers()->findOrFail($request->input('provider'));
+        $this->authorize('create', Server::class);
-        $region = $provider->regions()->findOrFail($request->input('region'));
-        $plan = $provider->plans()->findOrFail($request->input('plan'));
 
-        /* @var $server \App\Models\Server */
+        $data = $request->validate([
-        $server = $request->user()->servers()->create([
+            'name' => ['required'],
-            'name' => $request->input('name')
+            'provider_id' => ['required'],
+            'provider_region_id' => ['required'],
+            'provider_plan_id' => ['required'],
+            'database_type' => ['required'],
         ]);
 
-        $server->provider()->associate($provider);
+        $data['user_id'] = Auth::id();
-        $server->providerRegion()->associate($region);
-        $server->providerPlan()->associate($plan);
-        $server->save();
 
-        dispatch(new CreateServer($server));
+        app(CreateServerAction::class)->execute(
-
+            ServerData::validate($data)
-        Mail::to($request->user())->send(new ServerCreatedEmail($request->user(), $server));
+        );
-
-        if (setting('receive_email_on_server_creation')) {
-            $admins = User::query()->where('role', User::ADMIN)->get();
-
-            foreach ($admins as $admin) {
-                Mail::to($admin)->send(new AdminServerCreatedEmail($request->user(), $server));
-            }
-        }
 
         return redirect()->route('servers.index');
     }
@@ -65,6 +54,10 @@ class ServerController extends Controller
     {
         $server = auth()->user()->servers()->findOrFail($id);
 
+        if ($server->status === Server::STATUS_BUSY) {
+            return redirect()->back()->with('info', 'This server is currently busy, please check back later.');
+        }
+
         return inertia('Servers/Show', [
             'server' => $server,
             'sites' => $server->sites()->latest()->paginate(5, ['*'], 'sites_per_page'),
@@ -104,9 +97,21 @@ class ServerController extends Controller
     {
         $provider = $request->user()->package->providers()->findOrFail($providerId);
 
+        $regions = $provider->regions()
+            ->when($provider->allowed_regions, function ($query) use ($provider) {
+                return $query->whereIn('id', $provider->allowed_regions);
+            })
+            ->pluck('label', 'id');
+
+        $plans = $provider->plans()
+            ->when($provider->allowed_plans, function ($query) use ($provider) {
+                return $query->whereIn('id', $provider->allowed_plans);
+            })
+            ->pluck('label', 'id');
+
         return [
-            'regions' => $provider->regions()->pluck('label', 'id'),
+            'regions' => $regions,
-            'plans' => $provider->plans()->pluck('label', 'id'),
+            'plans' => $plans,
         ];
     }
 }

app/Http/Controllers/SiteAliasController.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\SiteAliasRequest;
+use App\Http\Resources\SiteAliasResource;
+use App\Jobs\Aliases\CreateAlias;
+use App\Jobs\Aliases\DeleteAlias;
+
+class SiteAliasController extends Controller
+{
+    public function index($id)
+    {
+        $site = auth()->user()->sites()->findOrFail($id);
+
+        return inertia('Sites/Aliases', [
+            'site' => $site,
+            'aliases' => $site->aliases
+        ]);
+    }
+
+    public function store(SiteAliasRequest $request, $id)
+    {
+        $site = $request->user()->sites()->findOrFail($id);
+
+        $site->addAlias($request->input('domain'));
+
+        dispatch(new CreateAlias($site, $request->input('domain'), $request->boolean('request_new_certificate')));
+
+        return redirect()->route('sites.aliases.index', $id)->with('success', __('Alias has been created'));
+    }
+
+    public function destroy($id, $alias)
+    {
+        $site = auth()->user()->sites()->findOrFail($id);
+
+        dispatch(new DeleteAlias($site, $alias));
+
+        $site->removeAlias($alias);
+
+        return redirect()->route('sites.aliases.index', $id)->with('success', __('Alias has been deleted'));
+    }
+}

app/Http/Controllers/SiteCertificateController.php

@@ -25,6 +25,9 @@ class SiteCertificateController extends Controller
 
         $certificate = $site->certificates()->create([
             'domain' => $request->input('domain'),
+            'type' => $request->input('type', 'letsencrypt'),
+            'certificate' => $request->input('certificate'),
+            'private' => $request->input('private')
         ]);
 
         $certificate->server_id = $site->server_id;

app/Http/Controllers/SiteController.php

@@ -2,14 +2,22 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Server;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
-use App\Jobs\Sites\CreateSite;
 use App\Jobs\Sites\DeleteSite;
-use App\Http\Requests\SiteRequest;
 use App\Http\Resources\SiteResource;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Requests\SiteRequest;
+use App\Jobs\Sites\CreateSite;
+use App\Mail\Admin\Site\AdminSiteCreatedEmail;
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Hash;
+use App\DataTransferObjects\SiteData;
+use Illuminate\Http\RedirectResponse;
+use App\Actions\Site\CreateSiteAction;
 
 class SiteController extends Controller
 {
@@ -17,27 +25,45 @@ class SiteController extends Controller
     {
         $sites = auth()->user()
             ->sites()
+            ->with('server:id,name')
             ->when(request('server'), function ($query, $value) {
                 return $query->where('server_id', $value);
             })
             ->latest()
-            ->paginate(10);
+            ->paginate(config('core.pagination.per_page'));
 
         $availableServers = auth()->user()->servers()->pluck('name', 'id');
 
         return inertia('Sites/Index', [
             'sites' => SiteResource::collection($sites),
-            'availableServers' => $availableServers
+            'availableServers' => $availableServers,
         ]);
     }
 
-    public function store(SiteRequest $request)
+    public function store(SiteRequest $request): RedirectResponse
     {
+        if (Site::query()->where('domain', $request->input('domain'))->exists()) {
+            return redirect()->back()->withErrors([
+                'domain' => 'This domain is not available.'
+            ]);
+        }
+
         if ($serverId = $request->input('server_id')) {
             $server = $request->user()->servers()->findOrFail($serverId);
         } else {
             $server = Server::query()
-                ->doesntHave('users')
+                ->where('maximum_sites', '>', 0)
+                ->where(function ($query) {
+                    return $query
+                        ->where(function ($query) {
+                            return $query->whereHas('users', function ($query) {
+                                return $query->where('user_id', auth()->id());
+                            });
+                        })
+                        ->orWhere(function ($query) {
+                            return $query->doesntHave('users');
+                        });
+                })
                 ->withCount('sites')
                 ->inRandomOrder()
                 ->first();
@@ -53,32 +79,31 @@ class SiteController extends Controller
             ]);
         }
 
-        $site = $server->sites()->create($request->all());
+        $request->merge(['user_id' => auth()->id()]);
 
-        $request->user()->sites()->save($site);
+        $site = app(CreateSiteAction::class)->execute(
+            SiteData::validate($request)
+        );
 
-        dispatch(new CreateSite($site));
+        return $site
-
+            ? redirect()->route('sites.index')->with('success', __('Your website is being created'))
-        $request->user()->systemLogs()->create([
+            : redirect()->back()->withErrors([
-            'title' => 'New site :site created',
+                'domain' => __('It seems there is no free server room for this site to take place. Please get in touch with support to resolve this.'),
-            'description' => 'A new site has been created'
+            ]);
-        ])->model()->associate($site)->save();
-
-        return redirect()->route('sites.index')->with('success', __('Your website is being created'));
     }
 
     public function show($id)
     {
         $site = auth()->user()->sites()->findOrFail($id);
 
-        if (!$site->isActive()) {
+        if (! $site->isActive()) {
             return redirect()->route('sites.index')->with('info', __('This site does not seem to be active, please wait for the process to finish'));
         }
 
         return inertia('Sites/Show', [
             'site' => $site,
             'system_user' => $site->getSystemUser(false),
-            'ip_address' => $site->server->ip
+            'ip_address' => $site->server->ip,
         ]);
     }
 
@@ -100,14 +125,14 @@ class SiteController extends Controller
         if ($request->user()->requires_password_for_ftp) {
             $this->validate($request, ['password' => 'required|string']);
 
-            if (!Hash::check($request->input('password'), $request->user()->password)) {
+            if (! Hash::check($request->input('password'), $request->user()->password)) {
                 return response([
                     'message' => 'The given data was invalid',
                     'errors' => [
                         'password' => [
-                            trans('auth.failed')
+                            trans('auth.failed'),
-                        ]
+                        ],
-                    ]
+                    ],
                 ], 422);
             }
         }

app/Http/Controllers/SiteDatabaseController.php

@@ -2,10 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\Databases\CreateDatabase;
-use App\Jobs\Databases\DeleteDatabase;
 use App\Http\Requests\SiteDatabaseRequest;
 use App\Http\Resources\SiteDatabaseResource;
+use App\Jobs\Databases\CreateDatabase;
+use App\Jobs\Databases\DeleteDatabase;
+use Illuminate\Support\Str;
 
 class SiteDatabaseController extends Controller
 {
@@ -24,11 +25,11 @@ class SiteDatabaseController extends Controller
         $site = auth()->user()->sites()->findOrFail($id);
 
         $database = $site->databases()->create([
-            'name' => $request->input('name')
+            'name' => Str::of($site->domain)->limit(8)->remove(['.', '-'])->lower()->append('_')->append($request->input('name'))
         ]);
 
         $database->users()->create([
-            'name' => $request->input('user_name'),
+            'name' => $request->input('user_name', ),
         ]);
 
         $database->server_id = $site->server_id;

app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -65,9 +65,11 @@ class Kernel extends HttpKernel
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.blocked' => \App\Http\Middleware\UserBlocked::class,
+        'auth.2fa' => \App\Http\Middleware\EnforceTwoFactorAuthenticationIfEnabled::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'has.access' => \App\Http\Middleware\HasAccessToThisGroup::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'global.api.authenticated' => \App\Http\Middleware\GlobalApiAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

app/Http/Middleware/Demo.php

@@ -10,7 +10,7 @@ class Demo
     protected $safeRoutes = [
         'login',
         'logout',
-        //'profile/toggle-theme'
+        'profile/toggle-theme'
     ];
 
     protected $allowedIps = [

app/Http/Middleware/EnforceTwoFactorAuthenticationIfEnabled.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Laragear\TwoFactor\Facades\Auth2FA;
+
+class EnforceTwoFactorAuthenticationIfEnabled
+{
+    public function handle(Request $request, Closure $next): mixed
+    {
+        if (auth()->guest()) {
+            return $next($request);
+        }
+
+        if (! $request->user()->hasTwoFactorEnabled()) {
+            return $next($request);
+        }
+
+        $twoFactorAuthenticatedAt = session()->get('auth.two_factor_authenticated_at');
+
+        if ($twoFactorAuthenticatedAt && Carbon::parse($twoFactorAuthenticatedAt)->gt(now()->subHours(3))) {
+            return $next($request);
+        }
+
+        return redirect()->route('auth.confirm-2fa.index');
+    }
+}

app/Http/Middleware/GlobalApiAuthenticated.php

@@ -8,28 +8,27 @@ use App\Services\Ploi\Exceptions\Http\Unauthenticated;
 
 class GlobalApiAuthenticated
 {
-    /**
+    public function handle(Request $request, Closure $next): mixed
-     * Handle an incoming request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
     {
-        if (!$this->isAuthenticated($request)) {
+        abort_unless($this->hasApiEnabled(), 404);
+
+        abort_unless($this->isAuthenticated($request), 403);
+
+        if (! $this->isAuthenticated($request)) {
             throw new Unauthenticated('Unauthenticated for global access.');
         }
 
         return $next($request);
     }
 
+    protected function hasApiEnabled(): bool
+    {
+        return setting('enable_api') && (bool) setting('api_token');
+    }
+
     protected function isAuthenticated(Request $request)
     {
-        return
+        return $request->bearerToken()
-            setting('enable_api') &&
+            && $request->bearerToken() === decrypt(setting('api_token'));
-            setting('api_token') &&
-            $request->bearerToken() &&
-            $request->bearerToken() === decrypt(setting('api_token'));
     }
 }

app/Http/Middleware/HandleInertiaRequests.php

@@ -3,12 +3,12 @@
 namespace App\Http\Middleware;
 
 use App\Models\Alert;
-use Inertia\Middleware;
-use Illuminate\Support\Arr;
 use App\Models\UserProvider;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
+use Inertia\Middleware;
 
 class HandleInertiaRequests extends Middleware
 {
@@ -16,7 +16,7 @@ class HandleInertiaRequests extends Middleware
      * Determines the current asset version.
      *
      * @see https://inertiajs.com/asset-versioning
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      * @return string|null
      */
     public function version(Request $request)
@@ -28,7 +28,7 @@ class HandleInertiaRequests extends Middleware
      * Defines the props that are shared by default.
      *
      * @see https://inertiajs.com/shared-data
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      * @return array
      */
     public function share(Request $request)
@@ -68,13 +68,14 @@ class HandleInertiaRequests extends Middleware
                     ] : null,
                     'package' => auth()->user() && auth()->user()->package ? [
                         'name' => auth()->user()->package->name,
-                        'maximum_sites' => auth()->user()->package->maximum_sites
+                        'maximum_sites' => auth()->user()->package->maximum_sites,
+                        'trial' => auth()->user()->onTrial()
                     ] : [
                         'name' => __('None')
                     ],
                     'can' => $can,
                     'integrations' => [
-                        'cloudflare' => (bool)auth()->user() ? auth()->user()->providers()->where('type', UserProvider::TYPE_CLOUDFLARE)->count() : false,
+                        'cloudflare' => (bool) auth()->user() ? auth()->user()->providers()->where('type', UserProvider::TYPE_CLOUDFLARE)->count() : false,
                     ]
                 ];
             },
@@ -87,7 +88,10 @@ class HandleInertiaRequests extends Middleware
                     'documentation' => setting('documentation', false),
                     'logo' => setting('logo'),
                     'allow_registration' => setting('allow_registration'),
-                    'billing' => config('cashier.key') && config('cashier.secret')
+                    'billing' => config('cashier.key') && config('cashier.secret'),
+                    'has_terms' => (bool)setting('terms'),
+                    'has_privacy' => (bool)setting('privacy'),
+                    'accept_terms_required' => (bool)setting('accept_terms_required')
                 ];
             },
             'flash' => function () {
@@ -121,7 +125,7 @@ class HandleInertiaRequests extends Middleware
                 }
 
                 return [
-                    'message' => $alert->message,
+                    'message_html' => $alert->messageHtml,
                     'type' => $alert->type
                 ];
             }

app/Http/Middleware/HasAccessToThisGroup.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+
+class HasAccessToThisGroup
+{
+    public function handle(Request $request, Closure $next, $group)
+    {
+        if ($group === 'servers') {
+            $package = $request->user()->package ?? [];
+
+            if (
+                !Arr::get($package->server_permissions, 'create', false) &&
+                !Arr::get($package->server_permissions, 'update', false) &&
+                !Arr::get($package->server_permissions, 'delete', false)
+            ) {
+                abort(404);
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/TrustProxies.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Requests/Admin/PackageRequest.php

@@ -41,6 +41,8 @@ class PackageRequest extends FormRequest
                     Package::CURRENCY_CAD,
                     Package::CURRENCY_GBP,
                     Package::CURRENCY_INR,
+                    Package::CURRENCY_THB,
+                    Package::CURRENCY_BRL,
                 ])
             ],
             'maximum_sites' => [
@@ -58,7 +60,11 @@ class PackageRequest extends FormRequest
             ],
             'price_monthly' => [
                 'nullable',
-                'numeric'
+                'numeric',
+            ],
+            'price_yearly' => [
+                'nullable',
+                'numeric',
             ],
             'server_permissions' => [
                 'array'
@@ -78,8 +84,12 @@ class PackageRequest extends FormRequest
             $merge['price_monthly'] = 0.000;
         }
 
+        if (!$this->price_yearly) {
+            $merge['price_yearly'] = 0.000;
+        }
+
         // If we don't have the currency filled in, merge a default
-        if (!$this->price_monthly) {
+        if (!$this->price_monthly || !$this->price_yearly) {
             $merge['currency'] = Package::CURRENCY_USD;
         }
 

app/Http/Requests/Admin/ProviderRequest.php

@@ -28,6 +28,14 @@ class ProviderRequest extends FormRequest
                 'required',
                 'string',
                 'max:255'
+            ],
+            'allowed_plans' => [
+                'nullable',
+                'array'
+            ],
+            'allowed_regions' => [
+                'nullable',
+                'array'
             ]
         ];
     }

app/Http/Requests/Admin/SettingRequest.php

@@ -39,6 +39,10 @@ class SettingRequest extends FormRequest
                 'nullable',
                 'image',
                 'max:2000'
+            ],
+
+            'trial_package' => [
+                'required_with:trial'
             ]
         ];
     }

app/Http/Requests/Api/SiteRequest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Requests\Api;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SiteRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'server_id'
+        ];
+    }
+}

app/Http/Requests/Api/UserRequest.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Api;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return $this->bearerToken() && $this->bearerToken() === setting('api_token');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name' => [
-                'required',
-                'string',
-                'max:255'
-            ],
-            'email' => [
-                'required',
-                'string',
-                'email',
-                'max:255',
-                'unique:users'
-            ]
-        ];
-    }
-}

app/Http/Requests/ServerRequest.php

@@ -4,6 +4,7 @@ namespace App\Http\Requests;
 
 use App\Models\Server;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class ServerRequest extends FormRequest
 {
@@ -24,6 +25,9 @@ class ServerRequest extends FormRequest
      */
     public function rules()
     {
+        return [
+
+        ];
         return [
             'name' => [
                 'required',
@@ -45,6 +49,11 @@ class ServerRequest extends FormRequest
                 'required',
                 'not_in:0',
                 'exists:provider_plans,id'
+            ],
+            'database_type' => [
+                'required',
+                'string',
+                Rule::in(['mysql', 'mariadb', 'postgresql', 'postgresql13'])
             ]
         ];
     }

app/Http/Requests/SiteAliasRequest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Rules\Hostname;
+use Illuminate\Foundation\Http\FormRequest;
+
+class SiteAliasRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth()->check();
+    }
+
+    public function rules()
+    {
+        return [
+            'domain' => [
+                'required',
+                'string',
+                new Hostname,
+            ],
+            'request_new_certificate' => [
+                'required',
+            ]
+        ];
+    }
+}

app/Http/Requests/SiteCertificateRequest.php

@@ -25,15 +25,36 @@ class SiteCertificateRequest extends FormRequest
      */
     public function rules()
     {
-        return [
+        $rules = [];
-            'domain' => [
+
-                'required',
+        if ($this->input('type') === 'letsencrypt') {
-                'string',
+            $rules = [
-                Rule::unique('certificates', 'domain')->where(function ($query) {
+                'domain' => [
-                    return $query->where('site_id', $this->route('site'));
+                    'required',
-                }),
+                    'string',
-                new LetsEncryptMatchHostWithIp($this->route('site'))
+                    Rule::unique('certificates', 'domain')->where(function ($query) {
-            ]
+                        return $query->where('site_id', $this->route('site'));
-        ];
+                    }),
+                    new LetsEncryptMatchHostWithIp($this->route('site'))
+                ]
+            ];
+        }
+
+        if ($this->input('type') === 'custom') {
+            $rules = [
+                'certificate' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ],
+                'private' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ]
+            ];
+        }
+
+        return $rules;
     }
 }

app/Http/Resources/Admin/ServerResource.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Resources\Admin;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ServerResource extends JsonResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'ip' => $this->ip,
+            'users' => $this->users,
+            'sites_count' => $this->sites_count,
+            'maximum_sites' => $this->maximum_sites,
+            'created_at' => $this->created_at->format('Y-m-d H:i:s')
+        ];
+    }
+}

app/Http/Resources/Admin/SiteResource.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Resources\Admin;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SiteResource extends JsonResource
+{
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

app/Http/Resources/Api/UserResource.php

@@ -6,13 +6,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource
 {
-    /**
+    public function toArray($request): array
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
     {
         return [
             'id' => $this->id,

app/Http/Resources/SiteResource.php

@@ -7,12 +7,6 @@ use Illuminate\Http\Resources\Json\JsonResource;
 
 class SiteResource extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
     public function toArray($request)
     {
         /* @var $this \App\Models\Site */
@@ -20,7 +14,11 @@ class SiteResource extends JsonResource
             'id' => $this->id,
             'status' => $this->parseStatus($this->status),
             'domain' => $this->domain,
+            'php_version' => $this->php_version,
             'project' => $this->project,
+            'server' => $this->server ? [
+                'name' => $this->server->name
+            ] : null,
             'created_at' => $this->created_at
         ];
     }

app/Jobs/Aliases/CreateAlias.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Jobs\Aliases;
+
+use App\Jobs\Certificates\CreateCertificate;
+use App\Jobs\Certificates\DeleteCertificate;
+use App\Models\Certificate;
+use App\Models\Site;
+use App\Traits\HasPloi;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CreateAlias implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
+
+    public function __construct(
+        public Site $site,
+        public string $alias,
+        public bool $requestNewCertificate = false,
+    ) {}
+
+    public function handle()
+    {
+        $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->aliases()
+            ->create([$this->alias]);
+
+        if ($this->requestNewCertificate) {
+            $currentCertificate = $this
+                ->site
+                ->certificates()
+                ->whereIn('status', [Certificate::STATUS_ACTIVE, Certificate::STATUS_BUSY])
+                ->latest()
+                ->first();
+
+            if (! $currentCertificate) {
+                return;
+            }
+
+            dispatch(new DeleteCertificate($this->site->server->ploi_id, $this->site->ploi_id, $currentCertificate->ploi_id));
+
+            $newCertificate = $this->site->certificates()->create([
+                'domain' => $currentCertificate->domain . ',' . $this->alias,
+                'type' => $currentCertificate->type,
+                'certificate' => $currentCertificate->certificate,
+                'private' => $currentCertificate->private
+            ]);
+
+            $currentCertificate->delete();
+
+            $newCertificate->server_id = $this->site->server_id;
+            $newCertificate->save();
+
+            dispatch(new CreateCertificate($newCertificate))->delay(now()->addSeconds(5));
+        }
+    }
+
+    public function failed()
+    {
+        $this->site->aliases = array_diff($this->site->aliases, [$this->alias]);
+        $this->site->save();
+    }
+}

app/Jobs/Aliases/DeleteAlias.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Jobs\Aliases;
+
+use App\Models\Site;
+use App\Traits\HasPloi;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class DeleteAlias implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
+
+    public Site $site;
+    public string $alias;
+
+    public function __construct(Site $site, $alias)
+    {
+        $this->site = $site;
+        $this->alias = $alias;
+    }
+
+    public function handle()
+    {
+        $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->aliases()
+            ->delete($this->alias);
+    }
+}

app/Jobs/Apps/InstallApp.php

@@ -2,45 +2,46 @@
 
 namespace App\Jobs\Apps;
 
+use App\Models\Database;
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Arr;
 
 class InstallApp implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
+    public Site $site;
     public $type;
     public $options;
 
-    /**
+    public function __construct(Site $site, string $type = Site::PROJECT_WORDPRESS, array $options = [])
-     * Create a new job instance.
-     *
-     * @param Site $site
-     * @param string $type
-     * @param array $options
-     */
-    public function __construct(Site $site, $type = Site::PROJECT_WORDPRESS, array $options = [])
     {
         $this->site = $site;
         $this->type = $type;
         $this->options = $options;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $response = $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->app()
+            ->install($this->type, $this->options);
 
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->app()->install($this->type, $this->options);
+        if (Arr::get($this->options, 'create_database', false)) {
+            $database = $this->site->databases()->create([
+                'name' => $response->database_name,
+            ]);
+
+            $database->status = Database::STATUS_ACTIVE;
+            $database->save();
+        }
     }
 }

app/Jobs/Apps/UninstallApp.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Apps;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,9 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class UninstallApp implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
+    public Site $site;
 
     /**
      * Create a new job instance.
@@ -37,9 +37,11 @@ class UninstallApp implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()
-
+            ->server($this->site->server->ploi_id)
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->app()->uninstall($this->site->project);
+            ->sites($this->site->ploi_id)
+            ->app()
+            ->uninstall($this->site->project);
 
         $this->site->project = null;
         $this->site->save();

app/Jobs/Certificates/CreateCertificate.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
+use App\Traits\HasPloi;
 use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,38 +12,44 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateCertificate implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $certificate;
+    public Certificate $certificate;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Certificate $certificate
-     */
     public function __construct(Certificate $certificate)
     {
         $this->certificate = $certificate;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        if ($this->certificate->type === 'letsencrypt') {
+            $ploiCertificate = $this->getPloi()
+                ->server($this->certificate->server->ploi_id)
+                ->sites($this->certificate->site->ploi_id)
+                ->certificates()
+                ->create(
+                    $this->certificate->domain
+                );
 
-        $ploiCertificate = $ploi->server($this->certificate->server->ploi_id)
+            $this->certificate->ploi_id = $ploiCertificate->id;
-            ->sites($this->certificate->site->ploi_id)
+            $this->certificate->save();
-            ->certificates()
+        }
-            ->create(
-                $this->certificate->domain
-            );
 
-        $this->certificate->ploi_id = $ploiCertificate->id;
+        if ($this->certificate->type === 'custom') {
-        $this->certificate->save();
+            $ploiCertificate = $this->getPloi()
+                ->server($this->certificate->server->ploi_id)
+                ->sites($this->certificate->site->ploi_id)
+                ->certificates()
+                ->create(
+                    $this->certificate->certificate,
+                    $this->certificate->type,
+                    $this->certificate->private
+                );
+
+            $this->certificate->ploi_id = $ploiCertificate->id;
+            $this->certificate->save();
+        }
 
         // Lets fetch the status after 5 seconds
         dispatch(new FetchCertificateStatus($this->certificate))->delay(now()->addSeconds(5));

app/Jobs/Certificates/DeleteCertificate.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Certificates;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteCertificate implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -42,9 +42,8 @@ class DeleteCertificate implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()
-
+            ->server($this->serverPloiId)
-        $ploi->server($this->serverPloiId)
             ->sites($this->sitePloiId)
             ->certificates()
             ->delete($this->certificatePloiId);

app/Jobs/Certificates/FetchCertificateStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
+use App\Traits\HasPloi;
 use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchCertificateStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $certificate;
 
@@ -23,7 +23,7 @@ class FetchCertificateStatus implements ShouldQueue
      * @param Certificate $certificate
      * @param int $threshold
      */
-    public function __construct(Certificate $certificate, $threshold = 0)
+    public function __construct(Certificate $certificate, int $threshold = 0)
     {
         $this->certificate = $certificate;
         $this->setThreshold($threshold);
@@ -43,9 +43,8 @@ class FetchCertificateStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiCronjob = $this->getPloi()
-
+            ->server($this->certificate->server->ploi_id)
-        $ploiCronjob = $ploi->server($this->certificate->server->ploi_id)
             ->sites($this->certificate->site->ploi_id)
             ->certificates()
             ->get($this->certificate->ploi_id)

app/Jobs/Cronjobs/CreateCronjob.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Cronjobs;
 
 use App\Models\Cronjob;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateCronjob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $cronjob;
 
@@ -35,13 +35,14 @@ class CreateCronjob implements ShouldQueue
     {
         $owner = $this->cronjob->site->users()->first();
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiCronjob = $this->getPloi()
-
+            ->server($this->cronjob->server->ploi_id)
-        $ploiCronjob = $ploi->server($this->cronjob->server->ploi_id)->cronjobs()->create(
+            ->cronjobs()
-            $this->cronjob->command,
+            ->create(
-            $this->cronjob->frequency,
+                $this->cronjob->command,
-            $owner->user_name
+                $this->cronjob->frequency,
-        );
+                $owner->user_name
+            );
 
         $this->cronjob->ploi_id = $ploiCronjob->id;
         $this->cronjob->save();

app/Jobs/Cronjobs/DeleteCronjob.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Cronjobs;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteCronjob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $cronjobPloiId;
@@ -39,8 +39,9 @@ class DeleteCronjob implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()
-
+            ->server($this->serverPloiId)
-        $ploi->server($this->serverPloiId)->cronjobs()->delete($this->cronjobPloiId);
+            ->cronjobs()
+            ->delete($this->cronjobPloiId);
     }
 }

app/Jobs/Cronjobs/FetchCronjobStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Cronjobs;
 
 use App\Models\Cronjob;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchCronjobStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $cronjob;
 
@@ -23,7 +23,7 @@ class FetchCronjobStatus implements ShouldQueue
      * @param Cronjob $cronjob
      * @param int $threshold
      */
-    public function __construct(Cronjob $cronjob, $threshold = 0)
+    public function __construct(Cronjob $cronjob, int $threshold = 0)
     {
         $this->cronjob = $cronjob;
         $this->setThreshold($threshold);
@@ -43,9 +43,11 @@ class FetchCronjobStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiCronjob = $this->getPloi()
-
+            ->server($this->cronjob->server->ploi_id)
-        $ploiCronjob = $ploi->server($this->cronjob->server->ploi_id)->cronjobs()->get($this->cronjob->ploi_id)->getData();
+            ->cronjobs()
+            ->get($this->cronjob->ploi_id)
+            ->getData();
 
         if ($ploiCronjob->status !== Cronjob::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Databases/CreateDatabase.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Databases;
 
+use App\Traits\HasPloi;
 use App\Models\Database;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateDatabase implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $database;
     public $password;
@@ -38,9 +38,10 @@ class CreateDatabase implements ShouldQueue
     {
         $databaseUser = $this->database->users()->first();
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiDatabase = $this->getPloi()
-
+            ->server($this->database->server->ploi_id)
-        $ploiDatabase = $ploi->server($this->database->server->ploi_id)->databases()->create($this->database->name, $databaseUser->name, $this->password);
+            ->databases()
+            ->create($this->database->name, $databaseUser->name, $this->password);
 
         $this->database->ploi_id = $ploiDatabase->id;
         $this->database->save();

app/Jobs/Databases/DeleteDatabase.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Databases;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteDatabase implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $databasePloiId;
@@ -40,8 +40,6 @@ class DeleteDatabase implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()->server($this->serverPloiId)->databases()->delete($this->databasePloiId);
-
-        $ploi->server($this->serverPloiId)->databases()->delete($this->databasePloiId);
     }
 }

app/Jobs/Databases/FetchDatabaseStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Databases;
 
+use App\Traits\HasPloi;
 use App\Models\Database;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchDatabaseStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $database;
 
@@ -23,7 +23,7 @@ class FetchDatabaseStatus implements ShouldQueue
      * @param Database $database
      * @param int $threshold
      */
-    public function __construct(Database $database, $threshold = 0)
+    public function __construct(Database $database, int $threshold = 0)
     {
         $this->database = $database;
         $this->setThreshold($threshold);
@@ -43,9 +43,11 @@ class FetchDatabaseStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiDatabase = $this->getPloi()
-
+            ->server($this->database->server->ploi_id)
-        $ploiDatabase = $ploi->server($this->database->server->ploi_id)->databases()->get($this->database->ploi_id)->getData();
+            ->databases()
+            ->get($this->database->ploi_id)
+            ->getData();
 
         if ($ploiDatabase->status !== Database::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Redirects/CreateRedirect.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Redirects;
 
+use App\Traits\HasPloi;
 use App\Models\Redirect;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateRedirect implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $redirect;
 
@@ -33,9 +33,7 @@ class CreateRedirect implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiRedirect = $this->getPloi()
-
-        $ploiRedirect = $ploi
             ->server($this->redirect->server->ploi_id)
             ->sites($this->redirect->site->ploi_id)
             ->redirects()

app/Jobs/Redirects/DeleteRedirect.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Redirects;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteRedirect implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -42,9 +42,8 @@ class DeleteRedirect implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()
-
+            ->server($this->serverPloiId)
-        $ploi->server($this->serverPloiId)
             ->sites($this->sitePloiId)
             ->redirects()
             ->delete($this->redirectPloiId);

app/Jobs/Redirects/FetchRedirectStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Redirects;
 
+use App\Traits\HasPloi;
 use App\Models\Redirect;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchRedirectStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $redirect;
 
@@ -23,7 +23,7 @@ class FetchRedirectStatus implements ShouldQueue
      * @param Redirect $redirect
      * @param int $threshold
      */
-    public function __construct(Redirect $redirect, $threshold = 0)
+    public function __construct(Redirect $redirect, int $threshold = 0)
     {
         $this->redirect = $redirect;
         $this->setThreshold($threshold);
@@ -43,9 +43,8 @@ class FetchRedirectStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiRedirect = $this->getPloi()
-
+            ->server($this->redirect->server->ploi_id)
-        $ploiRedirect = $ploi->server($this->redirect->server->ploi_id)
             ->sites($this->redirect->site->ploi_id)
             ->redirects()
             ->get($this->redirect->ploi_id)->getData();

app/Jobs/Servers/CreateServer.php

@@ -3,54 +3,45 @@
 namespace App\Jobs\Servers;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
+use Exception;
 use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 
 class CreateServer implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $server;
     public $tries = 1;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Server $server
-     */
     public function __construct(Server $server)
     {
         $this->server = $server;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $ploiServer = $this->getPloi()->server()->create(
-
-        $ploiServer = $ploi->server()->create(
             $this->server->name,
             $this->server->provider->ploi_id,
             $this->server->providerRegion->region_id,
             $this->server->providerPlan->plan_id,
+            'server',
+            $this->server->database_type
         );
 
         $this->server->ploi_id = $ploiServer->id;
         $this->server->save();
 
-        // Lets fetch the status after 5 minutes
+        // Let's fetch the status after 5 minutes
         dispatch(new FetchServerStatus($this->server))->delay(now()->addMinutes(5));
     }
 
-    public function failed(\Exception $exception)
+    public function failed(Exception $exception)
     {
         $this->server->delete();
     }

app/Jobs/Servers/DeleteServer.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Servers;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteServer implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
 
@@ -32,8 +32,6 @@ class DeleteServer implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()->server($this->serverPloiId)->delete();
-
-        $ploi->server($this->serverPloiId)->delete();
     }
 }

app/Jobs/Servers/FetchServerStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Servers;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchServerStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $server;
 
@@ -43,9 +43,7 @@ class FetchServerStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi;
+        $ploiServer = $this->getPloi()->server($this->server->ploi_id)->get()->getData();
-
-        $ploiServer = $ploi->server($this->server->ploi_id)->get()->getData();
 
         if ($ploiServer->status !== Server::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Servers/SynchronizeServers.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Jobs\Servers;
-
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-class SynchronizeServers implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $ploi = new \App\Services\Ploi\Ploi(config('services.ploi.token'));
-
-        $servers = $ploi->server()->get()->getData();
-
-        foreach ($servers as $server) {
-            Server::firstOrCreate([
-                'ip' => $server->ip_address,
-            ], [
-                'name' => $server->name
-            ]);
-        }
-    }
-}

app/Jobs/Sites/ChangePhpVersion.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Sites;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class ChangePhpVersion implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $site;
     public $version;
@@ -36,9 +36,7 @@ class ChangePhpVersion implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->phpVersion($this->version);
-
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->phpVersion($this->version);
 
         $this->site->php_version = $this->version;
         $this->site->save();

app/Jobs/Sites/CreateSite.php

@@ -2,8 +2,9 @@
 
 namespace App\Jobs\Sites;
 
+use Throwable;
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Support\Arr;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
@@ -13,32 +14,18 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateSite implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
+    public function __construct(
-
+        public Site $site,
-    /**
+    ) {
-     * Create a new job instance.
-     *
-     * @param Site $site
-     */
-    public function __construct(Site $site)
-    {
-        $this->site = $site;
     }
 
-    /**
+    public function handle(): void
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
         $systemUser = $this->site->getSystemUser();
 
-        $ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->create(
+        $ploiSite = $this->getPloi()->server($this->site->server->ploi_id)->sites()->create(
             $this->site->domain,
             '/public',
             '/',
@@ -53,8 +40,12 @@ class CreateSite implements ShouldQueue
         dispatch(new FetchSiteStatus($this->site))->delay(now()->addSeconds(3));
     }
 
-    public function failed(\Exception $exception)
+    public function failed(Throwable $exception): void
     {
         $this->site->delete();
+
+        if (app()->isLocal()) {
+            throw $exception;
+        }
     }
 }

app/Jobs/Sites/DeleteSite.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Sites;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteSite implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -34,8 +34,6 @@ class DeleteSite implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $this->getPloi()->server($this->serverPloiId)->sites()->delete($this->sitePloiId);
-
-        $ploi->server($this->serverPloiId)->sites()->delete($this->sitePloiId);
     }
 }

app/Jobs/Sites/FetchSiteStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Sites;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchSiteStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $site;
 
@@ -43,9 +43,7 @@ class FetchSiteStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi;
+        $ploiSite = $this->getPloi()->server($this->site->server->ploi_id)->sites()->get($this->site->ploi_id)->getData();
-
-        $ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->get($this->site->ploi_id)->getData();
 
         if ($ploiSite->status !== Site::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Listeners/ResetTwoFactorAuthenticationSession.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Auth\Events\Logout;
+
+class ResetTwoFactorAuthenticationSession
+{
+    public function handle(Logout $event): void
+    {
+        session()->put('auth.two_factor_authenticated_at', null);
+    }
+}

app/Mail/Admin/Server/AdminServerCreatedEmail.php

@@ -13,26 +13,15 @@ class AdminServerCreatedEmail extends Mailable implements ShouldQueue
 {
     use Queueable, SerializesModels;
 
-    public $user;
+    public User $user;
-    public $server;
+    public Server $server;
 
-    /**
-     * Create a new message instance.
-     *
-     * @param User $user
-     * @param Server $server
-     */
     public function __construct(User $user, Server $server)
     {
         $this->user = $user;
         $this->server = $server;
     }
 
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
     public function build()
     {
         return $this