Page MenuHomePhabricator
Differential D8962

[backup] Update `BlobItem`
ClosedPublic
Actions

Authored by michal on Aug 28 2023, 12:57 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 24, 2:14 PM
Unknown Object (File)
Mon, Mar 24, 2:14 PM
Unknown Object (File)
Mon, Mar 24, 2:14 PM
Unknown Object (File)
Sun, Mar 23, 1:41 PM
Unknown Object (File)
Sun, Mar 16, 11:58 PM
Unknown Object (File)
Fri, Mar 7, 2:30 PM
Unknown Object (File)
Thu, Mar 6, 10:05 AM
Unknown Object (File)
Thu, Mar 6, 10:05 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
• patryk
kamil
• jon
Commits
rCOMM3c1ce0afaf0f: [backup] Update `BlobItem`
Summary

Modernize BlobItem and update it to match new database design.

Depends on D8954

Test Plan

cargo check, tested with the rest of the stack

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

michal created this revision.Aug 28 2023, 12:57 AM
Herald added a reviewer: • jon. · View Herald TranscriptAug 28 2023, 12:57 AM
Herald added subscribers: tomek, ashoat. · View Herald Transcript
Harbormaster completed remote builds in B22154: Diff 30419.Aug 28 2023, 1:14 AM
michal requested review of this revision.Aug 28 2023, 1:14 AM
michal added a child revision: D8963: [backup] Introduce upload endpoint.Aug 28 2023, 1:33 AM
bartek accepted this revision.Aug 28 2023, 5:00 AM
bartek added inline comments.
services/backup/src/constants.rs
17–24 ↗(On Diff #30419)

Nit/followup: You're right that it would be nice to add a submodule for table constants: constants::backup_table::FIELD_XYZ

This revision is now accepted and ready to land.Aug 28 2023, 5:00 AM
michal added inline comments.Aug 29 2023, 10:55 AM
services/backup/src/constants.rs
17–24 ↗(On Diff #30419)

Probably gonna do a separate diff with both backup and log constants

Closed by commit rCOMM3c1ce0afaf0f: [backup] Update `BlobItem` (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyAug 30 2023, 1:28 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMM3c1ce0afaf0f: [backup] Update `BlobItem`.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
4 lines
database/
147 lines
37 lines
comm-services-lib/
src/
22 lines

Diff 30529

View Options

services/backup/src/constants.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

services/backup/src/database/backup_item.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

services/backup/src/database/mod.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

services/comm-services-lib/src/database.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }