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

Merge pull request #3189 from matrix-org/travis/soft-logout-overwrite

Browse source 
Overwrite the old session if the new creds are for a different user
This commit is contained in:
Travis Ralston 2019-07-09 11:43:31 -06:00 committed by GitHub
commit 4c5a7d4787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Lifecycle.js
View file

@ -348,15 +348,27 @@ export function setLoggedIn(credentials) {
* new one in its place. This additionally starts all other react-sdk services * new one in its place. This additionally starts all other react-sdk services
* which use the new Matrix client. * which use the new Matrix client.
* *
* If the credentials belong to a different user from the session already stored,
* the old session will be cleared automatically.
*
* @param {MatrixClientCreds} credentials The credentials to use * @param {MatrixClientCreds} credentials The credentials to use
* *
* @returns {Promise} promise which resolves to the new MatrixClient once it has been started * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
*/ */
export function hydrateSession(credentials) { export function hydrateSession(credentials) {
stopMatrixClient(); const oldUserId = MatrixClientPeg.get().getUserId();
const oldDeviceId = MatrixClientPeg.get().getDeviceId();
stopMatrixClient(); // unsets MatrixClientPeg.get()
localStorage.removeItem("mx_soft_logout"); localStorage.removeItem("mx_soft_logout");
_isLoggingOut = false; _isLoggingOut = false;
return _doSetLoggedIn(credentials, false);
const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
if (overwrite) {
console.warn("Clearing all data: Old session belongs to a different user/device");
}
return _doSetLoggedIn(credentials, overwrite);
} }
/** /**