Page MenuHomePhabricator
Differential D10811

[web][native] Remove branching on `minimallyEncoded` in `redux-setup`
ClosedPublic
Actions

Authored by atul on Jan 24 2024, 10:24 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 5:31 AM
Unknown Object (File)
Thu, Apr 3, 10:32 AM
Unknown Object (File)
Feb 21 2025, 7:39 PM
Unknown Object (File)
Feb 16 2025, 11:07 PM
Unknown Object (File)
Jan 31 2025, 3:55 PM
Unknown Object (File)
Jan 31 2025, 3:55 PM
Unknown Object (File)
Jan 31 2025, 3:55 PM
Unknown Object (File)
Jan 31 2025, 3:54 PM
View All 74 Files
Subscribers
None

Details

Reviewers
ashoat
ginsu
tomek
Commits
rCOMM71282321a570: [web][native] Remove branching on `minimallyEncoded` in `redux-setup`
Summary

We no longer need this branching since Redux thread store will always contain minimally encoded threads.

Depends on D10810

Test Plan

flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
redux/
79 lines
web/
redux/
39 lines

Diff 36340

View Options

native/redux/redux-setup.js

// @flow // @flow
import { AppState as NativeAppState, Alert } from 'react-native'; import { AppState as NativeAppState, Alert } from 'react-native';
import { createStore, applyMiddleware, type Store, compose } from 'redux'; import { createStore, applyMiddleware, type Store, compose } from 'redux';
import { persistStore, persistReducer } from 'redux-persist'; import { persistStore, persistReducer } from 'redux-persist';
import thunk from 'redux-thunk'; import thunk from 'redux-thunk';
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { siweAuthActionTypes } from 'lib/actions/siwe-actions.js'; import { siweAuthActionTypes } from 'lib/actions/siwe-actions.js';
import { import {
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
logInActionTypes, logInActionTypes,
keyserverAuthActionTypes, keyserverAuthActionTypes,
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
identityRegisterActionTypes,
} from 'lib/actions/user-actions.js'; } from 'lib/actions/user-actions.js';
import { setNewSessionActionType } from 'lib/keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from 'lib/keyserver-conn/keyserver-conn-types.js';
import type { ThreadStoreOperation } from 'lib/ops/thread-store-ops.js'; import type { ThreadStoreOperation } from 'lib/ops/thread-store-ops.js';
import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js'; import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js';
import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js'; import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js';
import baseReducer from 'lib/reducers/master-reducer.js'; import baseReducer from 'lib/reducers/master-reducer.js';
import { import {
invalidSessionDowngrade, invalidSessionDowngrade,
invalidSessionRecovery, invalidSessionRecovery,
} from 'lib/shared/session-utils.js'; } from 'lib/shared/session-utils.js';
import { isStaff } from 'lib/shared/staff-utils.js'; import { isStaff } from 'lib/shared/staff-utils.js';
import type { Dispatch, BaseAction } from 'lib/types/redux-types.js'; import type { Dispatch, BaseAction } from 'lib/types/redux-types.js';
import { rehydrateActionType } from 'lib/types/redux-types.js'; import { rehydrateActionType } from 'lib/types/redux-types.js';
import type { SetSessionPayload } from 'lib/types/session-types.js'; import type { SetSessionPayload } from 'lib/types/session-types.js';
import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js'; import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js';
import { resetUserSpecificStateOnIdentityActions } from 'lib/utils/reducers-utils.js';
import { ashoatKeyserverID } from 'lib/utils/validation-utils.js'; import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { import {
updateDimensionsActiveType, updateDimensionsActiveType,
updateConnectivityActiveType, updateConnectivityActiveType,
updateDeviceCameraInfoActionType, updateDeviceCameraInfoActionType,
updateDeviceOrientationActionType, updateDeviceOrientationActionType,
backgroundActionTypes, backgroundActionTypes,
setReduxStateActionType, setReduxStateActionType,
setStoreLoadedActionType, setStoreLoadedActionType,
type Action, type Action,
setLocalSettingsActionType, setLocalSettingsActionType,
} from './action-types.js'; } from './action-types.js';
import { defaultState } from './default-state.js'; import { defaultState } from './default-state.js';
import { remoteReduxDevServerConfig } from './dev-tools.js'; import { remoteReduxDevServerConfig } from './dev-tools.js';
import { persistConfig, setPersistor } from './persist.js'; import { persistConfig, setPersistor } from './persist.js';
import { onStateDifference } from './redux-debug-utils.js'; import { onStateDifference } from './redux-debug-utils.js';
import { processDBStoreOperations } from './redux-utils.js'; import { processDBStoreOperations } from './redux-utils.js';
import { nonUserSpecificFieldsNative } from './state-types.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { getGlobalNavContext } from '../navigation/icky-global.js'; import { getGlobalNavContext } from '../navigation/icky-global.js';
import { activeMessageListSelector } from '../navigation/nav-selectors.js'; import { activeMessageListSelector } from '../navigation/nav-selectors.js';
import reactotron from '../reactotron.js'; import reactotron from '../reactotron.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js'; import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js';
import { isStaffRelease } from '../utils/staff-utils.js'; import { isStaffRelease } from '../utils/staff-utils.js';
import { getDevServerHostname } from '../utils/url-utils.js'; import { getDevServerHostname } from '../utils/url-utils.js';
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Linesfunction reducer(state: AppState = defaultState, action: Action) {
if ( if (
(action.type === setNewSessionActionType && (action.type === setNewSessionActionType &&
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.sessionChange.currentUserInfo, action.payload.sessionChange.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
action.payload.keyserverID, action.payload.keyserverID,
)) || )) ||
(action.type === logOutActionTypes.success &&
invalidSessionDowngrade(
state,
action.payload.currentUserInfo,
action.payload.preRequestUserState,
ashoatKeyserverID,
)) ||
(action.type === deleteKeyserverAccountActionTypes.success && (action.type === deleteKeyserverAccountActionTypes.success &&
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.currentUserInfo, action.payload.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
ashoatKeyserverID, ashoatKeyserverID,
)) || ))
(action.type === deleteAccountActionTypes.success && ) {
return {
...state,
loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
};
} else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
if (
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.currentUserInfo, action.payload.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
ashoatKeyserverID, ashoatKeyserverID,
)) )
) { ) {
return { return {
...state, ...state,
loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action), loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
}; };
} }
state = resetUserSpecificStateOnIdentityActions(
state,
defaultState,
nonUserSpecificFieldsNative,
);
} else if (action.type === identityRegisterActionTypes.success) {
state = resetUserSpecificStateOnIdentityActions(
state,
defaultState,
nonUserSpecificFieldsNative,
);
}
if ( if (
(action.type === setNewSessionActionType && (action.type === setNewSessionActionType &&
action.payload.sessionChange.currentUserInfo && action.payload.sessionChange.currentUserInfo &&
invalidSessionRecovery( invalidSessionRecovery(
state, state,
action.payload.sessionChange.currentUserInfo, action.payload.sessionChange.currentUserInfo,
action.payload.logInActionSource, action.payload.logInActionSource,
)) || )) ||
▲ Show 20 Lines • Show All 254 Lines • Show Last 20 Lines
View Options

web/redux/redux-setup.js

// @flow // @flow
import { AppState as NativeAppState, Alert } from 'react-native'; import { AppState as NativeAppState, Alert } from 'react-native';
import { createStore, applyMiddleware, type Store, compose } from 'redux'; import { createStore, applyMiddleware, type Store, compose } from 'redux';
import { persistStore, persistReducer } from 'redux-persist'; import { persistStore, persistReducer } from 'redux-persist';
import thunk from 'redux-thunk'; import thunk from 'redux-thunk';
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { siweAuthActionTypes } from 'lib/actions/siwe-actions.js'; import { siweAuthActionTypes } from 'lib/actions/siwe-actions.js';
import { import {
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
logInActionTypes, logInActionTypes,
keyserverAuthActionTypes, keyserverAuthActionTypes,
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
identityRegisterActionTypes,
} from 'lib/actions/user-actions.js'; } from 'lib/actions/user-actions.js';
import { setNewSessionActionType } from 'lib/keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from 'lib/keyserver-conn/keyserver-conn-types.js';
import type { ThreadStoreOperation } from 'lib/ops/thread-store-ops.js'; import type { ThreadStoreOperation } from 'lib/ops/thread-store-ops.js';
import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js'; import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js';
import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js'; import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js';
import baseReducer from 'lib/reducers/master-reducer.js'; import baseReducer from 'lib/reducers/master-reducer.js';
import { import {
invalidSessionDowngrade, invalidSessionDowngrade,
invalidSessionRecovery, invalidSessionRecovery,
} from 'lib/shared/session-utils.js'; } from 'lib/shared/session-utils.js';
import { isStaff } from 'lib/shared/staff-utils.js'; import { isStaff } from 'lib/shared/staff-utils.js';
import type { Dispatch, BaseAction } from 'lib/types/redux-types.js'; import type { Dispatch, BaseAction } from 'lib/types/redux-types.js';
import { rehydrateActionType } from 'lib/types/redux-types.js'; import { rehydrateActionType } from 'lib/types/redux-types.js';
import type { SetSessionPayload } from 'lib/types/session-types.js'; import type { SetSessionPayload } from 'lib/types/session-types.js';
import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js'; import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js';
import { resetUserSpecificStateOnIdentityActions } from 'lib/utils/reducers-utils.js';
import { ashoatKeyserverID } from 'lib/utils/validation-utils.js'; import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { import {
updateDimensionsActiveType, updateDimensionsActiveType,
updateConnectivityActiveType, updateConnectivityActiveType,
updateDeviceCameraInfoActionType, updateDeviceCameraInfoActionType,
updateDeviceOrientationActionType, updateDeviceOrientationActionType,
backgroundActionTypes, backgroundActionTypes,
setReduxStateActionType, setReduxStateActionType,
setStoreLoadedActionType, setStoreLoadedActionType,
type Action, type Action,
setLocalSettingsActionType, setLocalSettingsActionType,
} from './action-types.js'; } from './action-types.js';
import { defaultState } from './default-state.js'; import { defaultState } from './default-state.js';
import { remoteReduxDevServerConfig } from './dev-tools.js'; import { remoteReduxDevServerConfig } from './dev-tools.js';
import { persistConfig, setPersistor } from './persist.js'; import { persistConfig, setPersistor } from './persist.js';
import { onStateDifference } from './redux-debug-utils.js'; import { onStateDifference } from './redux-debug-utils.js';
import { processDBStoreOperations } from './redux-utils.js'; import { processDBStoreOperations } from './redux-utils.js';
import { nonUserSpecificFieldsNative } from './state-types.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { getGlobalNavContext } from '../navigation/icky-global.js'; import { getGlobalNavContext } from '../navigation/icky-global.js';
import { activeMessageListSelector } from '../navigation/nav-selectors.js'; import { activeMessageListSelector } from '../navigation/nav-selectors.js';
import reactotron from '../reactotron.js'; import reactotron from '../reactotron.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js'; import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js';
import { isStaffRelease } from '../utils/staff-utils.js'; import { isStaffRelease } from '../utils/staff-utils.js';
import { getDevServerHostname } from '../utils/url-utils.js'; import { getDevServerHostname } from '../utils/url-utils.js';
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Linesfunction reducer(state: AppState = defaultState, action: Action) {
if ( if (
(action.type === setNewSessionActionType && (action.type === setNewSessionActionType &&
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.sessionChange.currentUserInfo, action.payload.sessionChange.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
action.payload.keyserverID, action.payload.keyserverID,
)) || )) ||
(action.type === logOutActionTypes.success &&
invalidSessionDowngrade(
state,
action.payload.currentUserInfo,
action.payload.preRequestUserState,
ashoatKeyserverID,
)) ||
(action.type === deleteKeyserverAccountActionTypes.success && (action.type === deleteKeyserverAccountActionTypes.success &&
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.currentUserInfo, action.payload.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
ashoatKeyserverID, ashoatKeyserverID,
)) || ))
(action.type === deleteAccountActionTypes.success && ) {
return {
...state,
loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
};
} else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
if (
invalidSessionDowngrade( invalidSessionDowngrade(
state, state,
action.payload.currentUserInfo, action.payload.currentUserInfo,
action.payload.preRequestUserState, action.payload.preRequestUserState,
ashoatKeyserverID, ashoatKeyserverID,
)) )
) { ) {
return { return {
...state, ...state,
loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action), loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
}; };
} }
state = resetUserSpecificStateOnIdentityActions(
state,
defaultState,
nonUserSpecificFieldsNative,
);
} else if (action.type === identityRegisterActionTypes.success) {
state = resetUserSpecificStateOnIdentityActions(
state,
defaultState,
nonUserSpecificFieldsNative,
);
}
if ( if (
(action.type === setNewSessionActionType && (action.type === setNewSessionActionType &&
action.payload.sessionChange.currentUserInfo && action.payload.sessionChange.currentUserInfo &&
invalidSessionRecovery( invalidSessionRecovery(
state, state,
action.payload.sessionChange.currentUserInfo, action.payload.sessionChange.currentUserInfo,
action.payload.logInActionSource, action.payload.logInActionSource,
)) || )) ||
▲ Show 20 Lines • Show All 254 Lines • Show Last 20 Lines