OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Also clear data when the deviceId doesn't match 

When the HS implementation doesn't respect the device_id parameter erroneously
pull/21833/head
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) {
const oldUserId = MatrixClientPeg.get().getUserId();
const oldDeviceId = MatrixClientPeg.get().getDeviceId();
stopMatrixClient(); // unsets MatrixClientPeg.get()
localStorage.removeItem("mx_soft_logout");
_isLoggingOut = false;
const overwrite = credentials.userId !== oldUserId;
const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
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);