Page MenuHomePhabricator
Differential D13031

[lib] introduce resetting Outbound P2P Messages to `SQLiteAPI`
ClosedPublic
Actions

Authored by kamil on Aug 8 2024, 5:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 12:18 AM
Unknown Object (File)
Fri, Feb 28, 2:47 AM
Unknown Object (File)
Feb 25 2025, 10:14 AM
Unknown Object (File)
Feb 22 2025, 11:12 PM
Unknown Object (File)
Feb 22 2025, 11:12 PM
Unknown Object (File)
Feb 22 2025, 11:11 PM
Unknown Object (File)
Feb 22 2025, 11:09 PM
Unknown Object (File)
Feb 16 2025, 7:44 PM
View All 67 Files
Subscribers
ashoat

Details

Reviewers
tomek
Commits
rCOMMd5e299a6a2fb: [lib] introduce resetting Outbound P2P Messages to `SQLiteAPI`
Summary

This diff introduces a shared interface on SQLiteAPI so the JS code in lib can use this API on both platforms.

Depends on D13030

Test Plan

Tested in D13032

Additionally, run this code:

const deviceID = 'deviceID';

await processDBStoreOperations({
  outboundP2PMessages: [
    {
      messageID: 'reset-1',
      deviceID,
      userID: 'user-1',
      timestamp: '1',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'encrypted',
      supportsAutoRetry: true,
    },
    {
      messageID: 'reset-2',
      deviceID,
      userID: 'user-1',
      timestamp: '1',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'sent',
      supportsAutoRetry: false,
    },
    {
      messageID: 'reset-3',
      deviceID,
      userID: 'user-1',
      timestamp: '3',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'encrypted',
      supportsAutoRetry: false,
    },
  ],
});

const before = await sqliteAPI.getAllOutboundP2PMessages();
console.log(before.filter(msg => msg.deviceID === deviceID));
const ids =
  await sqliteAPI.resetOutboundP2PMessagesForDevice(deviceID);
console.log(ids);
const after = await sqliteAPI.getAllOutboundP2PMessages();
console.log(after.filter(msg => msg.deviceID === deviceID));

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
types/
3 lines
utils/
__mocks__/
1 line
native/
database/
2 lines
web/
database/
13 lines

Diff 43331

View Options

lib/types/sqlite-types.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines
View Options

lib/utils/__mocks__/config.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines
View Options

native/database/sqlite-api.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines
View Options

web/database/sqlite-api.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines