Always use the external API proxy URL if set

Author: pjcdawkins

src/Model/Project.php

@@ -123,7 +123,7 @@ public function addUser($user, $role, $byUuid = false)
     public function setApiUrl($url)
     {
         $projectUrl = Url::fromString($url)->combine('/projects/' . \urlencode($this->id))->__toString();
-        $this->urlViaGateway = $projectUrl;
+        $this->baseUrl = $this->urlViaGateway = $projectUrl;
     }
 
     /**
@@ -213,14 +213,37 @@ public function getEnvironment($id)
      */
     public function getLink($rel, $absolute = true)
     {
+        /**
+         * Require the API URL to be set for 'invitations' and 'access'.
+         *
+         * These endpoints require the external API proxy or gateway, or may
+         * require it in the future.
+         *
+         * The parent method, via self::makeAbsoluteUrl(), ensures an
+         * appropriate base URL is used otherwise.
+         *
+         * @see setApiUrl()
+         * @see makeAbsoluteUrl()
+         */
+        if ($rel === 'invitations' || $rel === 'access') {
+            if (!isset($this->urlViaGateway)) {
+                throw new \RuntimeException('The API gateway URL must be set');
+            }
+        }
+
+        // Use the HAL links available on the project.
         if ($this->hasLink($rel)) {
             return parent::getLink($rel, $absolute);
         }
 
+        // If the 'self' link is not present then this might be a project
+        // stub with an 'endpoint' property.
         if ($rel === 'self') {
-            return $this->getProperty('endpoint');
+            return $this->makeAbsoluteUrl($this->getProperty('endpoint'));
         }
 
+        // If the '#ui' link is not present then this might be a project
+        // stub with a 'uri' property.
         if ($rel === '#ui') {
             return $this->getProperty('uri');
         }
@@ -229,13 +252,6 @@ public function getLink($rel, $absolute = true)
             return $this->getUri() . '/variables';
         }
 
-        if ($rel === 'invitations') {
-            if (!isset($this->urlViaGateway)) {
-                throw new \RuntimeException('The API gateway URL must be set');
-            }
-            return rtrim($this->urlViaGateway, '/') . '/invitations';
-        }
-
         return $this->getUri() . '/' . ltrim($rel, '#');
     }
 

src/Model/Resource.php

@@ -589,7 +589,7 @@ public function getLink($rel, $absolute = true)
             throw new \InvalidArgumentException("Link not found: $rel");
         }
         $url = $this->data['_links'][$rel]['href'];
-        if ($absolute && strpos($url, '//') === false) {
+        if ($absolute || strpos($url, '//') !== false) {
             $url = $this->makeAbsoluteUrl($url);
         }
         return $url;
@@ -610,7 +610,12 @@ protected function makeAbsoluteUrl($relativeUrl, $baseUrl = null)
             throw new \RuntimeException('No base URL');
         }
         $base = Url::fromString($baseUrl);
-        return (string) $base->combine($relativeUrl);
+        $target = Url::fromString($relativeUrl);
+        // Ensure an absolute base URL overrides an absolute target URL.
+        if ($base->isAbsolute()) {
+            return (string) $base->combine($target->getPath());
+        }
+        return (string) $base->combine($target);
     }
 
     /**