EZP-29501: Expose refreshSession method in JS REST Client (ezsystems#92)

ezpublishlegacy · Sep 25, 2018 · 31bc4e5 · 31bc4e5
1 parent c71415f
commit 31bc4e5
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 1 deletion.
diff --git a/dist/CAPI-min.js b/dist/CAPI-min.js
diff --git a/dist/CAPI.js b/dist/CAPI.js
@@ -8183,6 +8183,35 @@ define('CAPI',['authAgents/SessionAuthAgent', 'authAgents/HttpBasicAuthAgent', '
             authenticationAgent.logOut(callback);
         };
 
+        /**
+         * Stores session info.
+         *
+         * @method storeSessionInfo
+         * @param {Object} session
+         */
+        this.storeSessionInfo = function (session) {
+            authenticationAgent._storeSessionInfo({
+                name: session.name,
+                href: session._href,
+                identifier: session.identifier,
+                csrfToken: session.csrfToken,
+            });
+        };
+
+        /**
+         * Refreshes the user session
+         *
+         * @method refreshSession
+         * @param {Function} callback
+         */
+        this.refreshSession = function (callback) {
+            if (!userService) {
+                return;
+            }
+
+            userService.refreshSession(authenticationAgent._storage.getItem('ezpRestClient.sessionId'), callback);
+        };
+
         /**
          * Get instance of Content Service. Use ContentService to retrieve information and execute operations related to Content.
          *

diff --git a/src/CAPI.js b/src/CAPI.js
@@ -105,6 +105,35 @@ define(['authAgents/SessionAuthAgent', 'authAgents/HttpBasicAuthAgent', 'Connect
             authenticationAgent.logOut(callback);
         };
 
+        /**
+         * Stores session info.
+         *
+         * @method storeSessionInfo
+         * @param {Object} session
+         */
+        this.storeSessionInfo = function (session) {
+            authenticationAgent._storeSessionInfo({
+                name: session.name,
+                href: session._href,
+                identifier: session.identifier,
+                csrfToken: session.csrfToken,
+            });
+        };
+
+        /**
+         * Refreshes the user session
+         *
+         * @method refreshSession
+         * @param {Function} callback
+         */
+        this.refreshSession = function (callback) {
+            if (!userService) {
+                return;
+            }
+
+            userService.refreshSession(authenticationAgent._storage.getItem('ezpRestClient.sessionId'), callback);
+        };
+
         /**
          * Get instance of Content Service. Use ContentService to retrieve information and execute operations related to Content.
          *

diff --git a/test/CAPI.tests.js b/test/CAPI.tests.js
@@ -26,6 +26,9 @@ define(function (require) {
 
         MockAuthenticationAgent = function () {
             this._CAPI = null;
+            this._storage = (function () {
+                this.getItem = function (key) { return 'key'; };
+            })();
             this.setCAPI = function (capi) {
                 this._CAPI = capi;
             };
@@ -167,6 +170,19 @@ define(function (require) {
             });
         });
 
+        describe('refreshSession', function () {
+            it('It should invoke the refreshSession method from the UserService', function () {
+                var mockCallback = function () {},
+                    userService = capi.getUserService();
+
+                spyOn(userService, 'refreshSession');
+
+                capi.logIn(mockCallback);
+
+                expect(userService).toHaveBeenCalledWith(mockCallback);
+            });
+        });
+
         describe("getConnectionManager", function () {
             it("should provide ConnectionManager", function () {
                 var connectionManager = capi.getConnectionManager();