Page MenuHomePhabricator
Files F3351793

D10801.id36093.diff
No OneTemporary
Actions

D10801.id36093.diff
View Options

diff --git a/lib/utils/reducer-utils.test.js b/lib/utils/reducer-utils.test.js
new file mode 100644
--- /dev/null
+++ b/lib/utils/reducer-utils.test.js
@@ -0,0 +1,158 @@
+// @flow
+
+import { defaultNotifPermissionAlertInfo } from './push-alerts.js';
+import { sanitizeStateOnIdentityActions } from './reducers-utils.js';
+import { ashoatKeyserverID } from './validation-utils.js';
+import { defaultWebEnabledApps } from '../types/enabled-apps.js';
+import { defaultCalendarFilters } from '../types/filter-types.js';
+import { defaultKeyserverInfo } from '../types/keyserver-types.js';
+import { defaultGlobalThemeInfo } from '../types/theme-types.js';
+
+describe('sanitizeStateOnIdentityActions', () => {
+ let defaultState;
+ let state;
+ beforeAll(() => {
+ defaultState = {
+ navInfo: {
+ activeChatThreadID: null,
+ startDate: '',
+ endDate: '',
+ tab: 'chat',
+ },
+ currentUserInfo: null,
+ draftStore: { drafts: {} },
+ entryStore: {
+ entryInfos: {},
+ daysToEntries: {},
+ lastUserInteractionCalendar: 0,
+ },
+ threadStore: {
+ threadInfos: {},
+ },
+ userStore: {
+ userInfos: {},
+ },
+ messageStore: {
+ messages: {},
+ threads: {},
+ local: {},
+ currentAsOf: { [ashoatKeyserverID]: 0 },
+ },
+ windowActive: true,
+ pushApiPublicKey: null,
+ cryptoStore: null,
+ loadingStatuses: {},
+ calendarFilters: defaultCalendarFilters,
+ dataLoaded: false,
+ notifPermissionAlertInfo: defaultNotifPermissionAlertInfo,
+ watchedThreadIDs: [],
+ lifecycleState: 'active',
+ enabledApps: defaultWebEnabledApps,
+ reportStore: {
+ enabledReports: {
+ crashReports: false,
+ inconsistencyReports: false,
+ mediaReports: false,
+ },
+ queuedReports: [],
+ },
+ nextLocalID: 0,
+ _persist: null,
+ userPolicies: {},
+ commServicesAccessToken: null,
+ inviteLinksStore: {
+ links: {},
+ },
+ actualizedCalendarQuery: {
+ startDate: '',
+ endDate: '',
+ filters: defaultCalendarFilters,
+ },
+ communityPickerStore: { chat: null, calendar: null },
+ keyserverStore: {
+ keyserverInfos: {
+ [ashoatKeyserverID]: defaultKeyserverInfo('url'),
+ },
+ },
+ threadActivityStore: {},
+ initialStateLoaded: false,
+ integrityStore: { threadHashes: {}, threadHashingStatus: 'starting' },
+ globalThemeInfo: defaultGlobalThemeInfo,
+ customServer: null,
+ };
+ state = {
+ ...defaultState,
+ globalThemeInfo: {
+ activeTheme: 'light',
+ preference: 'light',
+ systemTheme: null,
+ },
+ communityPickerStore: { chat: '256|1', calendar: '256|1' },
+ nextLocalID: 9,
+ navInfo: {
+ activeChatThreadID: null,
+ startDate: '2023-02-02',
+ endDate: '2023-03-02',
+ tab: 'calendar',
+ },
+ };
+ });
+ it("doesn't sanitize fields named in fieldsToExcludeFromSanitization", () => {
+ const fieldsToExcludeFromSanitization = [
+ 'globalThemeInfo',
+ 'communityPickerStore',
+ 'nextLocalID',
+ 'navInfo',
+ ];
+
+ expect(
+ sanitizeStateOnIdentityActions(
+ state,
+ {
+ type: 'LOG_OUT_SUCCESS',
+ payload: {
+ currentUserInfo: { anonymous: true },
+ keyserverIDs: [],
+ preRequestUserState: {
+ currentUserInfo: { id: '5', username: 'hi' },
+ cookiesAndSessions: {},
+ },
+ },
+ loadingInfo: {
+ fetchIndex: 0,
+ trackMultipleRequests: false,
+ customKeyName: null,
+ },
+ },
+ defaultState,
+ fieldsToExcludeFromSanitization,
+ ),
+ ).toEqual(state);
+ });
+
+ it('sanitizes fields not named in fieldsToExcludeFromSanitization', () => {
+ expect(
+ sanitizeStateOnIdentityActions(
+ state,
+ {
+ type: 'LOG_OUT_SUCCESS',
+ payload: {
+ currentUserInfo: { anonymous: true },
+ keyserverIDs: [],
+ preRequestUserState: {
+ currentUserInfo: { id: '5', username: 'hi' },
+ cookiesAndSessions: {},
+ },
+ },
+ loadingInfo: {
+ fetchIndex: 0,
+ trackMultipleRequests: false,
+ customKeyName: null,
+ },
+ },
+ defaultState,
+ [],
+ ),
+ ).toEqual(defaultState);
+ });
+});
diff --git a/lib/utils/reducers-utils.js b/lib/utils/reducers-utils.js
new file mode 100644
--- /dev/null
+++ b/lib/utils/reducers-utils.js
@@ -0,0 +1,44 @@
+// @flow
+
+import {
+ deleteAccountActionTypes,
+ logOutActionTypes,
+ tempIdentityLoginActionTypes,
+} from '../actions/user-actions.js';
+import type { BaseNavInfo } from '../types/nav-types.js';
+import type { BaseAction, BaseAppState } from '../types/redux-types.js';
+
+function sanitizeStateOnIdentityActions<
+ N: BaseNavInfo,
+ T: BaseAppState<N>,
+ A: BaseAction,
+>(
+ state: T,
+ action: A,
+ defaultState: T,
+ fieldsToExcludeFromSanitization: $ReadOnlyArray<string>,
+): T {
+ if (
+ action.type !== logOutActionTypes.success &&
+ action.type !== deleteAccountActionTypes.success &&
+ action.type !== tempIdentityLoginActionTypes.success
+ ) {
+ return state;
+ }
+
+ const fieldsToExcludeFromSanitizationSet = new Set<string>(
+ fieldsToExcludeFromSanitization,
+ );
+
+ return Object.keys(state).reduce(
+ (newState, key: string) => {
+ if (fieldsToExcludeFromSanitizationSet.has(key)) {
+ return { ...newState, [key]: state[key] };
+ }
+ return newState;
+ },
+ { ...defaultState },
+ );
+}
+
+export { sanitizeStateOnIdentityActions };

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 3:37 AM (20 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2573728
Default Alt Text
D10801.id36093.diff (5 KB)

Event Timeline