diff --git a/lib/reducers/report-store-reducer.js b/lib/reducers/report-store-reducer.js --- a/lib/reducers/report-store-reducer.js +++ b/lib/reducers/report-store-reducer.js @@ -29,6 +29,7 @@ import { setNewSessionActionType } from '../utils/action-utils.js'; import { isDev } from '../utils/dev-utils.js'; import { isReportEnabled } from '../utils/report-utils.js'; +import { usingCommServicesAccessToken } from '../utils/services-utils.js'; export const updateReportsEnabledActionType = 'UPDATE_REPORTS_ENABLED'; @@ -79,29 +80,33 @@ (action.type === setNewSessionActionType && action.payload.sessionChange.cookieInvalidated) ) { - return { - reportStore: { - queuedReports: [], - enabledReports: isDev - ? defaultDevEnabledReports - : defaultEnabledReports, - }, - reportStoreOperations: [{ type: 'remove_all_reports' }], - }; + if (!usingCommServicesAccessToken) { + return { + reportStore: { + queuedReports: [], + enabledReports: isDev + ? defaultDevEnabledReports + : defaultEnabledReports, + }, + reportStoreOperations: [{ type: 'remove_all_reports' }], + }; + } } else if ( action.type === logInActionTypes.success || action.type === siweAuthActionTypes.success ) { - return { - reportStore: { - queuedReports: [], - enabledReports: - isStaff(action.payload.currentUserInfo.id) || isDev - ? defaultDevEnabledReports - : defaultEnabledReports, - }, - reportStoreOperations: [{ type: 'remove_all_reports' }], - }; + if (!usingCommServicesAccessToken) { + return { + reportStore: { + queuedReports: [], + enabledReports: + isStaff(action.payload.currentUserInfo.id) || isDev + ? defaultDevEnabledReports + : defaultEnabledReports, + }, + reportStoreOperations: [{ type: 'remove_all_reports' }], + }; + } } else if ( (action.type === sendReportActionTypes.success || action.type === sendReportsActionTypes.success) &&