Page MenuHomePhabricator
Differential D10597

[lib] Move keyserver session recovery utils to recovery-utils.js
ClosedPublic
Actions

Authored by ashoat on Jan 10 2024, 10:38 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 9:21 AM
Unknown Object (File)
Mon, Apr 21, 6:39 AM
Unknown Object (File)
Mon, Apr 21, 1:53 AM
Unknown Object (File)
Mon, Apr 21, 1:22 AM
Unknown Object (File)
Sat, Apr 19, 11:46 PM
Unknown Object (File)
Wed, Apr 9, 12:43 AM
Unknown Object (File)
Tue, Apr 8, 9:05 PM
Unknown Object (File)
Tue, Apr 8, 8:34 PM
View All 97 Files
Subscribers
None

Details

Reviewers
inka
varun
tomek
Commits
rCOMMa8d14cd9f4a8: [lib] Move keyserver session recovery utils to recovery-utils.js
Summary

Continuing the process of breaking up action-utils.js. In this diff I separate out canResolveKeyserverSessionInvalidation and resolveKeyserverSessionInvalidation into their own file.

Depends on D10596

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Branch
ashoat/ident
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

ashoat created this revision.Jan 10 2024, 10:38 AM
ashoat updated this revision to Diff 35504.Jan 10 2024, 10:41 AM

Avoid reexporting resolveKeyserverSessionInvalidation in action-utils.js

Harbormaster failed remote builds in B25679: Diff 35503!Jan 10 2024, 10:44 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Jan 10 2024, 10:47 AM
Harbormaster failed remote builds in B25680: Diff 35504!
ashoat requested review of this revision.Jan 10 2024, 10:49 AM
Harbormaster completed remote builds in B25680: Diff 35504.Jan 10 2024, 11:18 AM
ashoat added a child revision: D10598: [lib][native] Move all the Redux-binding code out of action-utils.js.Jan 10 2024, 12:18 PM
tomek accepted this revision.Jan 11 2024, 1:21 AM
inka accepted this revision.Jan 11 2024, 2:23 AM
This revision is now accepted and ready to land.Jan 11 2024, 2:23 AM
Closed by commit rCOMMa8d14cd9f4a8: [lib] Move keyserver session recovery utils to recovery-utils.js (authored by ashoat). · Explain WhyJan 11 2024, 8:17 AM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMMa8d14cd9f4a8: [lib] Move keyserver session recovery utils to recovery-utils.js.

Revision Contents
Changeset List

PathSize
lib/
keyserver-conn/
153 lines
utils/
149 lines

Diff 35503

View Options

lib/keyserver-conn/recovery-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines
View Options

lib/utils/action-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines