Merge pull request #5529 from coollabsio/next

v4.0.0-beta.405

app/Http/Controllers/Api/SecurityController.php

@@ -368,6 +368,20 @@ class SecurityController extends Controller
                 response: 404,
                 description: 'Private Key not found.',
             ),
+            new OA\Response(
+                response: 422,
+                description: 'Private Key is in use and cannot be deleted.',
+                content: [
+                    new OA\MediaType(
+                        mediaType: 'application/json',
+                        schema: new OA\Schema(
+                            type: 'object',
+                            properties: [
+                                'message' => ['type' => 'string', 'example' => 'Private Key is in use and cannot be deleted.'],
+                            ]
+                        )
+                    ),
+                ]),
         ]
     )]
     public function delete_key(Request $request)
@@ -384,6 +398,14 @@ class SecurityController extends Controller
         if (is_null($key)) {
             return response()->json(['message' => 'Private Key not found.'], 404);
         }
+
+        if ($key->isInUse()) {
+            return response()->json([
+                'message' => 'Private Key is in use and cannot be deleted.',
+                'details' => 'This private key is currently being used by servers, applications, or Git integrations.',
+            ], 422);
+        }
+
         $key->forceDelete();
 
         return response()->json([

app/Http/Controllers/Api/ServicesController.php

@@ -103,7 +103,7 @@ class ServicesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid', 'type'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'type' => [
                             'description' => 'The one-click service type',
@@ -205,6 +205,7 @@ class ServicesController extends Controller
                         'server_uuid' => ['type' => 'string', 'description' => 'Server UUID.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'Destination UUID. Required if server has multiple destinations.'],
                         'instant_deploy' => ['type' => 'boolean', 'default' => false, 'description' => 'Start the service immediately after creation.'],
+                        'docker_compose_raw' => ['type' => 'string', 'description' => 'The Docker Compose raw content.'],
                     ],
                 ),
             ),
@@ -256,7 +257,7 @@ class ServicesController extends Controller
             'environment_name' => 'string|nullable',
             'environment_uuid' => 'string|nullable',
             'server_uuid' => 'string|required',
-            'destination_uuid' => 'string',
+            'destination_uuid' => 'string|nullable',
             'name' => 'string|max:255',
             'description' => 'string|nullable',
             'instant_deploy' => 'boolean',

app/Livewire/SettingsEmail.php

@@ -225,7 +225,7 @@ class SettingsEmail extends Component
                 'test-email:'.$this->team->id,
                 $perMinute = 0,
                 function () {
-                    $this->team?->notify(new Test($this->testEmailAddress, 'email'));
+                    $this->team?->notify(new Test($this->testEmailAddress));
                     $this->dispatch('success', 'Test Email sent.');
                 },
                 $decaySeconds = 10,

app/Notifications/TransactionalEmails/InvitationLink.php

@@ -16,10 +16,9 @@ class InvitationLink extends CustomEmailNotification
         return [TransactionalEmailChannel::class];
     }
 
-    public function __construct(public User $user, public bool $isTransactionalEmail)
+    public function __construct(public User $user, public bool $isTransactionalEmail = true)
     {
         $this->onQueue('high');
-        $this->isTransactionalEmail = true;
     }
 
     public function toMail(): MailMessage

app/Notifications/TransactionalEmails/ResetPassword.php

@@ -17,11 +17,10 @@ class ResetPassword extends Notification
 
     public InstanceSettings $settings;
 
-    public function __construct($token, public bool $isTransactionalEmail)
+    public function __construct($token, public bool $isTransactionalEmail = true)
     {
         $this->settings = instanceSettings();
         $this->token = $token;
-        $this->isTransactionalEmail = true;
     }
 
     public static function createUrlUsing($callback)

app/Notifications/TransactionalEmails/Test.php

@@ -8,10 +8,9 @@ use Illuminate\Notifications\Messages\MailMessage;
 
 class Test extends CustomEmailNotification
 {
-    public function __construct(public string $emails, public string $isTransactionalEmail)
+    public function __construct(public string $emails, public bool $isTransactionalEmail = true)
     {
         $this->onQueue('high');
-        $this->isTransactionalEmail = true;
     }
 
     public function via(): array

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.404',
+        'version' => '4.0.0-beta.405',
         'helper_version' => '1.0.8',
         'realtime_version' => '1.0.6',
         'self_hosted' => env('SELF_HOSTED', true),

openapi.json

@@ -5900,8 +5900,7 @@
                                     "server_uuid",
                                     "project_uuid",
                                     "environment_name",
-                                    "environment_uuid",
+                                    "environment_uuid"
-                                    "type"
                                 ],
                                 "properties": {
                                     "type": {
@@ -6030,6 +6029,10 @@
                                         "type": "boolean",
                                         "default": false,
                                         "description": "Start the service immediately after creation."
+                                    },
+                                    "docker_compose_raw": {
+                                        "type": "string",
+                                        "description": "The Docker Compose raw content."
                                     }
                                 },
                                 "type": "object"

openapi.yaml

@@ -3991,7 +3991,6 @@ paths:
                 - project_uuid
                 - environment_name
                 - environment_uuid
-                - type
               properties:
                 type:
                   description: 'The one-click service type'
@@ -4024,6 +4023,9 @@ paths:
                   type: boolean
                   default: false
                   description: 'Start the service immediately after creation.'
+                docker_compose_raw:
+                  type: string
+                  description: 'The Docker Compose raw content.'
               type: object
       responses:
         '201':

other/nightly/versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.404"
+            "version": "4.0.0-beta.405"
         },
         "nightly": {
-            "version": "4.0.0-beta.405"
+            "version": "4.0.0-beta.406"
         },
         "helper": {
             "version": "1.0.8"

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.404"
+            "version": "4.0.0-beta.405"
         },
         "nightly": {
-            "version": "4.0.0-beta.405"
+            "version": "4.0.0-beta.406"
         },
         "helper": {
             "version": "1.0.8"