Skip to content

Commit a68bfee

Browse files
authored
fix: Revert "fix: prevent session-expired redirect after logout(WPB-20547) (#19605)" (#19671)
This reverts commit 3bbfdd7.
1 parent a77a4ca commit a68bfee

File tree

3 files changed

+3
-47
lines changed

3 files changed

+3
-47
lines changed

src/script/main/app.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import {PropertiesService} from 'Repositories/properties/PropertiesService';
8080
import {SearchRepository} from 'Repositories/search/SearchRepository';
8181
import {SelfRepository} from 'Repositories/self/SelfRepository';
8282
import {SelfService} from 'Repositories/self/SelfService';
83-
import {StorageKey, StorageRepository, StorageService} from 'Repositories/storage';
83+
import {StorageRepository, StorageService} from 'Repositories/storage';
8484
import {TeamRepository} from 'Repositories/team/TeamRepository';
8585
import {TeamService} from 'Repositories/team/TeamService';
8686
import {EventTrackingRepository} from 'Repositories/tracking/EventTrackingRepository';
@@ -91,7 +91,6 @@ import {DebugUtil} from 'Util/DebugUtil';
9191
import {Environment} from 'Util/Environment';
9292
import {t} from 'Util/LocalizerUtil';
9393
import {getLogger, Logger} from 'Util/Logger';
94-
import {loadValue, resetStoreValue} from 'Util/StorageUtil';
9594
import {durationFrom, formatCoarseDuration, TIME_IN_MILLIS} from 'Util/TimeUtil';
9695
import {AppInitializationStep, checkIndexedDb, InitializationEventLogger} from 'Util/util';
9796

@@ -376,7 +375,7 @@ export class App {
376375
* @param config
377376
* @param onProgress
378377
*/
379-
async initApp(clientType: ClientType, onProgress: (message?: string) => void): Promise<User | undefined> {
378+
async initApp(clientType: ClientType, onProgress: (message?: string) => void) {
380379
// add body information
381380
const startTime = Date.now();
382381
await updateApiVersion();
@@ -407,19 +406,6 @@ export class App {
407406

408407
telemetry.timeStep(AppInitTimingsStep.RECEIVED_ACCESS_TOKEN);
409408

410-
const showLoginAfterLogout = Boolean(loadValue<boolean>(StorageKey.AUTH.SHOW_LOGIN));
411-
resetStoreValue(StorageKey.AUTH.SHOW_LOGIN);
412-
413-
if (showLoginAfterLogout) {
414-
const hasAuthenticatedSession = this.apiClient.transport?.http?.hasValidAccessToken?.() ?? false;
415-
416-
if (!hasAuthenticatedSession) {
417-
this.logger.info('User flagged as logged out without an authenticated session. Redirecting to login.');
418-
this.repository.lifeCycle.redirectToLogin(SIGN_OUT_REASON.NOT_SIGNED_IN);
419-
return undefined;
420-
}
421-
}
422-
423409
let selfUser: User;
424410

425411
try {

src/script/repositories/LifeCycleRepository/LifeCycleRepository.test.ts

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Wire
3-
* Copyright (C) 2025 Wire Swiss GmbH
3+
* Copyright (C) 2018 Wire Swiss GmbH
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -17,11 +17,6 @@
1717
*
1818
*/
1919

20-
jest.mock('Util/StorageUtil', () => ({
21-
storeValue: jest.fn(),
22-
resetStoreValue: jest.fn(),
23-
}));
24-
2520
import {amplify} from 'amplify';
2621

2722
import {WebAppEvents} from '@wireapp/webapp-events';
@@ -35,7 +30,6 @@ import type {EventRepository} from 'Repositories/event/EventRepository';
3530
import {StorageKey} from 'Repositories/storage/StorageKey';
3631
import type {StorageRepository} from 'Repositories/storage/StorageRepository';
3732
import type {UserRepository} from 'Repositories/user/UserRepository';
38-
import {storeValue, resetStoreValue} from 'Util/StorageUtil';
3933

4034
import {LifeCycleRepository, doSimpleRedirect, type LifeCycleDependencies} from './LifeCycleRepository';
4135

@@ -605,22 +599,6 @@ describe('LifeCycleRepository', () => {
605599

606600
expect(mockDependencies.eventRepository.disconnectWebSocket).toHaveBeenCalled();
607601
});
608-
609-
it('sets SHOW_LOGIN flag on USER_REQUESTED logout', async () => {
610-
(mockDependencies.clientRepository.isCurrentClientPermanent as jest.Mock).mockReturnValue(true);
611-
612-
await lifeCycleRepository.logout(SIGN_OUT_REASON.USER_REQUESTED, true);
613-
614-
expect(storeValue).toHaveBeenCalledWith(StorageKey.AUTH.SHOW_LOGIN, true);
615-
});
616-
617-
it('resets SHOW_LOGIN flag on non USER_REQUESTED logout like SESSION_EXPIRED)', async () => {
618-
(mockDependencies.clientRepository.isCurrentClientPermanent as jest.Mock).mockReturnValue(true);
619-
620-
await lifeCycleRepository.logout(SIGN_OUT_REASON.SESSION_EXPIRED, false);
621-
622-
expect(resetStoreValue).toHaveBeenCalledWith(StorageKey.AUTH.SHOW_LOGIN);
623-
});
624602
});
625603

626604
describe('state management', () => {

src/script/repositories/LifeCycleRepository/LifeCycleRepository.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {StorageKey} from 'Repositories/storage/StorageKey';
3030
import type {StorageRepository} from 'Repositories/storage/StorageRepository';
3131
import type {UserRepository} from 'Repositories/user/UserRepository';
3232
import {getLogger, Logger} from 'Util/Logger';
33-
import {resetStoreValue, storeValue} from 'Util/StorageUtil';
3433
import {includesString} from 'Util/StringUtil';
3534
import {appendParameter} from 'Util/UrlUtil';
3635

@@ -130,13 +129,6 @@ export class LifeCycleRepository {
130129
}
131130
this.isCurrentlyLoggingOut = true;
132131

133-
const isUserRequestedLogout = signOutReason === SIGN_OUT_REASON.USER_REQUESTED;
134-
if (isUserRequestedLogout) {
135-
storeValue(StorageKey.AUTH.SHOW_LOGIN, true);
136-
} else {
137-
resetStoreValue(StorageKey.AUTH.SHOW_LOGIN);
138-
}
139-
140132
// Helper function to notify about logout completion and redirect
141133
const completeLogoutAndRedirect = (): void => {
142134
this.logger.info(

0 commit comments

Comments
 (0)