Merge branch 'main' into rk/autoscaling-settings

Author: ricardokirkner

src/Service/Api.php

@@ -1406,7 +1406,10 @@ public function getSiteUrl(Environment $environment, $appName, EnvironmentDeploy
 
         // Fall back to the public-url property.
         if ($environment->hasLink('public-url')) {
-            return $environment->getLink('public-url');
+            $data = $environment->getData();
+            if (!empty($data['_links']['public-url']['href'])) {
+                return $data['_links']['public-url']['href'];
+            }
         }
 
         return null;