gd-sprest 8.5.1 → 8.5.3

package/@types/v2/sites.d.ts

@@ -31,19 +31,23 @@ export interface Isites {
     /**
      * Creates an instance of the site library.
      * @param siteId - (Optional) The site id to target, current by default.
+     * @param webId - (Optional) The sub-site id to target.
      * @param targetInfo - (Optional) The target information.
      */
-    (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
+    (props?: { siteId?: string, webId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
 
     /** Returns the current web. */
     static getCurrentWeb(): IBaseQuery<site> & siteMethods;
 
     /** Returns a drive for a site. */
-    static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<drive> & driveMethods>;
+    static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string, webId?: string }): PromiseLike<IBaseQuery<drive> & driveMethods>;
 
     /** Returns a drive for a site. */
-    static getFile(props: { fileName: string, siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<item> & itemMethods>;
+    static getFile(props: { fileUrl: string, siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<item> & itemMethods>;
 
     /** Returns a list for a site. */
     static getList(props: { siteId?: string, siteUrl?: string, listId?: string, listName?: string }): PromiseLike<IBaseQuery<list> & listMethods>;
+
+    /** Returns the site and web ids. */
+    static getIdByUrl(siteUrl: string): PromiseLike<{ siteId: string, siteUrl: string, webId: string, webUrl: string }>;
 }

package/build/mapper/custom/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./audit"), exports);
 __exportStar(require("./graph"), exports);
+__exportStar(require("./odata"), exports);
 __exportStar(require("./old"), exports);
 __exportStar(require("./peoplePicker"), exports);
 __exportStar(require("./propertyValues"), exports);

package/build/mapper/custom/odata.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.odata = void 0;
+var utils_1 = require("../../utils");
+/**
+ * OData
+ */
+exports.odata = {
+    // Adds the odata query option
+    query: { argNames: ["oData"], requestType: utils_1.RequestType.OData }
+};

package/build/mapper/def.js

@@ -4101,7 +4101,7 @@ exports.Mapper = {
     "SP.File": {
         properties: [
             "Author|SP.User", "CheckedOutByUser|SP.User", "EffectiveInformationRightsManagementSettings", "InformationRightsManagementSettings",
-            "ListItemAllFields", "LockedByUser|SP.User", "ModifiedBy|SP.User", "Properties", "VersionEvents", "Versions|SP.FileVersion.Collection"
+            "ListItemAllFields|odata", "LockedByUser|SP.User", "ModifiedBy|SP.User", "Properties", "VersionEvents", "Versions|SP.FileVersion.Collection"
         ],
         addClientActivities: {
             argNames: ["activitiesStream"],
@@ -4377,7 +4377,7 @@ exports.Mapper = {
     },
     "SP.Folder": {
         properties: [
-            "Files|SP.File.Collection|/getByUrl('[Name]')|SP.File", "Folders|SP.Folder.Collection|/getByUrl('[Name]')|SP.Folder", "ListItemAllFields",
+            "Files|SP.File.Collection|/getByUrl('[Name]')|SP.File", "Folders|SP.Folder.Collection|/getByUrl('[Name]')|SP.Folder", "ListItemAllFields|odata",
             "ParentFolder|SP.Folder", "Properties", "StorageMetrics"
         ],
         addSubFolder: {
@@ -4432,7 +4432,7 @@ exports.Mapper = {
     },
     "SP.Folder.Collection": {
         properties: [
-            "Files|SP.File.Collection|/getByUrl('[Name]')|SP.File", "Folders|SP.Folder.Collection|/getByUrl('[Name]')|SP.Folder", "ListItemAllFields",
+            "Files|SP.File.Collection|/getByUrl('[Name]')|SP.File", "Folders|SP.Folder.Collection|/getByUrl('[Name]')|SP.Folder",
             "ParentFolder", "StorageMetrics"
         ],
         add: {

package/build/mapper/v2.js

@@ -120,7 +120,6 @@ exports.MapperV2 = {
         query: { argNames: ["oData"], requestType: utils_1.RequestType.OData },
         setSensitivityLabel: {
             argNames: ["values"],
-            name: "[base.eTag]/setSensitivityLabel",
             requestType: utils_1.RequestType.PostBodyNoArgs,
             useToken: true
         },
@@ -196,7 +195,6 @@ exports.MapperV2 = {
         },
         setSensitivityLabel: {
             argNames: ["values"],
-            name: "[base.eTag]/setSensitivityLabel",
             requestType: utils_1.RequestType.PostBodyNoArgs
         },
         update: {

package/build/rest.js

@@ -9,7 +9,7 @@ var sptypes_1 = require("./sptypes");
  * SharePoint REST Library
  */
 exports.$REST = {
-    __ver: 8.51,
+    __ver: 8.53,
     AppContext: function (siteUrl) { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

package/build/v2/sites.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sites = void 0;
 var contextInfo_1 = require("../lib/contextInfo");
 var site_1 = require("../lib/site");
+var web_1 = require("../lib/web");
 var utils_1 = require("../utils");
 var common_1 = require("./common");
 /**
@@ -19,6 +20,11 @@ exports.sites = (function (props) {
     sites.targetInfo.defaultToWebFl = true;
     sites.targetInfo.endpoint = "_api/v2.1/sites/" + (props.siteId || ((_a = contextInfo_1.ContextInfo === null || contextInfo_1.ContextInfo === void 0 ? void 0 : contextInfo_1.ContextInfo.siteId) === null || _a === void 0 ? void 0 : _a.replace(/[{}]/g, '')));
     sites.targetInfo.requestType = utils_1.RequestType.GraphGet;
+    // See if the web id is provided
+    if (props.webId) {
+        // Append the web id
+        sites.targetInfo.endpoint += "," + props.webId;
+    }
     // Add the methods
     utils_1.Request.addMethods(sites, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#sites" } });
     // Return the sites
@@ -31,11 +37,11 @@ exports.sites.getDrive = function (props) {
     // Return a promise
     return new Promise(function (resolve, reject) {
         // Method to get the drive id
-        var getDriveId = function (siteId, libName) {
+        var getDriveId = function (siteId, webId, libName) {
             // Return a promise
             return new Promise(function (resolve, reject) {
                 // Get the drives
-                exports.sites({ siteId: siteId }).drives().query({ Select: ["id", "name"] }).execute(function (drives) {
+                exports.sites({ siteId: siteId, webId: webId }).drives().query({ Select: ["id", "name"] }).execute(function (drives) {
                     // Parse the drives
                     for (var i = 0; i < drives.results.length; i++) {
                         var drive = drives.results[i];
@@ -54,18 +60,18 @@ exports.sites.getDrive = function (props) {
         // See if the site id exists
         if (props.siteId) {
             // Get the drive id
-            getDriveId(props.siteId, props.libName).then(function (driveId) {
+            getDriveId(props.siteId, props.webId, props.libName).then(function (driveId) {
                 // Resolve the request
                 resolve(exports.sites({ siteId: props.siteId }).drives(driveId));
             }, reject);
         }
         else {
-            // Get the site
-            site_1.Site(props.siteUrl).query({ Select: ["Id"] }).execute(function (site) {
+            // Get the site/web ids
+            exports.sites.getIdByUrl(props.siteUrl).then(function (info) {
                 // Get the drive id
-                getDriveId(site.Id, props.libName).then(function (driveId) {
+                getDriveId(info.siteId, info.webId, props.libName).then(function (driveId) {
                     // Resolve the request
-                    resolve(exports.sites({ siteId: site.Id }).drives(driveId));
+                    resolve(exports.sites({ siteId: info.siteId, webId: info.webId }).drives(driveId));
                 }, reject);
             }, reject);
         }
@@ -75,13 +81,24 @@ exports.sites.getDrive = function (props) {
 exports.sites.getFile = function (props) {
     // Return a promise
     return new Promise(function (resolve, reject) {
-        // Get the library
-        exports.sites.getDrive(props).then(function (drive) {
-            // Get the file
-            drive.items().query({ Filter: "name eq '" + props.fileName + "'" }).execute(function (resp) {
-                var file = resp.results[0];
-                // Resolve the request
-                resolve(file ? drive.items(file.id) : null);
+        // Get the site/web info
+        exports.sites.getIdByUrl(props.fileUrl).then(function (info) {
+            // Get the drive
+            exports.sites.getDrive({ siteId: info.siteId, webId: info.webId, libName: props.libName }).then(function (drive) {
+                // Get the file
+                web_1.Web(info.webUrl).getFileByUrl(props.fileUrl).execute(function (file) {
+                    // Get the item for this file
+                    file.ListItemAllFields().query({ Expand: ["ParentList"] }).execute(function (item) {
+                        drive.items().query({
+                            Expand: ["listItem"],
+                            Filter: "listItem/id eq '" + item.Id + "'"
+                        }).execute(function (resp) {
+                            var file = resp.results[0];
+                            // Resolve the request
+                            resolve(file ? drive.items(file.id) : null);
+                        }, reject);
+                    });
+                });
             }, reject);
         }, reject);
     });
@@ -96,11 +113,33 @@ exports.sites.getList = (function (props) {
             resolve(exports.sites({ siteId: props.siteId }).lists(props.listId || props.listName));
         }
         else {
-            // Get the site
-            site_1.Site(props.siteUrl).query({ Select: ["Id"] }).execute(function (site) {
+            // Get the ids
+            exports.sites.getIdByUrl(props.siteUrl).then(function (info) {
                 // Resolve the request
-                resolve(exports.sites({ siteId: site.Id }).lists(props.listId || props.listName));
+                resolve(exports.sites({ siteId: info.siteId, webId: info.webId }).lists(props.listId || props.listName));
             }, reject);
         }
     });
 });
+/** Gets the site and web id from a url */
+exports.sites.getIdByUrl = function (siteUrl) {
+    // Return a promise
+    return new Promise(function (resolve, reject) {
+        // Get the context information
+        contextInfo_1.ContextInfo.getWeb(siteUrl).execute(function (context) {
+            // Get the site id
+            site_1.Site(context.GetContextWebInformation.SiteFullUrl).query({ Select: ["Id"] }).execute(function (site) {
+                // Get the web id
+                web_1.Web(context.GetContextWebInformation.WebFullUrl).query({ Select: ["Id"] }).execute(function (web) {
+                    // Resolve the request
+                    resolve({
+                        siteId: site.Id,
+                        siteUrl: context.GetContextWebInformation.SiteFullUrl,
+                        webId: web.Id,
+                        webUrl: context.GetContextWebInformation.WebFullUrl
+                    });
+                });
+            }, reject);
+        });
+    });
+};

package/dist/gd-sprest.d.ts

@@ -4545,21 +4545,25 @@ declare module 'gd-sprest/v2/sites' {
             /**
                 * Creates an instance of the site library.
                 * @param siteId - (Optional) The site id to target, current by default.
+                * @param webId - (Optional) The sub-site id to target.
                 * @param targetInfo - (Optional) The target information.
                 */
-            (props?: { siteId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
+            (props?: { siteId?: string, webId?: string, targetInfo?: ITargetInfoProps }): siteMethods & sites;
     
             /** Returns the current web. */
             static getCurrentWeb(): IBaseQuery<site> & siteMethods;
     
             /** Returns a drive for a site. */
-            static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<drive> & driveMethods>;
+            static getDrive(props: { siteId?: string, siteUrl?: string, libName?: string, webId?: string }): PromiseLike<IBaseQuery<drive> & driveMethods>;
     
             /** Returns a drive for a site. */
-            static getFile(props: { fileName: string, siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<item> & itemMethods>;
+            static getFile(props: { fileUrl: string, siteId?: string, siteUrl?: string, libName?: string }): PromiseLike<IBaseQuery<item> & itemMethods>;
     
             /** Returns a list for a site. */
             static getList(props: { siteId?: string, siteUrl?: string, listId?: string, listName?: string }): PromiseLike<IBaseQuery<list> & listMethods>;
+    
+            /** Returns the site and web ids. */
+            static getIdByUrl(siteUrl: string): PromiseLike<{ siteId: string, siteUrl: string, webId: string, webUrl: string }>;
     }
 }