Page MenuHomePhabricator
Differential D10880

[lib][native][web] add generate nonce action types
ClosedPublic
Actions

Authored by varun on Jan 30 2024, 8:22 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 20, 6:05 PM
Unknown Object (File)
Sat, Apr 19, 11:03 AM
Unknown Object (File)
Sat, Apr 19, 7:27 AM
Unknown Object (File)
Sat, Apr 19, 12:12 AM
Unknown Object (File)
Sat, Apr 19, 12:07 AM
Unknown Object (File)
Fri, Apr 18, 7:52 PM
Unknown Object (File)
Fri, Apr 18, 12:53 PM
Unknown Object (File)
Mon, Apr 14, 8:49 PM
View All Files
Subscribers
None

Details

Reviewers
ashoat
inka
Commits
rCOMMbc1cb995e594: [lib][native][web] add generate nonce action types
Summary

This lets us get the nonce that we will use later in the SIWE message sent to the identity service

Depends on D10836

Test Plan

tested in next diff by actually dispatching the action and logging the nonce

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.Jan 30 2024, 8:22 PM
varun added a child revision: D10881: [native] use identityGenerateNonce in SIWEPanel component.Jan 30 2024, 8:25 PM
Harbormaster completed remote builds in B26315: Diff 36363.Jan 30 2024, 8:41 PM
varun requested review of this revision.Jan 30 2024, 8:41 PM
tomek requested changes to this revision.Jan 31 2024, 1:14 AM
tomek added inline comments.
lib/actions/user-actions.js
428–431

We can consider replacing this check with invariant. It is always a programmer error when this hook is used in a place where IdentityClientContext isn't provided.

After this change we should be also able to replace the callback with a simple return return identityClient.generateNonce;.

lib/types/redux-types.js
423

Are you sure this should be void? Shouldn't this be a string?

native/identity-service/identity-service-context-provider.react.js
267–269

This doesn't need to be async - we're not awaiting anything. Also, the whole thing can be (probably) simplified.

web/grpc/identity-service-client-wrapper.js
318–320

We don't need this check because unauthClient is mandatory

This revision now requires changes to proceed.Jan 31 2024, 1:14 AM
ashoat added inline comments.Jan 31 2024, 8:20 AM
lib/types/redux-types.js
423

Best to avoid making payload a string... I'd rather have an object payload with a single string inside

ashoat added inline comments.Jan 31 2024, 8:24 AM
lib/types/redux-types.js
423

Looking at D10881, there really is nothing in the payload

varun added inline comments.Jan 31 2024, 9:29 AM
lib/actions/user-actions.js
420

this should be identityGenerateNonceActionTypes

varun updated this revision to Diff 36542.Feb 1 2024, 10:25 AM
varun marked 6 inline comments as done.

address feedback

lib/types/redux-types.js
423

right, we set the nonce in state but there is nothing in the payload

web/grpc/identity-service-client-wrapper.js
318–320

good point

varun updated this revision to Diff 36544.Feb 1 2024, 10:31 AM

misunderstood feedback about replacing the callback

Harbormaster completed remote builds in B26429: Diff 36542.Feb 1 2024, 10:45 AM
Harbormaster completed remote builds in B26431: Diff 36544.Feb 1 2024, 10:50 AM
ashoat accepted this revision.Feb 1 2024, 11:26 AM

Accepting on @tomek's behalf, as he's off until Monday

ashoat removed a reviewer: tomek.Feb 1 2024, 11:26 AM
This revision is now accepted and ready to land.Feb 1 2024, 11:26 AM
Closed by commit rCOMMbc1cb995e594: [lib][native][web] add generate nonce action types (authored by varun). · Explain WhyFeb 7 2024, 9:57 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMMbc1cb995e594: [lib][native][web] add generate nonce action types.

Revision Contents
Changeset List

PathSize
lib/
actions/
18 lines
types/
1 line
16 lines
native/
identity-service/
3 lines
web/
grpc/
8 lines

Diff 36363

View Options

lib/actions/user-actions.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/types/identity-service-types.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/types/redux-types.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

native/identity-service/identity-service-context-provider.react.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

web/grpc/identity-service-client-wrapper.js

Loading...