SharePoint API: service root url fix for web resource

vgrem · vgrem · commit 5146bbb7467e · 2023-07-15T19:08:48.000+03:00
diff --git a/src/SharePoint/Web.php b/src/SharePoint/Web.php
@@ -2140,8 +2140,8 @@ public function getResourceUrl()
         if (!is_null($this->webUrl)) {
             $urlInfo = parse_url($this->getContext()->getBaseUrl());
             $rootSiteUrl =  $urlInfo['scheme'] . '://' . $urlInfo['host'];
-            return "{$rootSiteUrl}{$this->webUrl}/_api/web";
-            #return str_replace("/_api", "{$this->webUrl}/_api", $url);
+            $webPath = str_replace($rootSiteUrl, "", $this->getContext()->getBaseUrl());
+            return str_replace("{$webPath}/_api", "{$this->webUrl}/_api", $url);
         }
         return $url;
     }

Original file line number	Diff line number	Diff line change
`@@ -2140,8 +2140,8 @@ public function getResourceUrl()`
`2140`	`2140`	`if (!is_null($this->webUrl)) {`
`2141`	`2141`	`$urlInfo = parse_url($this->getContext()->getBaseUrl());`
`2142`	`2142`	`$rootSiteUrl = $urlInfo['scheme'] . '://' . $urlInfo['host'];`
`2143`		`- return "{$rootSiteUrl}{$this->webUrl}/_api/web";`
`2144`		`- #return str_replace("/_api", "{$this->webUrl}/_api", $url);`
	`2143`	`+ $webPath = str_replace($rootSiteUrl, "", $this->getContext()->getBaseUrl());`
	`2144`	`+ return str_replace("{$webPath}/_api", "{$this->webUrl}/_api", $url);`
`2145`	`2145`	`}`
`2146`	`2146`	`return $url;`
`2147`	`2147`	`}`