SharePoint API: service root url fix for web resource

vgrem · Jul 15, 2023 · a21177f · a21177f
1 parent 4cf1296
commit a21177f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/SharePoint/Web.php b/src/SharePoint/Web.php
@@ -2138,7 +2138,10 @@ public function getResourceUrl()
     {
         $url = parent::getResourceUrl();
         if (!is_null($this->webUrl)) {
-            return str_replace("/_api", "{$this->webUrl}/_api", $url);
+            $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);
         }
         return $url;
     }

diff --git a/tests/sharepoint/WebTest.php b/tests/sharepoint/WebTest.php
@@ -98,8 +98,8 @@ public function testAssignUniquePermissions(Web $targetWeb)
             ->breakRoleInheritance(true)
             ->executeQuery();
 
-        $targetWeb->select("HasUniqueRoleAssignments")->get()->executeQuery();
-        self::assertTrue($targetWeb->getHasUniqueRoleAssignments());
+        $result = $targetWeb->select(["HasUniqueRoleAssignments"])->get()->executeQuery();
+        self::assertTrue($result->getHasUniqueRoleAssignments());
     }
 
     /**