gd-sprest 7.8.3 → 7.8.5

package/@types/helper/executor.d.ts

@@ -10,5 +10,5 @@ export const Executor: IExecutor;
  * Executor
  */
 export interface IExecutor {
-    <T = any>(methodParams: Array<T>, method: (param: T) => PromiseLike<any> | void, onExecuted?: (...args) => PromiseLike<any> | void): PromiseLike<any>;
+    <T = any>(methodParams: Array<T>, method: (param: T) => PromiseLike<any | undefined> | void, onExecuted?: (...args) => PromiseLike<any | undefined> | void): PromiseLike<any | undefined>;
 }

package/build/lib/list.js

@@ -59,6 +59,24 @@ exports.List.getDataAsStream = (function (listFullUrl, parameters) {
 });
 // Static method for executing a flow against a list item
 exports.List.runFlow = function (props) {
+    // Determine the urls
+    var authUrl = "";
+    var flowUrl = "";
+    switch (props.cloudEnv) {
+        case sptypes_1.SPTypes.CloudEnvironment.USL4:
+            authUrl = sptypes_1.SPTypes.CloudEnvironment.FlowHigh;
+            flowUrl = sptypes_1.SPTypes.CloudEnvironment.FlowHighAPI;
+            break;
+        case sptypes_1.SPTypes.CloudEnvironment.USL5:
+            authUrl = sptypes_1.SPTypes.CloudEnvironment.FlowDoD;
+            flowUrl = sptypes_1.SPTypes.CloudEnvironment.FlowDoDAPI;
+            break;
+        // Default
+        default:
+            authUrl = sptypes_1.SPTypes.CloudEnvironment.Flow;
+            flowUrl = sptypes_1.SPTypes.CloudEnvironment.FlowAPI;
+            break;
+    }
     // Return a promise
     return new Promise(function (resolve) {
         // Gets the graph token
@@ -66,7 +84,7 @@ exports.List.runFlow = function (props) {
             // Return a promise
             return new Promise(function (resolveAuth) {
                 // Get the graph token
-                graph_1.Graph.getAccessToken(sptypes_1.SPTypes.CloudEnvironment.Flow).execute(function (auth) {
+                graph_1.Graph.getAccessToken(authUrl).execute(function (auth) {
                     // Resolve the request
                     resolveAuth(auth.access_token);
                 }, 
@@ -93,36 +111,29 @@ exports.List.runFlow = function (props) {
                 else {
                     // Get the graph token
                     getGraphToken().then(function (token) {
-                        // See if the cloud environment was provided
-                        if (props.cloudEnv) {
-                            // Set the url
-                            var authUrl = "" + props.cloudEnv + flowInfo.properties.environment.id + "/users/me/onBehalfOfTokenBundle?api-version=2016-11-01";
-                            // Execute the request
-                            new utils_1.Base({
-                                endpoint: authUrl,
-                                method: "POST",
-                                requestType: utils_1.RequestType.GraphPost,
-                                requestHeader: {
-                                    "authorization": "Bearer " + token
-                                }
-                            }).execute(function (tokenInfo) {
-                                // Resolve the request
-                                resolveAuth(tokenInfo.audienceToToken["https://" + flowInfo.properties.connectionReferences.shared_sharepointonline.swagger.host] || token);
-                            }, 
-                            // Error
-                            function (ex) {
-                                // Resolve the request
-                                resolve({
-                                    executed: false,
-                                    errorDetails: ex.response,
-                                    errorMessage: "Auth Error: Unable to get the flow token for cloud: " + props.cloudEnv
-                                });
-                            });
-                        }
-                        else {
+                        // Set the url
+                        var authUrl = "" + flowUrl + flowInfo.properties.environment.id + "/users/me/onBehalfOfTokenBundle?api-version=2016-11-01";
+                        // Get the graph token from SharePoint
+                        new utils_1.Base({
+                            endpoint: authUrl,
+                            method: "POST",
+                            requestType: utils_1.RequestType.GraphPost,
+                            requestHeader: {
+                                "authorization": "Bearer " + token
+                            }
+                        }).execute(function (tokenInfo) {
                             // Resolve the request
-                            resolveAuth(token);
-                        }
+                            resolveAuth(tokenInfo.audienceToToken["https://" + flowInfo.properties.connectionReferences.shared_sharepointonline.swagger.host] || token);
+                        }, 
+                        // Error
+                        function (ex) {
+                            // Resolve the request
+                            resolve({
+                                executed: false,
+                                errorDetails: ex.response,
+                                errorMessage: "Auth Error: Unable to get the flow token for cloud: " + props.cloudEnv
+                            });
+                        });
                     });
                 }
             });

package/build/mapper/v2.js

@@ -157,7 +157,9 @@ exports.MapperV2 = {
             returnType: "driveItem"
         },
         fields: {
+            appendRequest: true,
             requestType: utils_1.RequestType.Get,
+            name: "([base.id])/fields",
             returnType: "fields"
         },
         query: { argNames: ["oData"], requestType: utils_1.RequestType.OData },

package/build/rest.js

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

package/build/utils/helper.js

@@ -44,6 +44,7 @@ exports.Helper = {
     },
     // Method to execute a method
     executeMethod: function (base, methodName, methodConfig, args) {
+        var _a;
         var targetInfo = null;
         // See if the metadata is defined for the base object
         var metadata = base["d"] ? base["d"].__metadata : base["__metadata"];
@@ -64,6 +65,17 @@ exports.Helper = {
             // Copy the target information
             targetInfo = Object.create(base.targetInfo);
         }
+        // See if the method config name has a base reference
+        var startIdx = (_a = methodConfig === null || methodConfig === void 0 ? void 0 : methodConfig.name) === null || _a === void 0 ? void 0 : _a.indexOf("[base.");
+        if (startIdx >= 0) {
+            // Get the property name
+            var endIdx = methodConfig.name.indexOf("]", startIdx);
+            var propName = methodConfig.name.substring(startIdx, endIdx).split(".")[1];
+            // Get the property value
+            var propValue = base[propName] || "";
+            // Update the method name
+            methodConfig.name = methodConfig.name.replace("[base." + propName + "]", propValue);
+        }
         // Get the method information
         var methodInfo = new _1.MethodInfo(methodName, methodConfig, args);
         // Update the target information
@@ -90,7 +102,7 @@ exports.Helper = {
             // See if the endpoint exists, and the method is not a query string
             if (targetInfo.endpoint && methodInfo.url && methodInfo.url.indexOf("?") != 0) {
                 // Add a "/" separator to the url
-                targetInfo.endpoint += "/";
+                targetInfo.endpoint += methodInfo.appendRequest ? "" : "/";
             }
             // See if we already have a qs defined and appending another qs
             if (methodInfo.url.indexOf("?") == 0 && targetInfo.endpoint.indexOf('?') > 0) {

package/build/utils/methodInfo.js

@@ -29,6 +29,12 @@ var MethodInfo = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(MethodInfo.prototype, "appendRequest", {
+        // Flag to determine if we are appending the name or adding a "/" to the request url
+        get: function () { return this.methodInfo.appendRequest; },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(MethodInfo.prototype, "body", {
         // The data passed through the body of the request
         get: function () { return this.methodData; },

package/build/v2/sites.js

@@ -20,6 +20,6 @@ exports.sites = (function (id, targetInfo) {
     return sites;
 });
 /** Returns the current web. */
-exports.sites.getCurrentWeb = function () { return exports.sites().sites(contextInfo_1.ContextInfo.webId); };
+exports.sites.getCurrentWeb = function () { return exports.sites().sites(contextInfo_1.ContextInfo.webId.replace(/^\{|\}$/g, '')); };
 /** Returns a list by its title from the current web. */
 exports.sites.getList = function (title) { return exports.sites().lists(title); };

package/dist/gd-sprest.d.ts

@@ -2125,7 +2125,7 @@ declare module 'gd-sprest/helper/executor' {
         * Executor
         */
     export interface IExecutor {
-            <T = any>(methodParams: Array<T>, method: (param: T) => PromiseLike<any> | void, onExecuted?: (...args) => PromiseLike<any> | void): PromiseLike<any>;
+            <T = any>(methodParams: Array<T>, method: (param: T) => PromiseLike<any | undefined> | void, onExecuted?: (...args) => PromiseLike<any | undefined> | void): PromiseLike<any | undefined>;
     }
 }