Merge branch 'develop'

# 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,10 @@ 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
+.DS_Store

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

@@ -42,6 +42,9 @@ class Install extends Command
         $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'));
@@ -54,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']);
-        $email = $this->ask('What is your e-mail address', $this->company['email']);
-        $password = $this->secret('What password do you desire');
+            $name = $this->ask('What is your name', $this->company['user_name']);
+            $email = $this->ask('What is your e-mail address', $this->company['email']);
+            $password = $this->secret('What password do you desire');
 
-        $check = User::where('email', $email)->count();
+            $check = User::where('email', $email)->count();
 
-        if ($check) {
-            $this->line('');
-            $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
-            $this->comment('Aborting installation..');
+            if ($check) {
+                $this->line('');
+                $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
+                $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()
@@ -195,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()
@@ -308,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');
     }
 

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,48 @@
+<?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\Server;
+use App\Models\User;
+use Illuminate\Support\Carbon;
+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(
+        public ?int $id = null,
+        #[StringType]
+        public ?string $status = null,
+        #[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,
+        public ?Carbon $created_at = null,
+    ) {}
+
+    public static function fromModel(Server $server): static
+    {
+        return static::from(array_merge($server->toArray(), ['user_id' => $server->user->id]));
+    }
+}

app/DataTransferObjects/SiteData.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\DataTransferObjects;
+
+use App\DataTransferObjects\Support\Concerns\BelongsToUser;
+use App\DataTransferObjects\Support\Data;
+use App\DataTransferObjects\Support\Rules\CustomRule;
+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 Illuminate\Support\Carbon;
+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 ?Carbon $created_at = null,
+    ) {}
+
+    public static function authorize(): bool
+    {
+        if ( auth()->guest() ) {
+            return true;
+        }
+
+        return auth()->user()->can('create', Site::class);
+    }
+
+    public static function fromModel(Site $site): static
+    {
+        return static::from(array_merge($site->toArray(), ['user_id' => $site->user->id]));
+    }
+
+    public function toArray(): array
+    {
+        return Arr::only(parent::toArray(), [
+            'id',
+            'status',
+            'server_id',
+            'domain',
+            'user_id',
+            'created_at',
+        ]);
+    }
+}

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 \Throwable $exception
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @param Request $request
+     * @param Throwable $exception
+     * @return Response
      *
-     * @throws \Throwable
+     * @throws Throwable
      */
     public function render($request, Throwable $exception)
     {
         $response = parent::render($request, $exception);
 
-        if (in_array($response->status(), [404, 403])) {
-            \Route::any($request->path(), function () use ($exception, $request) {
-                return parent::render($request, $exception);
-            })->middleware('web');
-
-            return inertia()->render('Errors/' . $response->status(), ['status' => $response->status()])
-                ->toResponse($request)
-                ->setStatusCode($response->status());
+        // Only return an Inertia-response when there are special Vue-templates (403 and 404) and when it isn't an API request.
+        if (in_array($response->status(), [403, 404]) && ! $request->routeIs('api.*')) {
+            return app(HandleInertiaRequests::class)
+                ->handle($request, fn () => inertia()->render('Errors/' . $response->status(), ['status' => $response->status()])
+                ->toResponse($request));
         }
 
         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()
-                ->map(function (SystemLog $systemLog) {
+            'logs' => SystemLog::query()
+                ->latest()
+                ->with('model')
+                ->paginate(5)
+                ->through(function (SystemLog $systemLog) {
                     return [
                         'title' => __($systemLog->title, [
                             'site' => $systemLog->model->domain ?? '-Unknown-'

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::query()->withCount('sites', 'users')->latest()->paginate(5, ['*'], 'servers_per_page'),
-            'sites' => Site::with('server:id,name')->withCount('users')->latest()->paginate(5, ['*'], 'sites_per_page'),
+            'servers' => Server::query()->withCount('sites', 'users')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'servers_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

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Package;
-use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
 use App\Http\Requests\Admin\SettingRequest;
@@ -22,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');
@@ -48,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);
@@ -92,7 +101,7 @@ class SettingController extends Controller
     public function terms()
     {
         return inertia('Admin/Terms', [
-            'settings' => [
+            'terms_settings' => [
                 'logo' => setting('logo'),
                 'name' => setting('name'),
                 'terms_required' => setting('accept_terms_required'),
@@ -126,4 +135,13 @@ class SettingController extends Controller
 
         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;
 

app/Http/Controllers/Admin/SynchronizeSiteController.php

@@ -31,17 +31,36 @@ class SynchronizeSiteController extends Controller
     {
         $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)
@@ -53,7 +72,7 @@ class SynchronizeSiteController extends Controller
 
             $site = Site::query()
                 ->updateOrCreate([
-                    'ploi_id' => $availableSite->server_id
+                    'ploi_id' => $availableSite->id
                 ], [
                     'domain' => $availableSite->domain,
                     'php_version' => $availableSite->php_version,

app/Http/Controllers/Admin/SystemController.php

@@ -2,26 +2,25 @@
 
 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(MasterSupervisorRepository $masterSupervisorRepository)
+    public function index(Request $request, MasterSupervisorRepository $masterSupervisorRepository): Response|RedirectResponse
     {
-        if (config('app.demo')) {
-            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
+        if ($request->input('flush', false)) {
+            app(VersionChecker::class)->flushVersionData();
+
+            return redirect()->route('admin.system')->with('success', __('Refreshed versions'));
         }
 
-        $version = (new VersionChecker)->getVersions();
-
-        $horizonRunning = true;
-        if (!$masterSupervisorRepository->all()) {
-            $horizonRunning = false;
-        }
+        $version = app(VersionChecker::class)->getVersions();
 
         return inertia('Admin/System', [
             'version' => [
@@ -29,11 +28,11 @@ class SystemController extends Controller
                 'current' => $version->currentVersion,
                 'remote' => $version->remoteVersion
             ],
-            'horizonRunning' => $horizonRunning
+            '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'),
@@ -57,9 +59,9 @@ class UserController extends Controller
     {
         $user = User::query()->findOrFail($id);
 
-        $servers = $user->servers()->withCount('sites')->latest()->paginate(5, ['*'], 'page_servers');
+        $servers = $user->servers()->withCount('sites')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_servers');
 
-        $sites = $user->sites()->with('server:id,name')->latest()->paginate(5, ['*'], 'page_sites');
+        $sites = $user->sites()->with('server:id,name')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_sites');
 
         return inertia('Admin/Users/Show', [
             'user' => $user,

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->refresh())->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\Http\Resources\Api\UserResource;
+use App\Models\User;
+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 new UserResource($user);
+        return response(content: ['data' => UserData::from($user)], status: 200);
     }
 
-    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

@@ -35,10 +35,7 @@ class RegisterController extends Controller
                 'required',
                 'string',
                 'confirmed',
-                Password::min(6)
-                    ->letters()
-                    ->numbers()
-                    ->uncompromised()
+                Password::defaults()
             ],
         ];
 
@@ -53,18 +50,33 @@ class RegisterController extends Controller
 
     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/Profile/ProfileBillingController.php

@@ -77,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,
@@ -122,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 */
@@ -210,6 +223,7 @@ class ProfileBillingController extends Controller
             Package::CURRENCY_GBP => 'GBP £',
             Package::CURRENCY_INR => 'INR ₹',
             Package::CURRENCY_THB => 'THB ',
+            Package::CURRENCY_BRL=> 'BRL R$ ',
         ];
 
         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
 {
@@ -40,7 +41,7 @@ class ProfileController extends Controller
 
     public function destroy(Request $request)
     {
-        /* @var $user \App\Models\User */
+        /* @var $user User */
         $user = $request->user();
 
         $user->sites()->detach();

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 Illuminate\Http\Request;
-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\Actions\Server\CreateServerAction;
+use App\DataTransferObjects\ServerData;
 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'));
-        $region = $provider->regions()->findOrFail($request->input('region'));
-        $plan = $provider->plans()->findOrFail($request->input('plan'));
+        $this->authorize('create', Server::class);
 
-        /* @var $server \App\Models\Server */
-        $server = $request->user()->servers()->create([
-            'name' => $request->input('name')
+        $data = $request->validate([
+            'name' => ['required'],
+            'provider_id' => ['required'],
+            'provider_region_id' => ['required'],
+            'provider_plan_id' => ['required'],
+            'database_type' => ['required'],
         ]);
 
-        $server->provider()->associate($provider);
-        $server->providerRegion()->associate($region);
-        $server->providerPlan()->associate($plan);
-        $server->save();
+        $data['user_id'] = Auth::id();
 
-        dispatch(new CreateServer($server));
-
-        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));
-            }
-        }
+        app(CreateServerAction::class)->execute(
+            ServerData::validate($data)
+        );
 
         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'),

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/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,22 +25,29 @@ 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 {
@@ -64,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));
-
-        $request->user()->systemLogs()->create([
-            'title' => 'New site :site created',
-            'description' => 'A new site has been created'
-        ])->model()->associate($site)->save();
-
-        return redirect()->route('sites.index')->with('success', __('Your website is being created'));
+        return $site
+            ? redirect()->route('sites.index')->with('success', __('Your website is being created'))
+            : redirect()->back()->withErrors([
+                'domain' => __('It seems there is no free server room for this site to take place. Please get in touch with support to resolve this.'),
+            ]);
     }
 
     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,
         ]);
     }
 
@@ -111,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,6 +65,7 @@ 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,

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
 {
-    /**
-     * Handle an incoming request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): mixed
     {
-        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
-            setting('enable_api') &&
-            setting('api_token') &&
-            $request->bearerToken() &&
-            $request->bearerToken() === decrypt(setting('api_token'));
+        return $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,
                     ]
                 ];
             },
@@ -124,7 +125,7 @@ class HandleInertiaRequests extends Middleware
                 }
 
                 return [
-                    'message' => $alert->message,
+                    'message_html' => $alert->messageHtml,
                     'type' => $alert->type
                 ];
             }

app/Http/Middleware/HasAccessToThisGroup.php

@@ -3,8 +3,8 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
 
 class HasAccessToThisGroup
 {

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

@@ -42,6 +42,7 @@ class PackageRequest extends FormRequest
                     Package::CURRENCY_GBP,
                     Package::CURRENCY_INR,
                     Package::CURRENCY_THB,
+                    Package::CURRENCY_BRL,
                 ])
             ],
             'maximum_sites' => [

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/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
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
+    public function toArray($request): array
     {
         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,14 +2,15 @@
 
 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
 {
@@ -19,13 +20,6 @@ class InstallApp implements ShouldQueue
     public $type;
     public $options;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Site $site
-     * @param string $type
-     * @param array $options
-     */
     public function __construct(Site $site, string $type = Site::PROJECT_WORDPRESS, array $options = [])
     {
         $this->site = $site;
@@ -33,17 +27,21 @@ class InstallApp implements ShouldQueue
         $this->options = $options;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $this->getPloi()
+        $response = $this->getPloi()
             ->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,6 @@
 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;

app/Jobs/Certificates/CreateCertificate.php

@@ -2,9 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
-use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use App\Traits\HasPloi;
+use App\Models\Certificate;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;

app/Jobs/Certificates/DeleteCertificate.php

@@ -2,7 +2,6 @@
 
 namespace App\Jobs\Certificates;
 
-use App\Services\Ploi\Ploi;
 use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/Certificates/FetchCertificateStatus.php

@@ -2,9 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
-use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use App\Traits\HasPloi;
+use App\Models\Certificate;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;

app/Jobs/Cronjobs/CreateCronjob.php

@@ -3,7 +3,6 @@
 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;

app/Jobs/Cronjobs/DeleteCronjob.php

@@ -2,7 +2,6 @@
 
 namespace App\Jobs\Cronjobs;
 
-use App\Services\Ploi\Ploi;
 use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/Cronjobs/FetchCronjobStatus.php

@@ -3,7 +3,6 @@
 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;

app/Jobs/Databases/DeleteDatabase.php

@@ -2,7 +2,6 @@
 
 namespace App\Jobs\Databases;
 
-use App\Services\Ploi\Ploi;
 use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

app/Jobs/Servers/CreateServer.php

@@ -4,11 +4,12 @@ namespace App\Jobs\Servers;
 
 use App\Models\Server;
 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
 {
@@ -17,21 +18,11 @@ class CreateServer implements ShouldQueue
     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()
     {
         $ploiServer = $this->getPloi()->server()->create(
@@ -39,16 +30,18 @@ class CreateServer implements ShouldQueue
             $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/Sites/CreateSite.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs\Sites;
 
+use Throwable;
 use App\Models\Site;
 use App\Traits\HasPloi;
 use Illuminate\Support\Arr;
@@ -15,24 +16,12 @@ class CreateSite implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param Site $site
-     */
-    public function __construct(Site $site)
-    {
-        $this->site = $site;
+    public function __construct(
+        public Site $site,
+    ) {
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
+    public function handle(): void
     {
         $systemUser = $this->site->getSystemUser();
 
@@ -51,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/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 $server;
+    public User $user;
+    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

app/Mail/Admin/Site/AdminSiteCreatedEmail.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Mail\Admin\Site;
+
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class AdminSiteCreatedEmail extends Mailable implements ShouldQueue
+{
+    use Queueable, SerializesModels;
+
+    public User $user;
+    public Server $server;
+    public Site $site;
+
+    public function __construct(User $user, Server $server, Site $site)
+    {
+        $this->user = $user;
+        $this->server = $server;
+        $this->site = $site;
+    }
+
+    public function build()
+    {
+        return $this
+            ->subject(__('A user has created a new site'))
+            ->markdown('emails.admin.site.new-site');
+    }
+}

app/Models/Alert.php

@@ -3,10 +3,15 @@
 namespace App\Models;
 
 use DateTimeInterface;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 
 class Alert extends Model
 {
+    use HasFactory;
+
     const TYPE_INFO = 'info';
     const TYPE_WARNING = 'warning';
     const TYPE_DANGER = 'danger';
@@ -21,8 +26,23 @@ class Alert extends Model
         'expires_at'
     ];
 
+    protected $appends = [
+        'message_html'
+    ];
+
     protected function serializeDate(DateTimeInterface $date)
     {
         return $date->format('Y-m-d H:i:s');
     }
+
+    public function messageHtml(): Attribute
+    {
+        return Attribute::get(function ($value, array $attributes) {
+            return Str::of($attributes['message'])
+                ->markdown()
+                ->trim(PHP_EOL)
+                ->replace(PHP_EOL, '<br />')
+                ->value();
+        });
+    }
 }

app/Models/Certificate.php

@@ -21,5 +21,7 @@ class Certificate extends Model
         'type',
         'certificate',
         'private',
+        'ploi_id',
+        'status'
     ];
 }

app/Models/Package.php

@@ -3,10 +3,13 @@
 namespace App\Models;
 
 use App\Casts\PermissionCast;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Package extends Model
 {
+    use HasFactory;
+    
     const CURRENCY_EURO = 'eur';
     const CURRENCY_USD = 'usd';
     const CURRENCY_NOK = 'nok';
@@ -15,6 +18,7 @@ class Package extends Model
     const CURRENCY_GBP = 'gbp';
     const CURRENCY_INR = 'inr';
     const CURRENCY_THB = 'thb';
+    const CURRENCY_BRL = 'brl';
 
     public $fillable = [
         'name',

app/Models/Provider.php

@@ -2,10 +2,13 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Provider extends Model
 {
+    use HasFactory;
+
     protected $guarded = [];
 
     protected $casts = [

app/Models/ProviderPlan.php

@@ -2,9 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class ProviderPlan extends Model
 {
+    use HasFactory;
+
     protected $guarded = [];
 }

app/Models/ProviderRegion.php

@@ -2,9 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class ProviderRegion extends Model
 {
+    use HasFactory;
+
     protected $guarded = [];
 }

app/Models/Server.php

@@ -2,10 +2,14 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 
 class Server extends Model
 {
+    use HasFactory;
+
     const STATUS_BUSY = 'busy';
     const STATUS_ACTIVE = 'active';
 
@@ -17,7 +21,8 @@ class Server extends Model
         'internal_ip',
         'ssh_port',
         'maximum_sites',
-        'available_php_versions'
+        'available_php_versions',
+        'database_type'
     ];
 
     protected $casts = [
@@ -31,11 +36,17 @@ class Server extends Model
 
     public function users()
     {
-        return $this->morphToMany(User::class, 'service', 'user_service')
+        return $this
+            ->morphToMany(User::class, 'service', 'user_service')
             ->using(UserService::class)
             ->withTimestamps();
     }
 
+    public function user(): HasOneThrough
+    {
+        return $this->hasOneThrough(User::class, UserService::class, 'service_id', 'id', 'id', 'user_id');
+    }
+
     public function logs()
     {
         return $this->morphMany(SystemLog::class, 'model');

app/Models/Site.php

@@ -2,14 +2,17 @@
 
 namespace App\Models;
 
+use App\Casts\SiteAlias;
 use DateTimeInterface;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
+use Illuminate\Support\Str;
 
-/**
- * @property mixed|string domain
- */
 class Site extends Model
 {
+    use HasFactory;
+
     const STATUS_BUSY = 'busy';
     const STATUS_ACTIVE = 'active';
 
@@ -18,8 +21,15 @@ class Site extends Model
     const PROJECT_OCTOBERCMS = 'october-cms';
 
     public $fillable = [
+        'ploi_id',
         'domain',
-        'dns_id'
+        'dns_id',
+        'project',
+        'aliases'
+    ];
+
+    public $casts = [
+        'aliases' => SiteAlias::class,
     ];
 
     public function setDnsIdAttribute($value)
@@ -63,6 +73,11 @@ class Site extends Model
             ->withTimestamps();
     }
 
+    public function user(): HasOneThrough
+    {
+        return $this->hasOneThrough(User::class, UserService::class, 'service_id', 'id', 'id', 'user_id');
+    }
+
     public function logs()
     {
         return $this->morphMany(SystemLog::class, 'model');
@@ -96,6 +111,22 @@ class Site extends Model
             ] + ($withPassword ? ['ftp_password' => $user->ftp_password] : []);
     }
 
+    public function addAlias($alias)
+    {
+        $aliases = $this->aliases;
+
+        $aliases[] = $alias;
+
+        $this->aliases = $aliases;
+        $this->save();
+    }
+
+    public function removeAlias($alias)
+    {
+        $this->aliases = array_diff($this->aliases, [$alias]);
+        $this->save();
+    }
+
     public static function booted()
     {
         static::creating(function (self $site) {
@@ -103,7 +134,9 @@ class Site extends Model
         });
 
         static::created(function (self $site) {
-            $site->systemUsers()->create();
+            $site->systemUsers()->create([
+                'user_name' => Str::of($site->domain)->remove(['.', '-'])->limit(8, '')->lower()
+            ]);
         });
 
         static::deleting(function (self $site) {

app/Models/SiteSystemUser.php

@@ -3,8 +3,10 @@
 namespace App\Models;
 
 use App\Casts\Encrypted;
-use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Str;
 
 class SiteSystemUser extends Model
 {
@@ -17,21 +19,21 @@ class SiteSystemUser extends Model
         'ftp_password' => Encrypted::class,
     ];
 
-    public function site()
+    public function site(): BelongsToMany
     {
         return $this->belongsToMany(Site::class, 'site_system_user_attached');
     }
 
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
-    protected static function booted()
+    protected static function booted(): void
     {
         static::creating(function (self $siteSystemUser) {
-            $siteSystemUser->user_name = strtolower(Str::random(10));
-            $siteSystemUser->ftp_password = Str::random();
+            $siteSystemUser->user_name ??= strtolower(Str::random(10));
+            $siteSystemUser->ftp_password ??= Str::random();
         });
     }
 }

app/Models/User.php

@@ -3,18 +3,21 @@
 namespace App\Models;
 
 use App\Casts\Encrypted;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use Laravel\Cashier\Billable;
 use App\Mail\User\WelcomeEmail;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Contracts\Translation\HasLocalePreference;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
+use Laragear\TwoFactor\Contracts\TwoFactorAuthenticatable;
+use Laragear\TwoFactor\TwoFactorAuthentication;
+use Laravel\Cashier\Billable;
 
-class User extends Authenticatable implements HasLocalePreference
+class User extends Authenticatable implements HasLocalePreference, TwoFactorAuthenticatable
 {
-    use Billable, Notifiable;
+    use Billable, HasFactory, Notifiable, TwoFactorAuthentication;
 
     const ADMIN = 'admin';
     const RESELLER = 'reseller';
@@ -34,7 +37,8 @@ class User extends Authenticatable implements HasLocalePreference
         'blocked',
         'theme',
         'keyboard_shortcuts',
-        'requires_password_for_ftp'
+        'requires_password_for_ftp',
+        'package_id'
     ];
 
     protected $hidden = [
@@ -47,7 +51,8 @@ class User extends Authenticatable implements HasLocalePreference
         'email_verified_at' => 'datetime',
         'ftp_password' => Encrypted::class,
         'keyboard_shortcuts' => 'boolean',
-        'requires_password_for_ftp' => 'boolean'
+        'requires_password_for_ftp' => 'boolean',
+        'trial_ends_at' => 'datetime',
     ];
 
     protected $appends = [
@@ -95,13 +100,15 @@ class User extends Authenticatable implements HasLocalePreference
 
     public function servers()
     {
-        return $this->morphedByMany(Server::class, 'service', 'user_service')
+        return $this
+            ->morphedByMany(Server::class, 'service', 'user_service')
             ->using(UserService::class)->withTimestamps();
     }
 
     public function sites()
     {
-        return $this->morphedByMany(Site::class, 'service', 'user_service')
+        return $this
+            ->morphedByMany(Site::class, 'service', 'user_service')
             ->using(UserService::class)->withTimestamps();
     }
 
@@ -125,7 +132,7 @@ class User extends Authenticatable implements HasLocalePreference
         return $this->hasMany(UserProvider::class);
     }
 
-    protected static function booted()
+    protected static function booted(): void
     {
         static::creating(function (self $user) {
             $user->user_name = strtolower(Str::random(10));
@@ -134,10 +141,18 @@ class User extends Authenticatable implements HasLocalePreference
             if (!$user->language) {
                 $user->language = setting('default_language', 'en');
             }
+
+            if ($days = setting('trial')) {
+                $user->trial_ends_at = now()->addDays($days);
+            }
         });
 
         static::created(function (self $user) {
-            Mail::to($user)->send(new WelcomeEmail($user));
+            // Usually I don't like using such conditions. However, otherwise when using Mail::fake(),
+            // this would fake all emails going out leading to possible unexpected results as well.
+            if (! app()->runningUnitTests()) {
+                Mail::to($user)->send(new WelcomeEmail($user));
+            }
         });
 
         static::deleting(function (self $user) {

app/Policies/SitePolicy.php

@@ -3,8 +3,8 @@
 namespace App\Policies;
 
 use App\Models\User;
-use Illuminate\Support\Arr;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use Illuminate\Support\Arr;
 
 class SitePolicy
 {

app/Providers/AppServiceProvider.php

@@ -3,7 +3,9 @@
 namespace App\Providers;
 
 use App\Models\Setting;
+use Exception;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\Rules\Password;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -13,10 +15,21 @@ class AppServiceProvider extends ServiceProvider
             return $app['cache']->remember('core.settings', now()->addDay(), function () {
                 try {
                     return Setting::pluck('value', 'key')->toArray();
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     return [];
                 }
             });
         });
     }
+
+    public function boot()
+    {
+        Password::defaults(function () {
+            $rule = Password::min(6);
+
+            return $this->app->isProduction()
+                ? $rule->letters()->numbers()->uncompromised()
+                : $rule;
+        });
+    }
 }

app/Providers/EventServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace App\Providers;
 
+use App\Listeners\ResetTwoFactorAuthenticationSession;
+use Illuminate\Auth\Events\Logout;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
@@ -18,6 +20,9 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
+        Logout::class => [
+            ResetTwoFactorAuthenticationSession::class,
+        ]
     ];
 
     /**

app/Providers/RouteServiceProvider.php

@@ -2,11 +2,11 @@
 
 namespace App\Providers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Cache\RateLimiting\Limit;
-use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -31,17 +31,19 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         $this->configureRateLimiting();
 
         $this->routes(function () {
-            if (setting('enable_api')) {
-                Route::prefix('api')
-                    ->middleware('api')
-                    ->namespace($this->namespace . '\Api')
-                    ->group(base_path('routes/api.php'));
-            }
+            // The settings('enable_api') is now handled by the GlobalApiAuthenticated middleware,
+            // because the conditional inside this service makes testing very hard. This doesn't
+            // matter for existing users, because now the middleware will return 404 responses.
+            Route::prefix('api')
+                ->middleware(['api', 'global.api.authenticated'])
+                ->namespace($this->namespace . '\Api')
+                ->as('api.')
+                ->group(base_path('routes/api.php'));
 
             Route::middleware('web')
                 ->namespace($this->namespace)
@@ -60,7 +62,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    protected function configureRateLimiting()
+    protected function configureRateLimiting(): void
     {
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60);

app/Rules/ValidateMaximumSites.php

@@ -2,16 +2,34 @@
 
 namespace App\Rules;
 
+use App\Models\User;
+use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\Rule;
 
-class ValidateMaximumSites implements Rule
+class ValidateMaximumSites implements Rule, DataAwareRule
 {
+    protected array $data;
+
+    public function setData($data): static
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    protected function getUser(): User
+    {
+        return $this->data['user_id'] ?? null
+                ? User::find($this->data['user_id'])
+                : auth()->user();
+    }
+
     public function passes($attribute, $value)
     {
-        $package = auth()->user()->package;
+        $package = $this->getUser()->package;
 
         // If the user does not have a package, it can continue
-        if (!$package) {
+        if (! $package) {
             return true;
         }
 
@@ -20,7 +38,7 @@ class ValidateMaximumSites implements Rule
             return true;
         }
 
-        if ($package->maximum_sites <= auth()->user()->sites()->count()) {
+        if ($package->maximum_sites <= $this->getUser()->sites()->count()) {
             return false;
         }
 

app/Services/Ploi/Http/Response.php

@@ -2,41 +2,46 @@
 
 namespace App\Services\Ploi\Http;
 
+use Illuminate\Http\Client\Response as ClientResponse;
 use stdClass;
-use Psr\Http\Message\ResponseInterface;
 
 class Response
 {
-    private $json;
-    private $response;
+    protected ?stdClass $json;
 
-    public function __construct(ResponseInterface $response)
+    protected ClientResponse $response;
+
+    public function __construct(ClientResponse $response)
     {
         $this->setResponse($response);
         $this->decodeJson();
     }
 
-    private function setResponse(ResponseInterface $response): self
+    private function setResponse(ClientResponse $response): self
     {
         $this->response = $response;
 
         return $this;
     }
 
-    public function getResponse(): ResponseInterface
+    public function getResponse(): ClientResponse
     {
         return $this->response;
     }
 
     private function decodeJson(): self
     {
-        $json = json_decode($this->getResponse()->getBody());
+        $json = $this->getResponse()->json();
 
         return $this->setJson($json);
     }
 
-    public function setJson(stdClass $json = null): self
+    public function setJson(stdClass|array $json = null): self
     {
+        if (is_array($json)) {
+            $json = json_decode(json_encode($json));
+        }
+
         $this->json = $json;
 
         return $this;

app/Services/Ploi/Ploi.php

@@ -3,11 +3,12 @@
 namespace App\Services\Ploi;
 
 use Exception;
-use GuzzleHttp\Client;
 use App\Services\Ploi\Http\Response;
+use Illuminate\Support\Facades\Http;
 use App\Services\Ploi\Resources\User;
 use App\Services\Ploi\Resources\Server;
 use Psr\Http\Message\ResponseInterface;
+use Illuminate\Http\Client\PendingRequest;
 use App\Services\Ploi\Resources\Synchronize;
 use App\Services\Ploi\Exceptions\Http\NotFound;
 use App\Services\Ploi\Exceptions\Http\NotValid;
@@ -19,19 +20,22 @@ use App\Services\Ploi\Exceptions\Http\PerformingMaintenance;
 class Ploi
 {
     public $url;
-    private $guzzle;
+
     private $apiToken;
+
     private $apiCoreToken;
 
+    protected PendingRequest $client;
+
     public function __construct(string $token = null, string $coreApiToken = null)
     {
-        $this->url = app()->isLocal() ? 'http://core-api.ploi.test/' : 'https://core-api.ploi.io/';
+        $this->url = config('services.ploi-api.url');
 
-        if (!$token) {
+        if (! $token) {
             $token = config('services.ploi.token');
         }
 
-        if (!$coreApiToken) {
+        if (! $coreApiToken) {
             $coreApiToken = config('services.ploi.core-token');
         }
 
@@ -57,18 +61,13 @@ class Ploi
         return $this;
     }
 
-    public function buildClient()
+    public function buildClient(): static
     {
-        // Generate a new Guzzle client
-        $this->guzzle = new Client([
-            'base_uri' => $this->url,
-            'http_errors' => false,
-            'headers' => [
-                'Authorization' => 'Bearer ' . $this->getApiToken(),
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'X-Ploi-Core-Key' => $this->getCoreApiToken()
-            ],
+        $this->client = Http::baseUrl($this->url)->withHeaders([
+            'Authorization' => 'Bearer ' . $this->getApiToken(),
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/json',
+            'X-Ploi-Core-Key' => $this->getCoreApiToken(),
         ]);
 
         return $this;
@@ -86,10 +85,18 @@ class Ploi
 
     public function makeAPICall(string $url, string $method = 'get', array $options = []): Response
     {
-        if (!in_array($method, ['get', 'post', 'patch', 'delete'])) {
+        if (! in_array($method, ['get', 'post', 'patch', 'delete'])) {
             throw new Exception('Invalid method type');
         }
 
+        /**
+         * This is a temporary method that was necessary for the switch from the Guzzle client to the Http facade.
+         * We _should not_ need this, but it feels safer to keep this fallback code around for now.
+         */
+        if (count($options) === 1 && array_key_exists('body', $options)) {
+            $options = is_string($options['body']) ? json_decode($options['body']) : $options['body'];
+        }
+
         /**
          * Because we're calling the method dynamically PHPStorm doesn't
          * know that we're getting a response back, so we manually
@@ -97,7 +104,7 @@ class Ploi
          *
          * @var ResponseInterface $response
          */
-        $response = $this->guzzle->{$method}($url, $options);
+        $response = $this->client->{$method}($url, $options);
 
         switch ($response->getStatusCode()) {
             case 401:

app/Services/Ploi/Resources/Alias.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\Ploi\Resources;
+
+class Alias extends Resource
+{
+    public function __construct(Server $server, Site $site)
+    {
+        parent::__construct($server->getPloi());
+
+        $this->setServer($server);
+        $this->setSite($site);
+
+        $this->buildEndpoint();
+    }
+
+    public function buildEndpoint(): self
+    {
+        $this->setEndpoint($this->getSite()->getEndpoint() . '/aliases');
+
+        return $this;
+    }
+
+    public function get()
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint());
+    }
+
+    public function create(array $aliases)
+    {
+        $options = [
+            'aliases' => $aliases,
+        ];
+
+        return $this->getPloi()->makeAPICall($this->getEndpoint(), 'post', $options);
+    }
+
+    public function delete(string $alias)
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/' . $alias, 'delete');
+    }
+}