toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix issue when logout is called several times for the same server (#7666)

Browse source
This commit is contained in:
Daniel Espino García 2023-11-27 10:50:40 +01:00 committed by GitHub
parent 59a69368bf
commit 46125b201f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/managers/session_manager.ts
View file

@ -35,7 +35,7 @@ type LogoutCallbackArg = {
class SessionManager {
private previousAppState: AppStateStatus;
private scheduling = false;
private terminatingSessionUrl: undefined|string;
private terminatingSessionUrl = new Set<string>();
constructor() {
if (Platform.OS === 'android') {
@ -162,9 +162,11 @@ class SessionManager {
};
private onLogout = async ({serverUrl, removeServer}: LogoutCallbackArg) => {
if (this.terminatingSessionUrl === serverUrl) {
if (this.terminatingSessionUrl.has(serverUrl)) {
return;
}
this.terminatingSessionUrl.add(serverUrl);
const activeServerUrl = await DatabaseManager.getActiveServerUrl();
const activeServerDisplayName = await DatabaseManager.getActiveServerDisplayName();
@ -190,10 +192,11 @@ class SessionManager {
relaunchApp({launchType, serverUrl, displayName});
}
this.terminatingSessionUrl.delete(serverUrl);
};
private onSessionExpired = async (serverUrl: string) => {
this.terminatingSessionUrl = serverUrl;
this.terminatingSessionUrl.add(serverUrl);
await logout(serverUrl, false, false, true);
await this.terminateSession(serverUrl, false);
@ -206,7 +209,7 @@ class SessionManager {
} else {
EphemeralStore.theme = undefined;
}
this.terminatingSessionUrl = undefined;
this.terminatingSessionUrl.delete(serverUrl);
};
}