PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Also clear data when the deviceId doesn't match

Browse source 
When the HS implementation doesn't respect the device_id parameter erroneously
This commit is contained in:
Travis Ralston 2019-07-08 15:35:34 -06:00
parent fca4ebcd72
commit 8ebc03706a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Lifecycle.js
View file

@ -357,14 +357,15 @@ export function setLoggedIn(credentials) {
*/ */
export function hydrateSession(credentials) { export function hydrateSession(credentials) {
const oldUserId = MatrixClientPeg.get().getUserId(); const oldUserId = MatrixClientPeg.get().getUserId();
const oldDeviceId = MatrixClientPeg.get().getDeviceId();
stopMatrixClient(); // unsets MatrixClientPeg.get() stopMatrixClient(); // unsets MatrixClientPeg.get()
localStorage.removeItem("mx_soft_logout"); localStorage.removeItem("mx_soft_logout");
_isLoggingOut = false; _isLoggingOut = false;
const overwrite = credentials.userId !== oldUserId; const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
if (overwrite) { if (overwrite) {
console.warn("Rehydrating the user's session with a different user's - clearing all data"); console.warn("Clearing all data: Old session belongs to a different user/device");
} }
return _doSetLoggedIn(credentials, overwrite); return _doSetLoggedIn(credentials, overwrite);