From 16e85e27e83b6be5e321d1dafe1c61cb1a45f8ac Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:14:44 +0100
Subject: [PATCH] fix(service): always enable force https labels

Force HTTPS routing labels in parser helpers and remove per-service toggles now that the preference is no longer honored.
---
 app/Models/ServiceApplication.php | 5 -----
 app/Models/ServiceDatabase.php    | 5 -----
 bootstrap/helpers/parsers.php     | 8 ++++----
 bootstrap/helpers/shared.php      | 8 ++++----
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php
index cbd02daa6..7b8b46812 100644
--- a/app/Models/ServiceApplication.php
+++ b/app/Models/ServiceApplication.php
@@ -81,11 +81,6 @@ public function isGzipEnabled()
         return data_get($this, 'is_gzip_enabled', true);
     }
 
-    public function isForceHttpsEnabled()
-    {
-        return data_get($this, 'is_force_https_enabled', true);
-    }
-
     public function type()
     {
         return 'service';
diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index aee71295a..f6a39cfe4 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -80,11 +80,6 @@ public function isGzipEnabled()
         return data_get($this, 'is_gzip_enabled', true);
     }
 
-    public function isForceHttpsEnabled()
-    {
-        return data_get($this, 'is_force_https_enabled', true);
-    }
-
     public function type()
     {
         return 'service';
diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.php
index 45125bce7..53060d28f 100644
--- a/bootstrap/helpers/parsers.php
+++ b/bootstrap/helpers/parsers.php
@@ -2329,7 +2329,7 @@ function serviceParser(Service $resource): Collection
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                             uuid: $uuid,
                             domains: $fqdns,
-                            is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+                            is_force_https_enabled: true,
                             serviceLabels: $serviceLabels,
                             is_gzip_enabled: $originalResource->isGzipEnabled(),
                             is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2342,7 +2342,7 @@ function serviceParser(Service $resource): Collection
                             network: $network,
                             uuid: $uuid,
                             domains: $fqdns,
-                            is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+                            is_force_https_enabled: true,
                             serviceLabels: $serviceLabels,
                             is_gzip_enabled: $originalResource->isGzipEnabled(),
                             is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2356,7 +2356,7 @@ function serviceParser(Service $resource): Collection
                 $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                     uuid: $uuid,
                     domains: $fqdns,
-                    is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+                    is_force_https_enabled: true,
                     serviceLabels: $serviceLabels,
                     is_gzip_enabled: $originalResource->isGzipEnabled(),
                     is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2367,7 +2367,7 @@ function serviceParser(Service $resource): Collection
                     network: $network,
                     uuid: $uuid,
                     domains: $fqdns,
-                    is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+                    is_force_https_enabled: true,
                     serviceLabels: $serviceLabels,
                     is_gzip_enabled: $originalResource->isGzipEnabled(),
                     is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 2a7d5cbb0..4372ff955 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1933,7 +1933,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                     $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                                         uuid: $resource->uuid,
                                         domains: $fqdns,
-                                        is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+                                        is_force_https_enabled: true,
                                         serviceLabels: $serviceLabels,
                                         is_gzip_enabled: $savedService->isGzipEnabled(),
                                         is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1946,7 +1946,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                         network: $resource->destination->network,
                                         uuid: $resource->uuid,
                                         domains: $fqdns,
-                                        is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+                                        is_force_https_enabled: true,
                                         serviceLabels: $serviceLabels,
                                         is_gzip_enabled: $savedService->isGzipEnabled(),
                                         is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1959,7 +1959,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                                 uuid: $resource->uuid,
                                 domains: $fqdns,
-                                is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+                                is_force_https_enabled: true,
                                 serviceLabels: $serviceLabels,
                                 is_gzip_enabled: $savedService->isGzipEnabled(),
                                 is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1970,7 +1970,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 network: $resource->destination->network,
                                 uuid: $resource->uuid,
                                 domains: $fqdns,
-                                is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+                                is_force_https_enabled: true,
                                 serviceLabels: $serviceLabels,
                                 is_gzip_enabled: $savedService->isGzipEnabled(),
                                 is_stripprefix_enabled: $savedService->isStripprefixEnabled(),