gd-sprest 9.0.3 → 9.0.5

package/@types/lib/contextInfo.d.ts

@@ -464,6 +464,11 @@ export interface IContextInformation {
      * Methods
      */
 
+    /**
+     * Runs a loop to ensure the digest value doesn't expire.
+     */
+    enableRefreshToken();
+
     /**
      * Generates a guid.
      * @returns A GUID as a string value.
@@ -478,24 +483,11 @@ export interface IContextInformation {
      */
     getWeb(url: string): IBaseExecution<{ GetContextWebInformation: ContextWebInformation }>;
 
-    /**
-     * Refreshes the form digest value used for the requests.
-     * @param url Optional url to target, otherwise the current web is used.
-     * @param onComplete Method to call after the token is refreshed. If not supplied, then the token is refreshed synchronously.
-     */
-    refreshToken(url?: string, onComplete?: () => void);
-
     /**
      * Sets the page context information for modern pages.
      * @param spfxPageContext - The page context information variable from a SPFx project.
      */
     setPageContext(spfxPageContext: any);
-
-    /**
-     * Validates the date/time of a form digest value to ensure it's still valid.
-     * @param digestValue The request digest form value.
-     */
-    validateToken(digestValue: string): boolean;
 }
 
 // Theme State

package/build/lib/contextInfo.js

@@ -744,44 +744,65 @@ var _ContextInfo = /** @class */ (function () {
             url: url
         });
     };
-    // Refresh the token
-    _ContextInfo.refreshToken = function (url, onComplete) {
+    _ContextInfo.enableRefreshToken = function () {
         var _this = this;
-        // Create the request
-        var request = this.getWeb(url);
-        // See if we are doing an async request
-        if (onComplete) {
-            // Execute the request
-            request.execute(function (context) {
-                // Update the token
-                _this._contextInfo.formDigestTimeoutSeconds = context.GetContextWebInformation.FormDigestTimeoutSeconds;
-                _this._contextInfo.formDigestValue = context.GetContextWebInformation.FormDigestValue;
-                // Resolve the request
-                onComplete();
-            }, onComplete);
+        // See if the request digest exists
+        if (this.formDigestValue == null) {
+            return;
         }
-        else {
-            // Execute the request
-            var context = request.executeAndWait();
-            // Update the token
-            this._contextInfo.formDigestTimeoutSeconds = context.GetContextWebInformation.FormDigestTimeoutSeconds;
-            this._contextInfo.formDigestValue = context.GetContextWebInformation.FormDigestValue;
+        // See if we already have a loop method
+        if (this._loopId) {
+            return;
         }
+        // Create a loop
+        this._loopId = setInterval(function () {
+            // See if the digest is valid
+            if (_this.validateToken()) {
+                return;
+            }
+            // Log
+            console.info("[gd-sprest] Token has expired. Trying to refresh the token.");
+            // Get the context
+            _this.getWeb().execute(function (context) {
+                // Log
+                console.info("[gd-sprest] Successfully updated the token information.");
+                // Update the context info
+                _this._contextInfo.formDigestTimeoutSeconds = context.GetContextWebInformation.FormDigestTimeoutSeconds;
+                _this._contextInfo.formDigestValue = context.GetContextWebInformation.FormDigestValue;
+            }, function () {
+                // Log
+                console.info("[gd-sprest] Unable to get the context information to refresh the token.");
+                // Stop the loop
+                clearInterval(_this._loopId);
+                _this._loopId = null;
+            });
+        }, 500);
     };
     // Method to validate the token
     _ContextInfo.validateToken = function (digestValue) {
+        if (digestValue === void 0) { digestValue = this._contextInfo.formDigestValue; }
         // See if no value exists
         if (digestValue == null) {
             return false;
         }
-        // Get the current token and return true if it's still valid
+        // Get the current token expiration time
         var dtToken = new Date(digestValue.split(',')[1]);
-        return Date.now() < dtToken.getTime();
+        var timeout = this.formDigestTimeoutSeconds || 0;
+        // Return true if it's still valid
+        return Date.now() < dtToken.getTime() + timeout * 1000;
     };
+    var _a;
+    _a = _ContextInfo;
     // The page context information from an spfx project
     _ContextInfo._spfxPageContext = null;
     // Method to set the page context information from an SPFX project
-    _ContextInfo.setPageContext = function (spfxPageContext) { exports.ContextInfo["_spfxPageContext"] = spfxPageContext; };
+    _ContextInfo.setPageContext = function (spfxPageContext) {
+        // Set the page context information
+        exports.ContextInfo["_spfxPageContext"] = spfxPageContext;
+        // Enable the refresh token
+        _a.enableRefreshToken();
+    };
+    _ContextInfo._loopId = null;
     return _ContextInfo;
 }());
 exports.ContextInfo = _ContextInfo;

package/build/rest.js

@@ -9,7 +9,7 @@ var sptypes_1 = require("./sptypes");
  * SharePoint REST Library
  */
 exports.$REST = {
-    __ver: 9.03,
+    __ver: 9.05,
     AppContext: function (siteUrl) { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,
@@ -55,6 +55,8 @@ var global = Lib.ContextInfo.window.$REST;
 if (global == null || global.__ver == null || global.__ver < exports.$REST.__ver) {
     // Set the global variable
     Lib.ContextInfo.window.$REST = exports.$REST;
+    // Enable the refresh token
+    Lib.ContextInfo.enableRefreshToken();
     // Ensure the SP lib exists
     if (Lib.ContextInfo.window.SP) {
         // If MDS is turned on in a SP2013 environment, it may throw an error

package/build/utils/xhrRequest.js

@@ -200,33 +200,6 @@ var XHRRequest = /** @class */ (function () {
     // Method to execute the xml http request
     XHRRequest.prototype.execute = function () {
         var _this = this;
-        // Executes the request
-        var processRequest = function () {
-            // See if we are targeting the context endpoint
-            if (_this.targetInfo.props.endpoint == "contextinfo") {
-                // Execute the request
-                _this.executeRequest(requestDigest);
-            }
-            // See if this is a post request and the request digest does not exist
-            else if (_this.targetInfo.requestMethod != "GET" && requestDigest == "") {
-                // See if this is a synchronous request
-                if (!_this.asyncFl) {
-                    // Log
-                    console.info("[gd-sprest] POST requests must include the request digest information for synchronous requests. This is due to the modern page not including this information on the page.");
-                }
-                else {
-                    // Get the context information
-                    lib_1.ContextInfo.getWeb(_this.targetInfo.props.url || document.location.pathname.substr(0, document.location.pathname.lastIndexOf('/'))).execute(function (contextInfo) {
-                        // Execute the request
-                        _this.executeRequest(contextInfo.GetContextWebInformation.FormDigestValue);
-                    });
-                }
-            }
-            else {
-                // Execute the request
-                _this.executeRequest(requestDigest);
-            }
-        };
         // Set the request digest
         var requestDigest = this.targetInfo.props.requestDigest || "";
         if (requestDigest == "") {
@@ -234,25 +207,29 @@ var XHRRequest = /** @class */ (function () {
             requestDigest = lib_1.ContextInfo.document ? lib_1.ContextInfo.document.querySelector("#__REQUESTDIGEST") : "";
             requestDigest = requestDigest ? requestDigest.value : lib_1.ContextInfo.formDigestValue;
         }
-        // See if we need to update the request digest
-        if (requestDigest && lib_1.ContextInfo.validateToken(requestDigest) == false) {
-            // Log
-            console.info("[gd-sprest] Token has expired. Trying to refresh the token.");
-            // See if this is an async request
-            if (this.asyncFl) {
-                // Refresh the request digest value and then process the request
-                lib_1.ContextInfo.refreshToken(this.targetInfo.props.url, processRequest);
+        // See if we are targeting the context endpoint
+        if (this.targetInfo.props.endpoint == "contextinfo") {
+            // Execute the request
+            this.executeRequest(requestDigest);
+        }
+        // See if this is a post request and the request digest does not exist
+        else if (this.targetInfo.requestMethod != "GET" && requestDigest == "") {
+            // See if this is a synchronous request
+            if (!this.asyncFl) {
+                // Log
+                console.info("[gd-sprest] POST requests must include the request digest information for synchronous requests. This is due to the modern page not including this information on the page.");
             }
             else {
-                // Refresh the request digest value
-                lib_1.ContextInfo.refreshToken(this.targetInfo.props.url);
-                // Process the request
-                processRequest();
+                // Get the context information
+                lib_1.ContextInfo.getWeb(this.targetInfo.props.url || document.location.pathname.substr(0, document.location.pathname.lastIndexOf('/'))).execute(function (contextInfo) {
+                    // Execute the request
+                    _this.executeRequest(contextInfo.GetContextWebInformation.FormDigestValue);
+                });
             }
         }
         else {
-            // Process the request
-            processRequest();
+            // Execute the request
+            this.executeRequest(requestDigest);
         }
     };
     // Method to execute the xml http request

package/dist/gd-sprest.d.ts

@@ -959,6 +959,11 @@ declare module 'gd-sprest/lib/contextInfo' {
             };
     
     
+            /**
+                * Runs a loop to ensure the digest value doesn't expire.
+                */
+            enableRefreshToken();
+    
             /**
                 * Generates a guid.
                 * @returns A GUID as a string value.
@@ -973,24 +978,11 @@ declare module 'gd-sprest/lib/contextInfo' {
                 */
             getWeb(url: string): IBaseExecution<{ GetContextWebInformation: ContextWebInformation }>;
     
-            /**
-                * Refreshes the form digest value used for the requests.
-                * @param url Optional url to target, otherwise the current web is used.
-                * @param onComplete Method to call after the token is refreshed. If not supplied, then the token is refreshed synchronously.
-                */
-            refreshToken(url?: string, onComplete?: () => void);
-    
             /**
                 * Sets the page context information for modern pages.
                 * @param spfxPageContext - The page context information variable from a SPFx project.
                 */
             setPageContext(spfxPageContext: any);
-    
-            /**
-                * Validates the date/time of a form digest value to ensure it's still valid.
-                * @param digestValue The request digest form value.
-                */
-            validateToken(digestValue: string): boolean;
     }
     
     export interface IThemeState {