In D10767#310649, @inka wrote:

Creating separate diff because I am a bit confused - @inka is modifying the state instead of returning on purpose?

I must have missed that in D9820, it should be fine to return, since we don't do anything with the state later in the reducer.

Thank for response

Please add a test plan or explain why N/A

Updated

kamil edited the test plan for this revision. (Show Details)Jan 27 2024, 9:12 AM

kamil added a parent revision: D10763: [lib] refactor state-sync actions in `keyserver-reducer` to ops.

kamil edited the summary of this revision. (Show Details)

kamil removed a parent revision: D10763: [lib] refactor state-sync actions in `keyserver-reducer` to ops.

inka accepted this revision.Jan 29 2024, 1:46 AM

This revision is now accepted and ready to land.Jan 29 2024, 1:46 AM

Closed by commit rCOMMfe3c795750ce: [lib] refactor keyserver register in `keyserver-reducer` to ops (authored by kamil). · Explain WhyJan 31 2024, 8:23 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMMfe3c795750ce: [lib] refactor keyserver register in `keyserver-reducer` to ops.

Revision Contents
Changeset List

Path

Size

lib/

reducers/

keyserver-reducer.js

14 lines

Diff 36394

View Options

lib/reducers/keyserver-reducer.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

[lib] refactor keyserver register in `keyserver-reducer` to opsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 36394

lib/reducers/keyserver-reducer.js

[lib] refactor keyserver register in `keyserver-reducer` to ops
ClosedPublic
Actions

Revision Contents
Changeset List