Remove "on_logging_in" action

Signed-off-by: Mikhail Aheichyk <[email protected]>

Author: maheichyk

src/Lifecycle.ts

@@ -73,9 +73,8 @@ dis.register((payload) => {
         onLoggedOut();
     } else if (payload.action === Action.OverwriteLogin) {
         const typed = <OverwriteLoginPayload>payload;
-        // is invoked without dispatching of "on_logging_in"
         // noinspection JSIgnoredPromiseFromCall - we don't care if it fails
-        doSetLoggedIn(typed.credentials, true, false);
+        doSetLoggedIn(typed.credentials, true);
     }
 });
 
@@ -569,19 +568,15 @@ export async function hydrateSession(credentials: IMatrixClientCreds): Promise<M
 }
 
 /**
- * fires on_logging_in, optionally clears localstorage, persists new credentials
+ * optionally clears localstorage, persists new credentials
  * to localstorage, starts the new client.
  *
  * @param {IMatrixClientCreds} credentials
  * @param {Boolean} clearStorageEnabled
- * @param {Boolean} dispatchOnLoggingIn if true then "on_logging_in" is dispatched
+ *
  * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
  */
-async function doSetLoggedIn(
-    credentials: IMatrixClientCreds,
-    clearStorageEnabled: boolean,
-    dispatchOnLoggingIn = true,
-): Promise<MatrixClient> {
+async function doSetLoggedIn(credentials: IMatrixClientCreds, clearStorageEnabled: boolean): Promise<MatrixClient> {
     credentials.guest = Boolean(credentials.guest);
 
     const softLogout = isSoftLogout();
@@ -600,20 +595,6 @@ async function doSetLoggedIn(
         " freshLogin: " + credentials.freshLogin,
     );
 
-    // This is dispatched to indicate that the user is still in the process of logging in
-    // because async code may take some time to resolve, breaking the assumption that
-    // `setLoggedIn` takes an "instant" to complete, and dispatch `on_logged_in` a few ms
-    // later than MatrixChat might assume.
-    //
-    // we fire it *synchronously* to make sure it fires before on_logged_in.
-    // (dis.dispatch uses `window.setTimeout`, which does not guarantee ordering.)
-    //
-    // can be disabled to resolve "Cannot dispatch in the middle of a dispatch."
-    // error when it is invoked via another dispatch that is not yet finished.
-    if (dispatchOnLoggingIn) {
-        dis.dispatch({ action: "on_logging_in" }, true);
-    }
-
     if (clearStorageEnabled) {
         await clearStorage();
     }

test/Lifecycle-test.ts

@@ -66,10 +66,10 @@ describe("Lifecycle", () => {
     });
 
     it("should setLoggedIn", async () => {
-        // promise to wait 'on_logging_in'
-        const loggingInPromise = new Promise((resolve, reject) => {
+        // promise to wait 'on_logged_in'
+        const loggedInPromise = new Promise((resolve, reject) => {
             defaultDispatcher.register((payload: ActionPayload) => {
-                if (payload.action === "on_logging_in") {
+                if (payload.action === Action.OnLoggedIn) {
                     resolve(undefined);
                 }
             });
@@ -81,6 +81,6 @@ describe("Lifecycle", () => {
             userId: "@some_user_id",
         });
 
-        await expect(loggingInPromise).resolves.toBeUndefined();
+        await expect(loggedInPromise).resolves.toBeUndefined();
     });
 });