update to latest release

gitana · May 16, 2015 · e9d18b0 · e9d18b0
1 parent 068800f
commit e9d18b0
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 7 deletions.
diff --git a/lib/gitana.js b/lib/gitana.js
@@ -2164,8 +2164,9 @@ if (typeof JSON !== 'object') {
      * Disconnects a platform from the cache.
      *
      * @param key
+     * @param expireAccessToken
      */
-    Gitana.disconnect = function(key)
+    Gitana.disconnect = function(key, expireAccessToken)
     {
         if (!key) {
             key = "default";
@@ -2174,6 +2175,18 @@ if (typeof JSON !== 'object') {
         var platform = Gitana.PLATFORM_CACHE(key);
         if (platform)
         {
+            // if we are meant to expire the server-side access token,
+            // fire off a signal to the Cloud CMS server to do so
+            // we ignore whether this succeeds or fails
+            if (expireAccessToken)
+            {
+                platform.getDriver().gitanaPost("/auth/expire", {}, {}, function() {
+                    // success
+                }, function(err) {
+                    // error
+                });
+            }
+
             var badKeys = [];
             for (var k in Gitana.APPS)
             {
@@ -2959,7 +2972,7 @@ if (typeof JSON !== 'object') {
             if (this.authorizationFlow == Gitana.OAuth2Http.TOKEN)
             {
                 var existingAccessToken = this.accessToken();
-                if (existingAccessToken != options.accessToken)
+                if (existingAccessToken !== options.accessToken)
                 {
                     storage.clear();
                 }
@@ -3011,6 +3024,8 @@ if (typeof JSON !== 'object') {
                         self.expiresIn(_expiresIn);
                         self.grantedScope(_grantedScope);
                         self.grantTime(_grantTime);
+
+                        // console.log("doGetAccessToken -> " + JSON.stringify(object));
                     }
 
                     success();
@@ -3117,6 +3132,8 @@ if (typeof JSON !== 'object') {
                         self.expiresIn(_expiresIn);
                         self.grantedScope(_grantedScope);
                         self.grantTime(_grantTime);
+
+                        // console.log("doRefreshAccessToken -> " + JSON.stringify(object));
                     }
 
                     success();
@@ -3276,9 +3293,45 @@ if (typeof JSON !== 'object') {
                 self.invoke(o);
             };
 
+            // if we have an access token and it's about to expire (within 20 seconds of it's expiry),
+            // we force an early refresh of the access token so that concurrent requests don't get access problems
+            // this is important for any browser-originated requests that rely on a persisted cookie (GITANA_TICKET)
+            //
+            // also provide some debugging if needed
+            var forceRefresh = false;
+            if (self.accessToken())
+            {
+                var grantTime = self.grantTime();
+                if (grantTime)
+                {
+                    var expiresIn = self.expiresIn();
+                    if (expiresIn)
+                    {
+                        // NOTE: expiresIn is in seconds
+                        var expirationTimeMs = self.grantTime() + (self.expiresIn() * 1000);
+                        var nowTimeMs = new Date().getTime();
+
+                        var timeRemainingMs = expirationTimeMs - nowTimeMs;
+                        if (timeRemainingMs <= 0)
+                        {
+                            // console.log("Access Token is expired, refresh will be attempted!");
+                        }
+                        else
+                        {
+                            // console.log("Access Token Time Remaining: " + timeRemainingMs);
+                        }
+
+                        if (timeRemainingMs <= 20000)
+                        {
+                            // console.log("Access Token only has 20 seconds left, forcing early refresh");
+                            forceRefresh = true;
+                        }
+                    }
+                }
+            }
 
             // if no access token, request one
-            if (!self.accessToken() && !this.cookieMode && !this.ticketMode)
+            if ((!self.accessToken() || forceRefresh) && !this.cookieMode && !this.ticketMode)
             {
                 if (!self.refreshToken())
                 {
@@ -3522,6 +3575,7 @@ if (typeof JSON !== 'object') {
          *
          * @param key
          * @param value
+         *
          * @return {*}
          */
         r.poke = function(key, value)
@@ -11787,11 +11841,13 @@ Gitana.OAuth2Http.TOKEN_METHOD = "POST";
         /**
          * Clears authentication against the server.
          *
+         * @param expireAccessToken (optional, assumed false)
+         *
          * @chained server
          *
          * @public
          */
-        logout: function()
+        logout: function(expireAccessToken)
         {
             var self = this;
 
@@ -11800,7 +11856,7 @@ Gitana.OAuth2Http.TOKEN_METHOD = "POST";
                 var platformCacheKey = this.getDriver().platformCacheKey;
                 if (platformCacheKey)
                 {
-                    Gitana.disconnect(platformCacheKey);
+                    Gitana.disconnect(platformCacheKey, expireAccessToken);
                 }
 
                 this.getDriver().clearAuthentication();

diff --git a/lib/gitana.min.js b/lib/gitana.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "author": "Gitana Software, Inc. <info@cloudcms.com> (http://www.cloudcms.com)",
     "name": "gitana",
     "description": "Cloud CMS Gitana Driver for Node JS",
-    "version": "1.0.156",
+    "version": "1.0.157",
     "repository": {
         "type": "git",
         "url": "git://github.com/gitana/gitana-node-js.git"