Skip to content

Commit

Permalink
Merge pull request #1345 from creative-commoners/pulls/1.10/xreauthen…
Browse files Browse the repository at this point in the history
…ticate

FIX Do not reverse state change when reauthenticating
  • Loading branch information
sabina-talipova authored Aug 21, 2022
2 parents 4aefd49 + 6161caf commit ba9477b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/legacy/LeftAndMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ $.entwine('ss', function($) {
.fail((xhr, status, error) => {
// Ignoring aborts: The server request failed, so prevent a mixed UI state by rolling back to previously
// succesfully loaded URL (consistent with currently loaded content).
if (xhr.readyState !== 0) {
if (xhr.readyState !== 0 && xhr.getResponseHeader('X-Reauthenticate') !== '1') {
this.reverseStateChange();
}
})
Expand Down
9 changes: 2 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3074,15 +3074,10 @@ colormin@^1.0.5:
css-color-names "0.0.4"
has "^1.0.1"

colors@^1.1.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==

colors@~1.1.2:
[email protected], colors@^1.1.2, colors@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==

columnify@~1.5.4:
version "1.5.4"
Expand Down

0 comments on commit ba9477b

Please sign in to comment.