Reset RSA access state on connect.core.terminate() (#827)

Co-authored-by: Andy Wang <[email protected]>
amazon-connect · Jan 16, 2024 · 50dcc82 · 50dcc82
1 parent cac0533
commit 50dcc82
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amazon-connect-streams",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "Amazon Connect Streams Library",
   "engines": {
     "node": ">=12.0.0"

diff --git a/release/connect-streams-dr-min.js b/release/connect-streams-dr-min.js
diff --git a/release/connect-streams-dr.js b/release/connect-streams-dr.js
diff --git a/release/connect-streams-min.js b/release/connect-streams-min.js
diff --git a/release/connect-streams.js b/release/connect-streams.js
@@ -26297,7 +26297,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;// AWS SDK for JavaScript v2.1377.0
 
   connect.core = {};
   connect.core.initialized = false;
-  connect.version = "2.6.8";
+  connect.version = "2.6.9";
   connect.outerContextStreamsVersion = null;
   connect.DEFAULT_BATCH_SIZE = 500;
 
@@ -26703,6 +26703,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;// AWS SDK for JavaScript v2.1377.0
     connect.core.softphoneManager = null;
     connect.core.upstream = null;
     connect.core.keepaliveManager = null;
+    connect.storageAccess.resetStorageAccessState();
     connect.agent.initialized = false;
     connect.core.initialized = false;
   };
@@ -30514,6 +30515,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;// AWS SDK for JavaScript v2.1377.0
     storageParams = {};
     originalCCPUrl = '';
     rsaContainer = null;
+    onGrantCallbackInvoked = false;
   };
 
   /**
@@ -30777,6 +30779,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;// AWS SDK for JavaScript v2.1377.0
     getRequestStorageAccessUrl,
     storageAccessEvents,
     resetStorageAccessState,
+    getOnGrantCallbackInvoked: () => onGrantCallbackInvoked,
     getStorageAccessParams: () => storageParams,
     onRequest: onRequestHandler,
     request: () => {

diff --git a/src/core.js b/src/core.js
@@ -417,6 +417,7 @@
     connect.core.softphoneManager = null;
     connect.core.upstream = null;
     connect.core.keepaliveManager = null;
+    connect.storageAccess.resetStorageAccessState();
     connect.agent.initialized = false;
     connect.core.initialized = false;
   };

diff --git a/src/request-storage-access.js b/src/request-storage-access.js
@@ -82,6 +82,7 @@
     storageParams = {};
     originalCCPUrl = '';
     rsaContainer = null;
+    onGrantCallbackInvoked = false;
   };
 
   /**
@@ -345,6 +346,7 @@
     getRequestStorageAccessUrl,
     storageAccessEvents,
     resetStorageAccessState,
+    getOnGrantCallbackInvoked: () => onGrantCallbackInvoked,
     getStorageAccessParams: () => storageParams,
     onRequest: onRequestHandler,
     request: () => {

diff --git a/test/unit/core.spec.js b/test/unit/core.spec.js
@@ -2114,16 +2114,25 @@ describe('Core', function () {
         });
 
         it("Check if CCP is initialized after calling terminate function and re-calling initCCP", function () {
+            const storageAccessOriginal = connect.storageAccess;
+            connect.storageAccess = { ...connect.storageAccess, resetStorageAccessState: sinon.fake()};
+
             expect(params.ccpUrl).not.to.be.a("null");
             expect(containerDiv).not.to.be.a("null");
             connect.core.initCCP(containerDiv, params);
             expect(isCCPInitialized(containerDiv, params)).to.be.true;
+
             connect.core.terminate();
+            expect(connect.storageAccess.resetStorageAccessState.calledOnce).to.be.true;
+
             connect.core.terminate();
+            expect(connect.storageAccess.resetStorageAccessState.calledTwice).to.be.true;
+
             expect(isCCPTerminated()).to.be.true;
             sandbox.resetHistory();
             connect.core.initCCP(containerDiv, params);
             expect(isCCPInitialized(containerDiv, params)).to.be.true;
+            connect.storageAccess = storageAccessOriginal;
         });
 
     });

diff --git a/test/unit/request-storage-access.spec.js b/test/unit/request-storage-access.spec.js
@@ -192,6 +192,7 @@ describe('Request Storage Access module', () => {
       });
 
       connect.storageAccess.init(ccpUrl, container);
+      expect(connect.storageAccess.getOnGrantCallbackInvoked()).to.be.false;
       connect.storageAccess.setupRequestHandlers({ onGrant: onGrantSpy });
       connect.storageAccess.request();
 
@@ -202,10 +203,14 @@ describe('Request Storage Access module', () => {
       expect(storageAccessRequestArgs.data.landat).to.be.equals('/connect/ccp-v2');
 
       expect(onGrantSpy.called).to.be.true;
+      expect(connect.storageAccess.getOnGrantCallbackInvoked()).to.be.true;
       connect.storageAccess.request();
 
       /** Should be called only once */
       expect(onGrantSpy.calledTwice).not.to.be.true;
+
+      connect.storageAccess.resetStorageAccessState();
+      expect(connect.storageAccess.getOnGrantCallbackInvoked()).to.be.false;
     });
 
     it('Should hide container if mode is custom after granting access', () => {