From d58451694751a28df2e354aae4d20a8df6a8e041 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 25 Nov 2020 15:45:03 -0500
Subject: [PATCH] fix: #8943, session mismatch modal thrown on login (race
 condition)

---
 public/src/app.js          | 2 +-
 public/src/client/login.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/src/app.js b/public/src/app.js
index 68ec9adf6f..4bec1e1e69 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -194,7 +194,7 @@ app.cacheBuster = null;
 	};
 
 	app.handleInvalidSession = function () {
-		if (app.flags._logout) {
+		if (app.flags._login || app.flags._logout) {
 			return;
 		}
 
diff --git a/public/src/client/login.js b/public/src/client/login.js
index 20ff9c8eba..91a69c3166 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -29,6 +29,9 @@ define('forum/login', ['jquery-form'], function () {
 					headers: {
 						'x-csrf-token': config.csrf_token,
 					},
+					beforeSend: function () {
+						app.flags._login = true;
+					},
 					success: function (data) {
 						$(window).trigger('action:app.loggedIn', data);
 						var pathname = utils.urlToLocation(data.next).pathname;