fix(reload): Preserve URL params on reload/redirect.

conference.js

 
 import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
 
-import { reload, reportError } from './modules/util/helpers';
+import { reportError } from './modules/util/helpers';
 
 import * as RemoteControlEvents
     from './service/remotecontrol/RemoteControlEvents';
     initAnalytics,
     sendAnalytics
 } from './react/features/analytics';
+import {
+    redirectWithStoredParams,
+    reloadWithStoredParams
+} from './react/features/app';
 
 import EventEmitter from 'events';
 
         // save whether current user is guest or not, before navigating
         // to close page
         window.sessionStorage.setItem('guest', isGuest);
-        assignWindowLocationPathname(`static/${
+        redirectToStaticPage(`static/${
             options.feedbackSubmitted ? 'close.html' : 'close2.html'}`);
 
         return;
     if (config.enableWelcomePage) {
         setTimeout(
             () => {
-                assignWindowLocationPathname('./');
+                APP.store.dispatch(redirectWithStoredParams('/'));
             },
             3000);
     }
  * assigning it to window.location.pathname.
  * @return {void}
  */
-function assignWindowLocationPathname(pathname) {
+function redirectToStaticPage(pathname) {
     const windowLocation = window.location;
     let newPathname = pathname;
 
 
         case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
             // let's show some auth not allowed page
-            assignWindowLocationPathname('static/authError.html');
+            redirectToStaticPage('static/authError.html');
             break;
         }
 
             break;
 
         case JitsiConferenceErrors.INCOMPATIBLE_SERVER_VERSIONS:
-            reload();
+            APP.store.dispatch(reloadWithStoredParams());
             break;
 
         default:

modules/UI/authentication/AuthHandler.js

  * @param {string} [roomName] the name of the conference room.
  */
 function redirectToTokenAuthService(roomName) {
+    // FIXME: This method will not preserve the other URL params that were
+    // originally passed.
     UIUtil.redirect(getTokenAuthUrl(roomName, false));
 }
 

modules/UI/util/UIUtil.js

         }
     },
 
+    /**
+     * Redirects to a given URL.
+     *
+     * @param {string} url - The redirect URL.
+     * NOTE: Currently used to redirect to 3rd party location for
+     * authentication. In most cases redirectWithStoredParams action must be
+     * used instead of this method in order to preserve curent URL params.
+     */
     redirect(url) {
         window.location.href = url;
     },

modules/util/helpers.js

     return deferred;
 }
 
-/**
- * Reload page.
- */
-export function reload() {
-    window.location.reload();
-}
-
-/**
- * Redirects to a specific new URL by replacing the current location (in the
- * history).
- *
- * @param {string} url the URL pointing to the location where the user should
- * be redirected to.
- */
-export function replace(url) {
-    window.location.replace(url);
-}
-
 /**
  * Prints the error and reports it to the global error handler.
  *

react/features/app/actions.js

         _appNavigateToOptionalLocation(dispatch, getState, parseURIString(uri));
 }
 
+/**
+ * Redirects to another page generated by replacing the path in the original URL
+ * with the given path.
+ *
+ * @param {(string)} pathname - The path to navigate to.
+ * @returns {Function}
+ */
+export function redirectWithStoredParams(pathname: string) {
+    return (dispatch: Dispatch<*>, getState: Function) => {
+        const { locationURL } = getState()['features/base/connection'];
+        const newLocationURL = new URL(locationURL.href);
+
+        newLocationURL.pathname = pathname;
+        window.location.assign(newLocationURL.toString());
+    };
+}
+
+/**
+ * Reloads the page by restoring the original URL.
+ *
+ * @returns {Function}
+ */
+export function reloadWithStoredParams() {
+    return (dispatch: Dispatch<*>, getState: Function) => {
+        const { locationURL } = getState()['features/base/connection'];
+        const windowLocation = window.location;
+        const oldSearchString = windowLocation.search;
+
+        windowLocation.replace(locationURL.toString());
+
+        if (window.self !== window.top
+            && locationURL.search === oldSearchString) {
+            // NOTE: Assuming that only the hash or search part of the URL will
+            // be changed!
+            // location.reload will not trigger redirect/reload for iframe when
+            // only the hash params are changed. That's why we need to call
+            // reload in addition to replace.
+            windowLocation.reload();
+        }
+    };
+}
+
 /**
  * Triggers an in-app navigation to a specific location URI.
  *

react/features/overlay/actions.js

-import { appNavigate } from '../app';
+import { appNavigate, reloadWithStoredParams } from '../app';
 import { toURLString } from '../base/util';
-import { reload, replace } from '../../../modules/util/helpers';
 
 import {
     MEDIA_PERMISSION_PROMPT_VISIBILITY_CHANGED,
 
         if (navigator.product === 'ReactNative') {
             dispatch(appNavigate(toURLString(locationURL)));
-        } else if (window.self === window.top) {
-            replace(locationURL);
         } else {
-            // In an iframe reload with the reload() utility because the
-            // replace() utility does not work on an iframe.
-            reload();
+            dispatch(reloadWithStoredParams());
         }
     };
 }