Merge branch 'next' into separate-success-and-failure-notifications

app/Http/Controllers/Api/ApplicationsController.php

@@ -25,13 +25,10 @@ class ApplicationsController extends Controller
 {
     private function removeSensitiveData($application)
     {
-        $token = auth()->user()->currentAccessToken();
         $application->makeHidden([
             'id',
         ]);
-        if ($token->can('view:sensitive')) {
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-            return serializeApiResponse($application);
-        }
             $application->makeHidden([
                 'custom_labels',
                 'dockerfile',
@@ -45,6 +42,7 @@ class ApplicationsController extends Controller
                 'value',
                 'real_value',
             ]);
+        }
 
         return serializeApiResponse($application);
     }

app/Http/Controllers/Api/DatabasesController.php

@@ -19,15 +19,11 @@ class DatabasesController extends Controller
 {
     private function removeSensitiveData($database)
     {
-        $token = auth()->user()->currentAccessToken();
         $database->makeHidden([
             'id',
             'laravel_through_key',
         ]);
-        if ($token->can('view:sensitive')) {
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-            return serializeApiResponse($database);
-        }
-
             $database->makeHidden([
                 'internal_db_url',
                 'external_db_url',
@@ -38,6 +34,7 @@ class DatabasesController extends Controller
                 'keydb_password',
                 'clickhouse_admin_password',
             ]);
+        }
 
         return serializeApiResponse($database);
     }

app/Http/Controllers/Api/DeployController.php

@@ -16,14 +16,11 @@ class DeployController extends Controller
 {
     private function removeSensitiveData($deployment)
     {
-        $token = auth()->user()->currentAccessToken();
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-        if ($token->can('view:sensitive')) {
-            return serializeApiResponse($deployment);
-        }
-
             $deployment->makeHidden([
                 'logs',
             ]);
+        }
 
         return serializeApiResponse($deployment);
     }

app/Http/Controllers/Api/SecurityController.php

@@ -11,13 +11,11 @@ class SecurityController extends Controller
 {
     private function removeSensitiveData($team)
     {
-        $token = auth()->user()->currentAccessToken();
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-        if ($token->can('view:sensitive')) {
-            return serializeApiResponse($team);
-        }
             $team->makeHidden([
                 'private_key',
             ]);
+        }
 
         return serializeApiResponse($team);
     }

app/Http/Controllers/Api/ServersController.php

@@ -19,25 +19,22 @@ class ServersController extends Controller
 {
     private function removeSensitiveDataFromSettings($settings)
     {
-        $token = auth()->user()->currentAccessToken();
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-        if ($token->can('view:sensitive')) {
-            return serializeApiResponse($settings);
-        }
             $settings = $settings->makeHidden([
                 'sentinel_token',
             ]);
+        }
 
         return serializeApiResponse($settings);
     }
 
     private function removeSensitiveData($server)
     {
-        $token = auth()->user()->currentAccessToken();
         $server->makeHidden([
             'id',
         ]);
-        if ($token->can('view:sensitive')) {
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-            return serializeApiResponse($server);
+            // Do nothing
         }
 
         return serializeApiResponse($server);

app/Http/Controllers/Api/ServicesController.php

@@ -18,18 +18,15 @@ class ServicesController extends Controller
 {
     private function removeSensitiveData($service)
     {
-        $token = auth()->user()->currentAccessToken();
         $service->makeHidden([
             'id',
         ]);
-        if ($token->can('view:sensitive')) {
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-            return serializeApiResponse($service);
-        }
-
             $service->makeHidden([
                 'docker_compose_raw',
                 'docker_compose',
             ]);
+        }
 
         return serializeApiResponse($service);
     }

app/Http/Controllers/Api/TeamController.php

@@ -10,20 +10,18 @@ class TeamController extends Controller
 {
     private function removeSensitiveData($team)
     {
-        $token = auth()->user()->currentAccessToken();
         $team->makeHidden([
             'custom_server_limit',
             'pivot',
         ]);
-        if ($token->can('view:sensitive')) {
+        if (request()->attributes->get('can_read_sensitive', false) === false) {
-            return serializeApiResponse($team);
-        }
             $team->makeHidden([
                 'smtp_username',
                 'smtp_password',
                 'resend_api_key',
                 'telegram_token',
             ]);
+        }
 
         return serializeApiResponse($team);
     }

app/Http/Kernel.php

@@ -69,5 +69,7 @@ class Kernel extends HttpKernel
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
         'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
+        'api.ability' => \App\Http\Middleware\ApiAbility::class,
+        'api.sensitive' => \App\Http\Middleware\ApiSensitiveData::class,
     ];
 }

app/Http/Middleware/ApiAbility.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Laravel\Sanctum\Http\Middleware\CheckForAnyAbility;
+
+class ApiAbility extends CheckForAnyAbility
+{
+    public function handle($request, $next, ...$abilities)
+    {
+        try {
+            if ($request->user()->tokenCan('root')) {
+                return $next($request);
+            }
+
+            return parent::handle($request, $next, ...$abilities);
+        } catch (\Illuminate\Auth\AuthenticationException $e) {
+            return response()->json([
+                'message' => 'Unauthenticated.',
+            ], 401);
+        } catch (\Exception $e) {
+            return response()->json([
+                'message' => 'Missing required permissions: '.implode(', ', $abilities),
+            ], 403);
+        }
+    }
+}

app/Http/Middleware/ApiSensitiveData.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class ApiSensitiveData
+{
+    public function handle(Request $request, Closure $next)
+    {
+        $token = $request->user()->currentAccessToken();
+
+        // Allow access to sensitive data if token has root or read:sensitive permission
+        $request->attributes->add([
+            'can_read_sensitive' => $token->can('root') || $token->can('read:sensitive'),
+        ]);
+
+        return $next($request);
+    }
+}

app/Http/Middleware/IgnoreReadOnlyApiToken.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class IgnoreReadOnlyApiToken
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        $token = auth()->user()->currentAccessToken();
-        if ($token->can('*')) {
-            return $next($request);
-        }
-        if ($token->can('read-only')) {
-            return response()->json(['message' => 'You are not allowed to perform this action.'], 403);
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/OnlyRootApiToken.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class OnlyRootApiToken
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        $token = auth()->user()->currentAccessToken();
-        if ($token->can('*')) {
-            return $next($request);
-        }
-
-        return response()->json(['message' => 'You are not allowed to perform this action.'], 403);
-    }
-}

app/Livewire/Project/Shared/ScheduledTask/Executions.php

@@ -24,6 +24,14 @@ class Executions extends Component
     #[Locked]
     public ?string $serverTimezone = null;
 
+    public $currentPage = 1;
+
+    public $logsPerPage = 100;
+
+    public $selectedExecution = null;
+
+    public $isPollingActive = false;
+
     public function getListeners()
     {
         $teamId = Auth::user()->currentTeam()->id;
@@ -54,16 +62,84 @@ class Executions extends Component
     public function refreshExecutions(): void
     {
         $this->executions = $this->task->executions()->take(20)->get();
+        if ($this->selectedKey) {
+            $this->selectedExecution = $this->task->executions()->find($this->selectedKey);
+            if ($this->selectedExecution && $this->selectedExecution->status !== 'running') {
+                $this->isPollingActive = false;
+            }
+        }
     }
 
     public function selectTask($key): void
     {
         if ($key == $this->selectedKey) {
             $this->selectedKey = null;
+            $this->selectedExecution = null;
+            $this->currentPage = 1;
+            $this->isPollingActive = false;
 
             return;
         }
         $this->selectedKey = $key;
+        $this->selectedExecution = $this->task->executions()->find($key);
+        $this->currentPage = 1;
+
+        // Start polling if task is running
+        if ($this->selectedExecution && $this->selectedExecution->status === 'running') {
+            $this->isPollingActive = true;
+        }
+    }
+
+    public function polling()
+    {
+        if ($this->selectedExecution && $this->isPollingActive) {
+            $this->selectedExecution->refresh();
+            if ($this->selectedExecution->status !== 'running') {
+                $this->isPollingActive = false;
+            }
+        }
+    }
+
+    public function loadMoreLogs()
+    {
+        $this->currentPage++;
+    }
+
+    public function getLogLinesProperty()
+    {
+        if (! $this->selectedExecution) {
+            return collect();
+        }
+
+        if (! $this->selectedExecution->message) {
+            return collect(['Waiting for task output...']);
+        }
+
+        $lines = collect(explode("\n", $this->selectedExecution->message));
+
+        return $lines->take($this->currentPage * $this->logsPerPage);
+    }
+
+    public function downloadLogs(int $executionId)
+    {
+        $execution = $this->executions->firstWhere('id', $executionId);
+        if (! $execution) {
+            return;
+        }
+
+        return response()->streamDownload(function () use ($execution) {
+            echo $execution->message;
+        }, 'task-execution-'.$execution->id.'.log');
+    }
+
+    public function hasMoreLogs()
+    {
+        if (! $this->selectedExecution || ! $this->selectedExecution->message) {
+            return false;
+        }
+        $lines = collect(explode("\n", $this->selectedExecution->message));
+
+        return $lines->count() > ($this->currentPage * $this->logsPerPage);
     }
 
     public function formatDateInServerTimezone($date)

app/Livewire/Security/ApiTokens.php

@@ -11,13 +11,7 @@ class ApiTokens extends Component
 
     public $tokens = [];
 
-    public bool $viewSensitiveData = false;
+    public array $permissions = ['read'];
-
-    public bool $readOnly = true;
-
-    public bool $rootAccess = false;
-
-    public array $permissions = ['read-only'];
 
     public $isApiEnabled;
 
@@ -29,52 +23,29 @@ class ApiTokens extends Component
     public function mount()
     {
         $this->isApiEnabled = InstanceSettings::get()->is_api_enabled;
+        $this->getTokens();
+    }
+
+    private function getTokens()
+    {
         $this->tokens = auth()->user()->tokens->sortByDesc('created_at');
     }
 
-    public function updatedViewSensitiveData()
+    public function updatedPermissions($permissionToUpdate)
     {
-        if ($this->viewSensitiveData) {
+        if ($permissionToUpdate == 'root') {
-            $this->permissions[] = 'view:sensitive';
+            $this->permissions = ['root'];
-            $this->permissions = array_diff($this->permissions, ['*']);
+        } elseif ($permissionToUpdate == 'read:sensitive' && ! in_array('read', $this->permissions)) {
-            $this->rootAccess = false;
+            $this->permissions[] = 'read';
+        } elseif ($permissionToUpdate == 'deploy') {
+            $this->permissions = ['deploy'];
         } else {
-            $this->permissions = array_diff($this->permissions, ['view:sensitive']);
-        }
-        $this->makeSureOneIsSelected();
-    }
-
-    public function updatedReadOnly()
-    {
-        if ($this->readOnly) {
-            $this->permissions[] = 'read-only';
-            $this->permissions = array_diff($this->permissions, ['*']);
-            $this->rootAccess = false;
-        } else {
-            $this->permissions = array_diff($this->permissions, ['read-only']);
-        }
-        $this->makeSureOneIsSelected();
-    }
-
-    public function updatedRootAccess()
-    {
-        if ($this->rootAccess) {
-            $this->permissions = ['*'];
-            $this->readOnly = false;
-            $this->viewSensitiveData = false;
-        } else {
-            $this->readOnly = true;
-            $this->permissions = ['read-only'];
-        }
-    }
-
-    public function makeSureOneIsSelected()
-    {
             if (count($this->permissions) == 0) {
-            $this->permissions = ['read-only'];
+                $this->permissions = ['read'];
-            $this->readOnly = true;
             }
         }
+        sort($this->permissions);
+    }
 
     public function addNewToken()
     {
@@ -82,8 +53,8 @@ class ApiTokens extends Component
             $this->validate([
                 'description' => 'required|min:3|max:255',
             ]);
-            $token = auth()->user()->createToken($this->description, $this->permissions);
+            $token = auth()->user()->createToken($this->description, array_values($this->permissions));
-            $this->tokens = auth()->user()->tokens;
+            $this->getTokens();
             session()->flash('token', $token->plainTextToken);
         } catch (\Exception $e) {
             return handleError($e, $this);
@@ -92,8 +63,12 @@ class ApiTokens extends Component
 
     public function revoke(int $id)
     {
-        $token = auth()->user()->tokens()->where('id', $id)->first();
+        try {
+            $token = auth()->user()->tokens()->where('id', $id)->firstOrFail();
             $token->delete();
-        $this->tokens = auth()->user()->tokens;
+            $this->getTokens();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
     }
 }

app/Notifications/Dto/SlackMessage.php

@@ -8,8 +8,7 @@ class SlackMessage
         public string $title,
         public string $description,
         public string $color = '#0099ff'
-    ) {
+    ) {}
-    }
 
     public static function infoColor(): string
     {

app/View/Components/Forms/Checkbox.php

@@ -15,6 +15,7 @@ class Checkbox extends Component
         public ?string $id = null,
         public ?string $name = null,
         public ?string $value = null,
+        public ?string $domValue = null,
         public ?string $label = null,
         public ?string $helper = null,
         public string|bool|null $checked = false,

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.376',
+        'version' => '4.0.0-beta.377',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

database/migrations/2024_10_30_074601_rename_token_permissions.php

@@ -0,0 +1,60 @@
+<?php
+
+use App\Models\PersonalAccessToken;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        try {
+            $tokens = PersonalAccessToken::all();
+            foreach ($tokens as $token) {
+                $abilities = collect();
+                if (in_array('*', $token->abilities)) {
+                    $abilities->push('root');
+                }
+                if (in_array('read-only', $token->abilities)) {
+                    $abilities->push('read');
+                }
+                if (in_array('view:sensitive', $token->abilities)) {
+                    $abilities->push('read', 'read:sensitive');
+                }
+                $token->abilities = $abilities->unique()->values()->all();
+                $token->save();
+            }
+        } catch (\Exception $e) {
+            \Log::error('Error renaming token permissions: '.$e->getMessage());
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        try {
+            $tokens = PersonalAccessToken::all();
+            foreach ($tokens as $token) {
+                $abilities = collect();
+                if (in_array('write', $token->abilities)) {
+                    $abilities->push('*');
+                } else {
+                    if (in_array('read', $token->abilities)) {
+                        $abilities->push('read-only');
+                    }
+                    if (in_array('read:sensitive', $token->abilities)) {
+                        $abilities->push('view:sensitive');
+                    }
+                }
+                $token->abilities = $abilities->unique()->values()->all();
+                $token->save();
+            }
+        } catch (\Exception $e) {
+            \Log::error('Error renaming token permissions: '.$e->getMessage());
+        }
+    }
+};

resources/views/components/forms/checkbox.blade.php

@@ -5,8 +5,8 @@
     'disabled' => false,
     'instantSave' => false,
     'value' => null,
+    'domValue' => null,
     'checked' => false,
-    'hideLabel' => false,
     'fullWidth' => false,
 ])
 
@@ -14,7 +14,6 @@
     'flex flex-row items-center gap-4 pr-2 py-1 form-control min-w-fit dark:hover:bg-coolgray-100',
     'w-full' => $fullWidth,
 ])>
-    @if (!$hideLabel)
     <label @class([
         'flex gap-4 items-center px-0 min-w-fit label w-full cursor-pointer',
     ])>
@@ -28,12 +27,19 @@
                 <x-helper :helper="$helper" />
             @endif
         </span>
+        @if ($instantSave)
+            <input type="checkbox" @disabled($disabled) {{ $attributes->merge(['class' => $defaultClass]) }}
+                wire:loading.attr="disabled"
+                wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
+                wire:model={{ $id }} @if ($checked) checked @endif />
+        @else
+            @if ($domValue)
+                <input type="checkbox" @disabled($disabled) {{ $attributes->merge(['class' => $defaultClass]) }}
+                    value={{ $domValue }} @if ($checked) checked @endif />
+            @else
+                <input type="checkbox" @disabled($disabled) {{ $attributes->merge(['class' => $defaultClass]) }}
+                    wire:model={{ $value ?? $id }} @if ($checked) checked @endif />
+            @endif
         @endif
-    <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
-        @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
-        @if ($checked) checked @endif
-    wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
-    @if (!$hideLabel)
     </label>
-    @endif
 </div>

resources/views/livewire/project/new/select.blade.php

@@ -12,7 +12,7 @@
     <div class="pb-4">Deploy resources, like Applications, Databases, Services...</div>
     <div x-data="searchResources()">
         @if ($current_step === 'type')
-            <div x-data="{ isSticky: false }" x-init="window.addEventListener('scroll', () => isSticky = window.pageYOffset > 100)" class="sticky top-0 z-50 py-2">
+            <div x-init="window.addEventListener('scroll', () => isSticky = window.pageYOffset > 100)" class="sticky top-0 z-50 py-2">
                 <input autocomplete="off" x-ref="searchInput" class="input-sticky"
                     :class="{ 'input-sticky-active': isSticky }" x-model="search" placeholder="Type / to search..."
                     @keydown.window.slash.prevent="$refs.searchInput.focus()">
@@ -137,6 +137,7 @@
                     return {
                         search: '',
                         loading: false,
+                        isSticky: false,
                         services: [],
                         gitBasedApplications: [],
                         dockerBasedApplications: [],

resources/views/livewire/project/shared/scheduled-task/executions.blade.php

@@ -1,4 +1,17 @@
-<div class="flex flex-col gap-4">
+<div class="flex flex-col gap-2" x-data="{
+    init() {
+        let interval;
+        $wire.$watch('isPollingActive', value => {
+            if (value) {
+                interval = setInterval(() => {
+                    $wire.polling();
+                }, 1000);
+            } else {
+                if (interval) clearInterval(interval);
+            }
+        });
+    }
+}">
     @forelse($executions as $execution)
         <a wire:click="selectTask({{ data_get($execution, 'id') }})" @class([
             'flex flex-col border-l-2 transition-colors p-4 cursor-pointer',
@@ -10,6 +23,7 @@
             'border-red-500' => data_get($execution, 'status') === 'failed',
             'border-yellow-500' => data_get($execution, 'status') === 'running',
         ])>
+
             @if (data_get($execution, 'status') === 'running')
                 <div class="absolute top-2 right-2">
                     <x-loading />
@@ -21,11 +35,34 @@
                 Started At: {{ $this->formatDateInServerTimezone(data_get($execution, 'created_at', now())) }}
             </div>
         </a>
+        @if (strlen($execution->message) > 0)
+            <x-forms.button wire:click.prevent="downloadLogs({{ data_get($execution, 'id') }})">
+                Download Logs
+            </x-forms.button>
+        @endif
         @if (data_get($execution, 'id') == $selectedKey)
             <div class="p-4 mb-2 bg-gray-100 dark:bg-coolgray-200 rounded">
-                @if (data_get($execution, 'message'))
+                @if (data_get($execution, 'status') === 'running')
+                    <div class="flex items-center gap-2 mb-2">
+                        <span>Task is running...</span>
+                        <x-loading class="w-4 h-4" />
+                    </div>
+                @endif
+                @if ($this->logLines->isNotEmpty())
                     <div>
-                        <pre class="whitespace-pre-wrap">{{ data_get($execution, 'message') }}</pre>
+                        <pre class="whitespace-pre-wrap">
+@foreach ($this->logLines as $line)
+{{ $line }}
+@endforeach
+</pre>
+                        <div class="flex gap-2">
+                            @if ($this->hasMoreLogs())
+                                <x-forms.button wire:click.prevent="loadMoreLogs" isHighlighted>
+                                    Load More
+                                </x-forms.button>
+                            @endif
+
+                        </div>
                     </div>
                 @else
                     <div>No output was recorded for this execution.</div>

resources/views/livewire/security/api-tokens.blade.php

@@ -25,21 +25,31 @@
             <div class="flex gap-1 font-bold dark:text-white">
                 @if ($permissions)
                     @foreach ($permissions as $permission)
-                        @if ($permission === '*')
-                            <div>Root access, be careful!</div>
-                        @else
                         <div>{{ $permission }}</div>
-                        @endif
                     @endforeach
                 @endif
             </div>
         </div>
+
         <h4>Token Permissions</h4>
         <div class="w-64">
-            <x-forms.checkbox label="Root Access" wire:model.live="rootAccess"></x-forms.checkbox>
+            <x-forms.checkbox label="root" wire:model.live="permissions" domValue="root"
-            <x-forms.checkbox label="Read-only" wire:model.live="readOnly"></x-forms.checkbox>
+                helper="Root access, be careful!" :checked="in_array('root', $permissions)"></x-forms.checkbox>
-            <x-forms.checkbox label="View Sensitive Data" wire:model.live="viewSensitiveData"></x-forms.checkbox>
+            @if (!in_array('root', $permissions))
+                <x-forms.checkbox label="write" wire:model.live="permissions" domValue="write"
+                    helper="Write access to all resources" :checked="in_array('write', $permissions)"></x-forms.checkbox>
+                <x-forms.checkbox label="deploy" wire:model.live="permissions" domValue="deploy"
+                    helper="Can trigger deploy webhooks" :checked="in_array('deploy', $permissions)"></x-forms.checkbox>
+                <x-forms.checkbox label="read" domValue="read" wire:model.live="permissions" domValue="read"
+                    :checked="in_array('read', $permissions)"></x-forms.checkbox>
+                <x-forms.checkbox label="read:sensitive" wire:model.live="permissions" domValue="read:sensitive"
+                    helper="Responses will include secrets, logs, passwords, and compose file contents"
+                    :checked="in_array('read:sensitive', $permissions)"></x-forms.checkbox>
+            @endif
         </div>
+        @if (in_array('root', $permissions))
+            <div class="font-bold text-warning">Root access, be careful!</div>
+        @endif
     </form>
     @if (session()->has('token'))
         <div class="py-4 font-bold dark:text-warning">Please copy this token now. For your security, it won't be shown
@@ -50,12 +60,13 @@
     <h3 class="py-4">Issued Tokens</h3>
     <div class="grid gap-2 lg:grid-cols-1">
         @forelse ($tokens as $token)
-            <div class="flex flex-col gap-1 p-2 border dark:border-coolgray-200 hover:no-underline">
+            <div wire:key="token-{{ $token->id }}"
+                class="flex flex-col gap-1 p-2 border dark:border-coolgray-200 hover:no-underline">
                 <div>Description: {{ $token->name }}</div>
                 <div>Last used: {{ $token->last_used_at ? $token->last_used_at->diffForHumans() : 'Never' }}</div>
                 <div class="flex gap-1">
                     @if ($token->abilities)
-                        Abilities:
+                        Permissions:
                         @foreach ($token->abilities as $ability)
                             <div class="font-bold dark:text-white">{{ $ability }}</div>
                         @endforeach

resources/views/livewire/team/admin-view.blade.php

@@ -10,7 +10,8 @@
     <h3 class="pt-4">Users</h3>
     <div class="flex flex-col gap-2 ">
         @forelse ($users as $user)
-            <div class="flex items-center justify-center gap-2 bg-white box-without-bg dark:bg-coolgray-100">
+            <div wire:key="user-{{ $user->id }}"
+                class="flex items-center justify-center gap-2 bg-white box-without-bg dark:bg-coolgray-100">
                 <div>{{ $user->name }}</div>
                 <div>{{ $user->email }}</div>
                 <div class="flex-1"></div>

routes/api.php

@@ -11,8 +11,6 @@ use App\Http\Controllers\Api\ServersController;
 use App\Http\Controllers\Api\ServicesController;
 use App\Http\Controllers\Api\TeamController;
 use App\Http\Middleware\ApiAllowed;
-use App\Http\Middleware\IgnoreReadOnlyApiToken;
-use App\Http\Middleware\OnlyRootApiToken;
 use App\Jobs\PushServerUpdateJob;
 use App\Models\Server;
 use Illuminate\Support\Facades\Route;
@@ -21,113 +19,113 @@ Route::get('/health', [OtherController::class, 'healthcheck']);
 Route::post('/feedback', [OtherController::class, 'feedback']);
 
 Route::group([
-    'middleware' => ['auth:sanctum', OnlyRootApiToken::class],
+    'middleware' => ['auth:sanctum', 'api.ability:write'],
     'prefix' => 'v1',
 ], function () {
     Route::get('/enable', [OtherController::class, 'enable_api']);
     Route::get('/disable', [OtherController::class, 'disable_api']);
 });
 Route::group([
-    'middleware' => ['auth:sanctum', ApiAllowed::class],
+    'middleware' => ['auth:sanctum', ApiAllowed::class, 'api.sensitive'],
     'prefix' => 'v1',
 ], function () {
-    Route::get('/version', [OtherController::class, 'version']);
+    Route::get('/version', [OtherController::class, 'version'])->middleware(['api.ability:read']);
 
-    Route::get('/teams', [TeamController::class, 'teams']);
+    Route::get('/teams', [TeamController::class, 'teams'])->middleware(['api.ability:read']);
-    Route::get('/teams/current', [TeamController::class, 'current_team']);
+    Route::get('/teams/current', [TeamController::class, 'current_team'])->middleware(['api.ability:read']);
-    Route::get('/teams/current/members', [TeamController::class, 'current_team_members']);
+    Route::get('/teams/current/members', [TeamController::class, 'current_team_members'])->middleware(['api.ability:read']);
-    Route::get('/teams/{id}', [TeamController::class, 'team_by_id']);
+    Route::get('/teams/{id}', [TeamController::class, 'team_by_id'])->middleware(['api.ability:read']);
-    Route::get('/teams/{id}/members', [TeamController::class, 'members_by_id']);
+    Route::get('/teams/{id}/members', [TeamController::class, 'members_by_id'])->middleware(['api.ability:read']);
 
-    Route::get('/projects', [ProjectController::class, 'projects']);
+    Route::get('/projects', [ProjectController::class, 'projects'])->middleware(['api.ability:read']);
-    Route::get('/projects/{uuid}', [ProjectController::class, 'project_by_uuid']);
+    Route::get('/projects/{uuid}', [ProjectController::class, 'project_by_uuid'])->middleware(['api.ability:read']);
-    Route::get('/projects/{uuid}/{environment_name}', [ProjectController::class, 'environment_details']);
+    Route::get('/projects/{uuid}/{environment_name}', [ProjectController::class, 'environment_details'])->middleware(['api.ability:read']);
 
-    Route::post('/projects', [ProjectController::class, 'create_project']);
+    Route::post('/projects', [ProjectController::class, 'create_project'])->middleware(['api.ability:read']);
-    Route::patch('/projects/{uuid}', [ProjectController::class, 'update_project']);
+    Route::patch('/projects/{uuid}', [ProjectController::class, 'update_project'])->middleware(['api.ability:write']);
-    Route::delete('/projects/{uuid}', [ProjectController::class, 'delete_project']);
+    Route::delete('/projects/{uuid}', [ProjectController::class, 'delete_project'])->middleware(['api.ability:write']);
 
-    Route::get('/security/keys', [SecurityController::class, 'keys']);
+    Route::get('/security/keys', [SecurityController::class, 'keys'])->middleware(['api.ability:read']);
-    Route::post('/security/keys', [SecurityController::class, 'create_key'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/security/keys', [SecurityController::class, 'create_key'])->middleware(['api.ability:write']);
 
-    Route::get('/security/keys/{uuid}', [SecurityController::class, 'key_by_uuid']);
+    Route::get('/security/keys/{uuid}', [SecurityController::class, 'key_by_uuid'])->middleware(['api.ability:read']);
-    Route::patch('/security/keys/{uuid}', [SecurityController::class, 'update_key'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/security/keys/{uuid}', [SecurityController::class, 'update_key'])->middleware(['api.ability:write']);
-    Route::delete('/security/keys/{uuid}', [SecurityController::class, 'delete_key'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/security/keys/{uuid}', [SecurityController::class, 'delete_key'])->middleware(['api.ability:write']);
 
-    Route::match(['get', 'post'], '/deploy', [DeployController::class, 'deploy'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/deploy', [DeployController::class, 'deploy'])->middleware(['api.ability:write,deploy']);
-    Route::get('/deployments', [DeployController::class, 'deployments']);
+    Route::get('/deployments', [DeployController::class, 'deployments'])->middleware(['api.ability:read']);
-    Route::get('/deployments/{uuid}', [DeployController::class, 'deployment_by_uuid']);
+    Route::get('/deployments/{uuid}', [DeployController::class, 'deployment_by_uuid'])->middleware(['api.ability:read']);
 
-    Route::get('/servers', [ServersController::class, 'servers']);
+    Route::get('/servers', [ServersController::class, 'servers'])->middleware(['api.ability:read']);
-    Route::get('/servers/{uuid}', [ServersController::class, 'server_by_uuid']);
+    Route::get('/servers/{uuid}', [ServersController::class, 'server_by_uuid'])->middleware(['api.ability:read']);
-    Route::get('/servers/{uuid}/domains', [ServersController::class, 'domains_by_server']);
+    Route::get('/servers/{uuid}/domains', [ServersController::class, 'domains_by_server'])->middleware(['api.ability:read']);
-    Route::get('/servers/{uuid}/resources', [ServersController::class, 'resources_by_server']);
+    Route::get('/servers/{uuid}/resources', [ServersController::class, 'resources_by_server'])->middleware(['api.ability:read']);
 
-    Route::get('/servers/{uuid}/validate', [ServersController::class, 'validate_server']);
+    Route::get('/servers/{uuid}/validate', [ServersController::class, 'validate_server'])->middleware(['api.ability:read']);
 
-    Route::post('/servers', [ServersController::class, 'create_server']);
+    Route::post('/servers', [ServersController::class, 'create_server'])->middleware(['api.ability:read']);
-    Route::patch('/servers/{uuid}', [ServersController::class, 'update_server']);
+    Route::patch('/servers/{uuid}', [ServersController::class, 'update_server'])->middleware(['api.ability:write']);
-    Route::delete('/servers/{uuid}', [ServersController::class, 'delete_server']);
+    Route::delete('/servers/{uuid}', [ServersController::class, 'delete_server'])->middleware(['api.ability:write']);
 
-    Route::get('/resources', [ResourcesController::class, 'resources']);
+    Route::get('/resources', [ResourcesController::class, 'resources'])->middleware(['api.ability:read']);
 
-    Route::get('/applications', [ApplicationsController::class, 'applications']);
+    Route::get('/applications', [ApplicationsController::class, 'applications'])->middleware(['api.ability:read']);
-    Route::post('/applications/public', [ApplicationsController::class, 'create_public_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/public', [ApplicationsController::class, 'create_public_application'])->middleware(['api.ability:write']);
-    Route::post('/applications/private-github-app', [ApplicationsController::class, 'create_private_gh_app_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/private-github-app', [ApplicationsController::class, 'create_private_gh_app_application'])->middleware(['api.ability:write']);
-    Route::post('/applications/private-deploy-key', [ApplicationsController::class, 'create_private_deploy_key_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/private-deploy-key', [ApplicationsController::class, 'create_private_deploy_key_application'])->middleware(['api.ability:write']);
-    Route::post('/applications/dockerfile', [ApplicationsController::class, 'create_dockerfile_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/dockerfile', [ApplicationsController::class, 'create_dockerfile_application'])->middleware(['api.ability:write']);
-    Route::post('/applications/dockerimage', [ApplicationsController::class, 'create_dockerimage_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/dockerimage', [ApplicationsController::class, 'create_dockerimage_application'])->middleware(['api.ability:write']);
-    Route::post('/applications/dockercompose', [ApplicationsController::class, 'create_dockercompose_application'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/dockercompose', [ApplicationsController::class, 'create_dockercompose_application'])->middleware(['api.ability:write']);
 
-    Route::get('/applications/{uuid}', [ApplicationsController::class, 'application_by_uuid']);
+    Route::get('/applications/{uuid}', [ApplicationsController::class, 'application_by_uuid'])->middleware(['api.ability:read']);
-    Route::patch('/applications/{uuid}', [ApplicationsController::class, 'update_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/applications/{uuid}', [ApplicationsController::class, 'update_by_uuid'])->middleware(['api.ability:write']);
-    Route::delete('/applications/{uuid}', [ApplicationsController::class, 'delete_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/applications/{uuid}', [ApplicationsController::class, 'delete_by_uuid'])->middleware(['api.ability:write']);
 
-    Route::get('/applications/{uuid}/envs', [ApplicationsController::class, 'envs']);
+    Route::get('/applications/{uuid}/envs', [ApplicationsController::class, 'envs'])->middleware(['api.ability:read']);
-    Route::post('/applications/{uuid}/envs', [ApplicationsController::class, 'create_env'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/applications/{uuid}/envs', [ApplicationsController::class, 'create_env'])->middleware(['api.ability:write']);
-    Route::patch('/applications/{uuid}/envs/bulk', [ApplicationsController::class, 'create_bulk_envs'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/applications/{uuid}/envs/bulk', [ApplicationsController::class, 'create_bulk_envs'])->middleware(['api.ability:write']);
-    Route::patch('/applications/{uuid}/envs', [ApplicationsController::class, 'update_env_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/applications/{uuid}/envs', [ApplicationsController::class, 'update_env_by_uuid'])->middleware(['api.ability:write']);
-    Route::delete('/applications/{uuid}/envs/{env_uuid}', [ApplicationsController::class, 'delete_env_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/applications/{uuid}/envs/{env_uuid}', [ApplicationsController::class, 'delete_env_by_uuid'])->middleware(['api.ability:write']);
-    // Route::post('/applications/{uuid}/execute', [ApplicationsController::class, 'execute_command_by_uuid'])->middleware([OnlyRootApiToken::class]);
+    // Route::post('/applications/{uuid}/execute', [ApplicationsController::class, 'execute_command_by_uuid'])->middleware(['ability:write']);
 
-    Route::match(['get', 'post'], '/applications/{uuid}/start', [ApplicationsController::class, 'action_deploy'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/applications/{uuid}/start', [ApplicationsController::class, 'action_deploy'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/applications/{uuid}/restart', [ApplicationsController::class, 'action_restart'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/applications/{uuid}/restart', [ApplicationsController::class, 'action_restart'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/applications/{uuid}/stop', [ApplicationsController::class, 'action_stop'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/applications/{uuid}/stop', [ApplicationsController::class, 'action_stop'])->middleware(['api.ability:write']);
 
-    Route::get('/databases', [DatabasesController::class, 'databases']);
+    Route::get('/databases', [DatabasesController::class, 'databases'])->middleware(['api.ability:read']);
-    Route::post('/databases/postgresql', [DatabasesController::class, 'create_database_postgresql'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/postgresql', [DatabasesController::class, 'create_database_postgresql'])->middleware(['api.ability:write']);
-    Route::post('/databases/mysql', [DatabasesController::class, 'create_database_mysql'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/mysql', [DatabasesController::class, 'create_database_mysql'])->middleware(['api.ability:write']);
-    Route::post('/databases/mariadb', [DatabasesController::class, 'create_database_mariadb'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/mariadb', [DatabasesController::class, 'create_database_mariadb'])->middleware(['api.ability:write']);
-    Route::post('/databases/mongodb', [DatabasesController::class, 'create_database_mongodb'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/mongodb', [DatabasesController::class, 'create_database_mongodb'])->middleware(['api.ability:write']);
-    Route::post('/databases/redis', [DatabasesController::class, 'create_database_redis'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/redis', [DatabasesController::class, 'create_database_redis'])->middleware(['api.ability:write']);
-    Route::post('/databases/clickhouse', [DatabasesController::class, 'create_database_clickhouse'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/clickhouse', [DatabasesController::class, 'create_database_clickhouse'])->middleware(['api.ability:write']);
-    Route::post('/databases/dragonfly', [DatabasesController::class, 'create_database_dragonfly'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/dragonfly', [DatabasesController::class, 'create_database_dragonfly'])->middleware(['api.ability:write']);
-    Route::post('/databases/keydb', [DatabasesController::class, 'create_database_keydb'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/databases/keydb', [DatabasesController::class, 'create_database_keydb'])->middleware(['api.ability:write']);
 
-    Route::get('/databases/{uuid}', [DatabasesController::class, 'database_by_uuid']);
+    Route::get('/databases/{uuid}', [DatabasesController::class, 'database_by_uuid'])->middleware(['api.ability:read']);
-    Route::patch('/databases/{uuid}', [DatabasesController::class, 'update_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/databases/{uuid}', [DatabasesController::class, 'update_by_uuid'])->middleware(['api.ability:write']);
-    Route::delete('/databases/{uuid}', [DatabasesController::class, 'delete_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/databases/{uuid}', [DatabasesController::class, 'delete_by_uuid'])->middleware(['api.ability:write']);
 
-    Route::match(['get', 'post'], '/databases/{uuid}/start', [DatabasesController::class, 'action_deploy'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/databases/{uuid}/start', [DatabasesController::class, 'action_deploy'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/databases/{uuid}/restart', [DatabasesController::class, 'action_restart'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/databases/{uuid}/restart', [DatabasesController::class, 'action_restart'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/databases/{uuid}/stop', [DatabasesController::class, 'action_stop'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/databases/{uuid}/stop', [DatabasesController::class, 'action_stop'])->middleware(['api.ability:write']);
 
-    Route::get('/services', [ServicesController::class, 'services']);
+    Route::get('/services', [ServicesController::class, 'services'])->middleware(['api.ability:read']);
-    Route::post('/services', [ServicesController::class, 'create_service'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/services', [ServicesController::class, 'create_service'])->middleware(['api.ability:write']);
 
-    Route::get('/services/{uuid}', [ServicesController::class, 'service_by_uuid']);
+    Route::get('/services/{uuid}', [ServicesController::class, 'service_by_uuid'])->middleware(['api.ability:read']);
-    // Route::patch('/services/{uuid}', [ServicesController::class, 'update_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    // Route::patch('/services/{uuid}', [ServicesController::class, 'update_by_uuid'])->middleware(['ability:write']);
-    Route::delete('/services/{uuid}', [ServicesController::class, 'delete_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/services/{uuid}', [ServicesController::class, 'delete_by_uuid'])->middleware(['api.ability:write']);
 
-    Route::get('/services/{uuid}/envs', [ServicesController::class, 'envs']);
+    Route::get('/services/{uuid}/envs', [ServicesController::class, 'envs'])->middleware(['api.ability:read']);
-    Route::post('/services/{uuid}/envs', [ServicesController::class, 'create_env'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::post('/services/{uuid}/envs', [ServicesController::class, 'create_env'])->middleware(['api.ability:write']);
-    Route::patch('/services/{uuid}/envs/bulk', [ServicesController::class, 'create_bulk_envs'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/services/{uuid}/envs/bulk', [ServicesController::class, 'create_bulk_envs'])->middleware(['api.ability:write']);
-    Route::patch('/services/{uuid}/envs', [ServicesController::class, 'update_env_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::patch('/services/{uuid}/envs', [ServicesController::class, 'update_env_by_uuid'])->middleware(['api.ability:write']);
-    Route::delete('/services/{uuid}/envs/{env_uuid}', [ServicesController::class, 'delete_env_by_uuid'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::delete('/services/{uuid}/envs/{env_uuid}', [ServicesController::class, 'delete_env_by_uuid'])->middleware(['api.ability:write']);
 
-    Route::match(['get', 'post'], '/services/{uuid}/start', [ServicesController::class, 'action_deploy'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/services/{uuid}/start', [ServicesController::class, 'action_deploy'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/services/{uuid}/restart', [ServicesController::class, 'action_restart'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/services/{uuid}/restart', [ServicesController::class, 'action_restart'])->middleware(['api.ability:write']);
-    Route::match(['get', 'post'], '/services/{uuid}/stop', [ServicesController::class, 'action_stop'])->middleware([IgnoreReadOnlyApiToken::class]);
+    Route::match(['get', 'post'], '/services/{uuid}/stop', [ServicesController::class, 'action_stop'])->middleware(['api.ability:write']);
 });
 
 Route::group([

routes/web.php

@@ -12,8 +12,8 @@ use App\Livewire\Destination\Show as DestinationShow;
 use App\Livewire\ForcePasswordReset;
 use App\Livewire\Notifications\Discord as NotificationDiscord;
 use App\Livewire\Notifications\Email as NotificationEmail;
-use App\Livewire\Notifications\Telegram as NotificationTelegram;
 use App\Livewire\Notifications\Slack as NotificationSlack;
+use App\Livewire\Notifications\Telegram as NotificationTelegram;
 use App\Livewire\Profile\Index as ProfileIndex;
 use App\Livewire\Project\Application\Configuration as ApplicationConfiguration;
 use App\Livewire\Project\Application\Deployment\Index as DeploymentIndex;

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.376"
+            "version": "4.0.0-beta.377"
         },
         "nightly": {
-            "version": "4.0.0-beta.377"
+            "version": "4.0.0-beta.378"
         },
         "helper": {
             "version": "1.0.4"