Fix for #517, update extractWebId to use metadata and editLink

src/sharepoint/odata.ts

@@ -1,11 +1,10 @@
 import { QueryableConstructor } from "./queryable";
-import { Util } from "../utils/util";
+import { Util, extractWebUrl } from "../utils/util";
 import { Logger, LogLevel } from "../utils/logging";
 import { HttpClient, mergeHeaders } from "../net/httpclient";
 import { RuntimeConfig } from "../configuration/pnplibconfig";
 import { TypedHash } from "../collections/collections";
-import { ODataIdException, BatchParseException } from "../utils/exceptions";
-import { ProcessHttpClientResponseException } from "../utils/exceptions";
+import { ODataIdException, BatchParseException, ProcessHttpClientResponseException } from "../utils/exceptions";
 
 export function extractOdataId(candidate: any): string {
 
@@ -135,9 +134,9 @@ class ODataEntityArrayParserImpl<T> extends ODataParserBase<T[]> {
 
 export function getEntityUrl(entity: any): string {
 
-    if (entity.hasOwnProperty("odata.editLink")) {
+    if (entity.hasOwnProperty("odata.metadata") && entity.hasOwnProperty("odata.editLink")) {
         // we are dealign with minimal metadata (default)
-        return Util.combinePaths("_api", entity["odata.editLink"]);
+        return Util.combinePaths(extractWebUrl(entity["odata.metadata"]), "_api", entity["odata.editLink"]);
     } else if (entity.hasOwnProperty("__metadata")) {
         // we are dealing with verbose, which has an absolute uri
         return entity.__metadata.uri;

src/sharepoint/webs.ts

@@ -8,7 +8,7 @@ import { Folders, Folder } from "./folders";
 import { RoleDefinitions } from "./roles";
 import { File } from "./files";
 import { TypedHash } from "../collections/collections";
-import { Util } from "../utils/util";
+import { Util, extractWebUrl } from "../utils/util";
 import { BasePermissions, ChangeQuery } from "./types";
 import { List } from "./lists";
 import { SiteUsers, SiteUser, CurrentUser, SiteUserProps } from "./siteusers";
@@ -109,18 +109,7 @@ export class Web extends QueryableShareableWeb {
      * @param url
      */
     public static fromUrl(url: string, path?: string) {
-
-        if (url === null) {
-            return new Web("");
-        }
-
-        const index = url.indexOf("_api/");
-
-        if (index > -1) {
-            return new Web(url.substr(0, index), path);
-        }
-
-        return new Web(url, path);
+        return new Web(extractWebUrl(url), path);
     }
 
     /**

src/utils/util.ts

@@ -2,6 +2,22 @@ declare var global: any;
 import { TypedHash } from "../collections/collections";
 import { RuntimeConfig } from "../configuration/pnplibconfig";
 
+export function extractWebUrl(candidateUrl: string) {
+
+    if (candidateUrl === null) {
+        return "";
+    }
+
+    const index = candidateUrl.indexOf("_api/");
+
+    if (index > -1) {
+        return candidateUrl.substr(0, index);
+    }
+
+    // if all else fails just give them what they gave us back
+    return candidateUrl;
+}
+
 export class Util {
 
     /**