Reverted version from 2.1 to 2.0.

gunjandatta · Dec 13, 2024 · 5947218 · 5947218
1 parent 2196853
commit 5947218
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 27 deletions.
diff --git a/@types/v2/drive.d.ts b/@types/v2/drive.d.ts
@@ -4,7 +4,7 @@ import { ITargetInfoProps } from "../utils";
 
 /**
  * #### REST API
- * _api/v2.1/drive
+ * _api/v2.0/drive
  *
  * #### Get the default library for a site.
  *
@@ -20,7 +20,7 @@ export const drive: Idrive;
 
 /**
  * Drive
- * The v2.1 REST endpoint.
+ * The v2.0 REST endpoint.
  * @category Drive
  */
 export interface Idrive {

diff --git a/@types/v2/drives.d.ts b/@types/v2/drives.d.ts
@@ -4,7 +4,7 @@ import { ITargetInfoProps } from "../utils";
 
 /**
  * #### REST API
- * _api/v2.1/drives
+ * _api/v2.0/drives
  *
  * #### Get the libraries for a site.
  *
@@ -20,7 +20,7 @@ export const drives: Idrives;
 
 /**
  * Drives
- * The v2.1 REST endpoint.
+ * The v2.0 REST endpoint.
  * @category Drives
  */
 export interface Idrives {

diff --git a/@types/v2/sites.d.ts b/@types/v2/sites.d.ts
@@ -7,7 +7,7 @@ import { ITargetInfoProps } from "../utils";
 
 /**
  * #### REST API
- * _api/v2.1/sites
+ * _api/v2.0/sites
  *
  * #### Get the current site
  *
@@ -45,7 +45,7 @@ export interface IsiteIdResult {
 
 /**
  * Sites
- * The v2.1 REST endpoint.
+ * The v2.0 REST endpoint.
  * @category Sites
  */
 export interface Isites {

diff --git a/dist/gd-sprest.d.ts b/dist/gd-sprest.d.ts
@@ -4443,7 +4443,7 @@ declare module 'gd-sprest/v2/drive' {
 
     /**
         * #### REST API
-        * _api/v2.1/drive
+        * _api/v2.0/drive
         *
         * #### Get the default library for a site.
         *
@@ -4459,7 +4459,7 @@ declare module 'gd-sprest/v2/drive' {
 
     /**
         * Drive
-        * The v2.1 REST endpoint.
+        * The v2.0 REST endpoint.
         * @category Drive
         */
     export interface Idrive {
@@ -4479,7 +4479,7 @@ declare module 'gd-sprest/v2/drives' {
 
     /**
         * #### REST API
-        * _api/v2.1/drives
+        * _api/v2.0/drives
         *
         * #### Get the libraries for a site.
         *
@@ -4495,7 +4495,7 @@ declare module 'gd-sprest/v2/drives' {
 
     /**
         * Drives
-        * The v2.1 REST endpoint.
+        * The v2.0 REST endpoint.
         * @category Drives
         */
     export interface Idrives {
@@ -4520,7 +4520,7 @@ declare module 'gd-sprest/v2/sites' {
 
     /**
         * #### REST API
-        * _api/v2.1/sites
+        * _api/v2.0/sites
         *
         * #### Get the current site
         *
@@ -4558,7 +4558,7 @@ declare module 'gd-sprest/v2/sites' {
 
     /**
         * Sites
-        * The v2.1 REST endpoint.
+        * The v2.0 REST endpoint.
         * @category Sites
         */
     export interface Isites {

diff --git a/dist/gd-sprest.js b/dist/gd-sprest.js
diff --git a/dist/gd-sprest.min.js b/dist/gd-sprest.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gd-sprest",
-    "version": "8.6.2",
+    "version": "8.6.3",
     "description": "An easy way to develop against the SharePoint REST API.",
     "author": "Gunjan Datta <[email protected]> (https://gunjandatta.github.io)",
     "license": "MIT",

diff --git a/src/rest.ts b/src/rest.ts
@@ -8,7 +8,7 @@ import { IREST } from "../@types";
  * SharePoint REST Library
  */
 export const $REST: IREST = {
-    __ver: 8.62,
+    __ver: 8.63,
     AppContext: (siteUrl: string) => { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

diff --git a/src/utils/helper.ts b/src/utils/helper.ts
@@ -304,7 +304,7 @@ export const Helper: IBaseHelper = {
                 if (obj["@odata.context"]) {
                     // Get the object type
                     let metadataType = (obj["@odata.context"] || objType);
-                    let values = metadataType.split("_api/v2.1/$metadata#");
+                    let values = metadataType.split("_api/v2.0/$metadata#");
                     if (values.length > 1) {
                         objType = values[1];
                     } else {

diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -24,7 +24,7 @@ export const Request = {
 
         // Get the object type
         let objType = metadata && metadata.type ? metadata.type : obj.targetInfo.endpoint;
-        let isV2 = obj?.parent?.targetInfo?.endpoint.startsWith("_api/v2.1/") ||
+        let isV2 = obj?.parent?.targetInfo?.endpoint.startsWith("_api/v2.0/") ||
             obj["@odata.context"] || objType.startsWith("@odata.context") ? true : false;
         if (isV2) {
             // See if we are overriding the object type
@@ -34,7 +34,7 @@ export const Request = {
             } else {
                 // Get the object type from the context
                 let metadataType = (obj["@odata.context"] || objType);
-                let values = metadataType.split("_api/v2.1/$metadata#");
+                let values = metadataType.split("_api/v2.0/$metadata#");
                 if (values.length > 1) {
                     objType = values[1];
                 } else {

diff --git a/src/utils/targetInfo.ts b/src/utils/targetInfo.ts
@@ -46,7 +46,7 @@ export class TargetInfo implements ITargetInfo {
 
     // Flag to determine if this is a graph request
     get isGraph(): boolean {
-        return this.props.endpoint?.startsWith("_api/v2.1/") ||
+        return this.props.endpoint?.startsWith("_api/v2.0/") ||
             this.props.requestType == RequestType.GraphGet || this.props.requestType == RequestType.GraphPost ||
             this.props.requestType == RequestType.GraphGetReplace || this.props.requestType == RequestType.GraphPostReplace;
     }

diff --git a/src/v2/drive.ts b/src/v2/drive.ts
@@ -26,10 +26,10 @@ export const drive: Idrive = ((props: { siteId?: string, siteUrl?: string, targe
     // See if an endpoint is not defined
     if (drive.targetInfo.endpoint == undefined) {
         // Default the endpoint
-        drive.targetInfo.endpoint = `_api/v2.1/${props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : ""}drive`;
+        drive.targetInfo.endpoint = `_api/v2.0/${props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : ""}drive`;
 
         // Add the methods
-        Request.addMethods(drive, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#drive" } });
+        Request.addMethods(drive, { __metadata: { type: "@odata.context/_api/v2.0/$metadata#drive" } });
     }
 
     // Return the default library

diff --git a/src/v2/drives.ts b/src/v2/drives.ts
@@ -26,18 +26,18 @@ export const drives: Idrives = ((props: { driveId?: string, siteId?: string, sit
     // See if an endpoint is not defined
     if (drives.targetInfo.endpoint == undefined) {
         // Default the endpoint
-        drives.targetInfo.endpoint = `_api/v2.1/${props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : ""}drives`;
+        drives.targetInfo.endpoint = `_api/v2.0/${props.siteId ? "sites/" + props.siteId.replace(/[{}]/g, '') : ""}drives`;
 
         // See if the drive id was provided
         if (props.driveId) {
             // Append the id
             drives.targetInfo.endpoint += "/" + props.driveId;
 
             // Add the methods
-            Request.addMethods(drives, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#drive" } });
+            Request.addMethods(drives, { __metadata: { type: "@odata.context/_api/v2.0/$metadata#drive" } });
         } else {
             // Add the methods
-            Request.addMethods(drives, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#drives" } });
+            Request.addMethods(drives, { __metadata: { type: "@odata.context/_api/v2.0/$metadata#drives" } });
         }
     }
 

diff --git a/src/v2/sites.ts b/src/v2/sites.ts
@@ -18,7 +18,7 @@ export const sites: Isites = ((props: { siteId?: string, webId?: string, targetI
 
     // Default the properties
     sites.targetInfo.defaultToWebFl = true;
-    sites.targetInfo.endpoint = "_api/v2.1/sites" + (props.siteId ? "/" + props.siteId : "");
+    sites.targetInfo.endpoint = "_api/v2.0/sites" + (props.siteId ? "/" + props.siteId : "");
     sites.targetInfo.requestType = RequestType.GraphGet;
 
     // See if the site id was provided
@@ -34,7 +34,7 @@ export const sites: Isites = ((props: { siteId?: string, webId?: string, targetI
     }
 
     // Add the methods
-    Request.addMethods(sites, { __metadata: { type: "@odata.context/_api/v2.1/$metadata#sites" } });
+    Request.addMethods(sites, { __metadata: { type: "@odata.context/_api/v2.0/$metadata#sites" } });
 
     // Return the sites
     return sites;

diff --git a/test/test.ts b/test/test.ts
@@ -17,6 +17,10 @@ v2.sites.getList({}).then(l => {
     l.items(3).setSensitivityLabel({}).execute();
 })
 
+v2.sites({ targetInfo: { url: "" } }).query({ Search: "*"}).execute(s => {
+    s.siteCollection.root;
+});
+v2.sites.getCurrentSite();
 v2.sites.getCurrentWeb();
 v2.sites.getList({ listName: "Test" }).then(list => {
     list.items.add({}).execute();