paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel: Stop monkey-patching password change counts into XHR objects.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-08-18 17:46:59 -07:00
committed by Tim Abbott
parent fde9b1d366
commit c84f35644d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
static/js/channel.js
View File

@@ -14,7 +14,6 @@ export function set_password_change_in_progress(value) {
password_changes += 1; password_changes += 1;
} }
} }
export const xhr_password_changes = new WeakMap();
const pending_requests = []; const pending_requests = [];
@@ -47,6 +46,12 @@ function call(args) {
return undefined; return undefined;
} }
// Remember the number of completed password changes when the
// request was initiated. This allows us to detect race
// situations where a password change occurred before we got a
// response that failed due to the ongoing password change.
const orig_password_changes = password_changes;
// Wrap the error handlers to reload the page if we get a CSRF error // Wrap the error handlers to reload the page if we get a CSRF error
// (What probably happened is that the user logged out in another tab). // (What probably happened is that the user logged out in another tab).
let orig_error = args.error; let orig_error = args.error;
@@ -66,7 +71,7 @@ function call(args) {
} }
if (xhr.status === 401) { if (xhr.status === 401) {
if (password_change_in_progress || xhr.password_changes !== password_changes) { if (password_change_in_progress || orig_password_changes !== password_changes) {
// The backend for handling password change API requests // The backend for handling password change API requests
// will replace the user's session; this results in a // will replace the user's session; this results in a
// brief race where any API request will fail with a 401 // brief race where any API request will fail with a 401
@@ -134,12 +139,6 @@ function call(args) {
const jqXHR = $.ajax(args); const jqXHR = $.ajax(args);
add_pending_request(jqXHR); add_pending_request(jqXHR);
// Remember the number of completed password changes when the
// request was initiated. This allows us to detect race
// situations where a password change occurred before we got a
// response that failed due to the ongoing password change.
jqXHR.password_changes = password_changes;
return jqXHR; return jqXHR;
} }