Fix loginpopup behavior (#384)

Fix issue with popup opening in new tab and not new window
amazon-connect · Mar 19, 2021 · 0661df6 · 0661df6
1 parent b554018
commit 0661df6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -56,4 +56,4 @@
     "sinon": "^9.0.0",
     "typescript": "3.0.1"
   }
-}
+}
diff --git a/release/connect-streams.js b/release/connect-streams.js
@@ -26106,7 +26106,7 @@
           if (params.loginUrl) {
              connect.core.getPopupManager().clear(connect.MasterTopics.LOGIN_POPUP);
           }
-          connect.core.loginWindow = connect.core.getPopupManager().open(loginUrl, connect.MasterTopics.LOGIN_POPUP);
+          connect.core.loginWindow = connect.core.getPopupManager().open(loginUrl, connect.MasterTopics.LOGIN_POPUP, params.loginOptions);
 
         } catch (e) {
           connect.getLog().error("ACK_TIMEOUT occurred but we are unable to open the login popup.").withException(e).sendInternalLogToServer();
@@ -26124,9 +26124,10 @@
           global.clearInterval(connect.core.iframeRefreshInterval);
           connect.core.iframeRefreshInterval = null;
           connect.core.getPopupManager().clear(connect.MasterTopics.LOGIN_POPUP);
-          if (params.loginPopupAutoClose && connect.core.loginWindow) {
-            connect.core.loginWindow.close();
-            connect.core.loginWindow = null;
+          if ((params.loginPopupAutoClose || (params.loginOptions && params.loginOptions.autoClose)) && 
+            connect.core.loginWindow) {
+              connect.core.loginWindow.close();
+              connect.core.loginWindow = null;
           }
         });
       }

diff --git a/src/core.js b/src/core.js
@@ -787,8 +787,8 @@
           if (params.loginUrl) {
              connect.core.getPopupManager().clear(connect.MasterTopics.LOGIN_POPUP);
           }
-          connect.core.loginWindow = connect.core.getPopupManager().open(loginUrl, connect.MasterTopics.LOGIN_POPUP);
- 
+          connect.core.loginWindow = connect.core.getPopupManager().open(loginUrl, connect.MasterTopics.LOGIN_POPUP, params.loginOptions);
+
         } catch (e) {
           connect.getLog().error("ACK_TIMEOUT occurred but we are unable to open the login popup.").withException(e).sendInternalLogToServer();
         }
@@ -805,7 +805,8 @@
           global.clearInterval(connect.core.iframeRefreshInterval);
           connect.core.iframeRefreshInterval = null;
           connect.core.getPopupManager().clear(connect.MasterTopics.LOGIN_POPUP);
-          if (params.loginPopupAutoClose && connect.core.loginWindow) {
+        if ((params.loginPopupAutoClose || (params.loginOptions && params.loginOptions.autoClose)) && 
+              connect.core.loginWindow) {
             connect.core.loginWindow.close();
             connect.core.loginWindow = null;
           }
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,4 @@ @@
         "sinon": "^9.0.0",
         "typescript": "3.0.1"
       }
-    }
+    }