Page MenuHomePhabricator
Differential D14521

[lib][native] refactor login/restore hooks to return `IdentityAuthResult`
ClosedPublic
Actions

Authored by kamil on Thu, Apr 3, 3:18 AM.
Tags
None
Referenced Files
F5292664: D14521.id47686.diff
Mon, Apr 7, 6:57 PM
F5288744: D14521.diff
Mon, Apr 7, 4:04 PM
F5288698: D14521.id47686.diff
Mon, Apr 7, 3:58 PM
F5287401: D14521.diff
Mon, Apr 7, 1:02 PM
Unknown Object (File)
Sun, Apr 6, 10:50 PM
Unknown Object (File)
Sun, Apr 6, 3:38 PM
Unknown Object (File)
Sun, Apr 6, 1:44 PM
Unknown Object (File)
Sun, Apr 6, 12:46 PM
View All 10 Files
Subscribers
ashoat

Details

Reviewers
bartek
tomek
Commits
rCOMMe544731dddb7: [lib][native] refactor login/restore hooks to return `IdentityAuthResult`
Summary

Part of ENG-10477

To be able to restore in here, we need to get auth metadata. We can't just call getAuthMetadata because we need to wait for re-render to make sure the store is populated.

We can:

  1. Update performLogIn to return CSAT and userID
  2. Implement some waiting logic to execute restore after store is populated with auth metadata, but this is complicated, and we need to deal with many race conditions.

I implemented option 1.

Depends on D14520

Test Plan

Flow, log returned value during secondary device auth

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
hooks/
29 lines
native/
account/
6 lines
24 lines

Diff 47686

View Options

lib/hooks/login-hooks.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { import {
restoreUserActionTypes, restoreUserActionTypes,
type RestoreUserResult, type RestoreUserResult,
} from 'lib/actions/user-actions.js'; } from 'lib/actions/user-actions.js';
import { useDebugLogs } from 'lib/components/debug-logs-context.js';
import { import {
useLogIn, useLogIn,
usePasswordLogIn, usePasswordLogIn,
useWalletLogIn, useWalletLogIn,
} from 'lib/hooks/login-hooks.js'; } from 'lib/hooks/login-hooks.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityAuthResult, type IdentityAuthResult,
type SignedDeviceList, type SignedDeviceList,
platformToIdentityDeviceType, platformToIdentityDeviceType,
} from 'lib/types/identity-service-types.js'; } from 'lib/types/identity-service-types.js';
import type { SignedMessage } from 'lib/types/siwe-types.js'; import type { SignedMessage } from 'lib/types/siwe-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { getContentSigningKey } from 'lib/utils/crypto-utils.js'; import { getContentSigningKey } from 'lib/utils/crypto-utils.js';
import { composeRawDeviceList } from 'lib/utils/device-list-utils.js'; import { composeRawDeviceList } from 'lib/utils/device-list-utils.js';
import { getMessageForException } from 'lib/utils/errors.js'; import { getMessageForException } from 'lib/utils/errors.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
import { useSelector } from 'lib/utils/redux-utils.js'; import { useDispatch, useSelector } from 'lib/utils/redux-utils.js';
import { fullBackupSupport } from 'lib/utils/services-utils.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { useClientBackup } from '../backup/use-client-backup.js'; import { useClientBackup } from '../backup/use-client-backup.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { codeVersion, persistConfig } from '../redux/persist.js'; import { codeVersion, persistConfig } from '../redux/persist.js';
function useRestoreProtocol(): ( function useRestoreProtocol(): (
// username or wallet address // username or wallet address
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Lines ): Promise<IdentityAuthResult> => {
accessToken, accessToken,
username, username,
preRequestUserState, preRequestUserState,
}; };
}, },
[dispatchActionPromise, restoreProtocol], [dispatchActionPromise, restoreProtocol],
); );
const dispatch = useDispatch();
const { addLog } = useDebugLogs();
const restoreUserData = React.useCallback(
async (identityAuthResult: ?IdentityAuthResult) => {
if (!fullBackupSupport) {
return;
}
try {
const { sqliteAPI } = getConfig();
if (!identityAuthResult) {
throw new Error('Missing identityAuthResult');
}
const backupData = await commCoreModule.getQRAuthBackupData();
await sqliteAPI.restoreUserData(backupData, identityAuthResult);
const clientDBStore = await sqliteAPI.getClientDBStore(
identityAuthResult.userID,
);
dispatch({
type: setClientDBStoreActionType,
payload: clientDBStore,
});
} catch (e) {
addLog(
'Error when restoring User Data',
getMessageForException(e) ?? 'unknown error',
);
}
},
[addLog, dispatch],
);
const logIn = useLogIn('restore'); const logIn = useLogIn('restore');
return React.useCallback( return React.useCallback(
(userIdentifier: string, secret: string, siweSocialProof?: SignedMessage) => async (
logIn(restoreAuth(userIdentifier, secret, siweSocialProof)), userIdentifier: string,
[logIn, restoreAuth], secret: string,
siweSocialProof?: SignedMessage,
) => {
const identityAuthResult = await logIn(
restoreAuth(userIdentifier, secret, siweSocialProof),
);
await restoreUserData(identityAuthResult);
return identityAuthResult;
},
[logIn, restoreAuth, restoreUserData],
); );
} }
function useV1Login(): ( function useV1Login(): (
userIdentifier: string, userIdentifier: string,
credentials: credentials:
| { | {
+type: 'password', +type: 'password',
Show All 28 Lines
View Options

native/account/log-in-panel.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { import {
restoreUserActionTypes, restoreUserActionTypes,
type RestoreUserResult, type RestoreUserResult,
} from 'lib/actions/user-actions.js'; } from 'lib/actions/user-actions.js';
import { useDebugLogs } from 'lib/components/debug-logs-context.js';
import { import {
useLogIn, useLogIn,
usePasswordLogIn, usePasswordLogIn,
useWalletLogIn, useWalletLogIn,
} from 'lib/hooks/login-hooks.js'; } from 'lib/hooks/login-hooks.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityAuthResult, type IdentityAuthResult,
type SignedDeviceList, type SignedDeviceList,
platformToIdentityDeviceType, platformToIdentityDeviceType,
} from 'lib/types/identity-service-types.js'; } from 'lib/types/identity-service-types.js';
import type { SignedMessage } from 'lib/types/siwe-types.js'; import type { SignedMessage } from 'lib/types/siwe-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { getContentSigningKey } from 'lib/utils/crypto-utils.js'; import { getContentSigningKey } from 'lib/utils/crypto-utils.js';
import { composeRawDeviceList } from 'lib/utils/device-list-utils.js'; import { composeRawDeviceList } from 'lib/utils/device-list-utils.js';
import { getMessageForException } from 'lib/utils/errors.js'; import { getMessageForException } from 'lib/utils/errors.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
import { useSelector } from 'lib/utils/redux-utils.js'; import { useDispatch, useSelector } from 'lib/utils/redux-utils.js';
import { fullBackupSupport } from 'lib/utils/services-utils.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { useClientBackup } from '../backup/use-client-backup.js'; import { useClientBackup } from '../backup/use-client-backup.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { codeVersion, persistConfig } from '../redux/persist.js'; import { codeVersion, persistConfig } from '../redux/persist.js';
function useRestoreProtocol(): ( function useRestoreProtocol(): (
// username or wallet address // username or wallet address
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Lines ): Promise<IdentityAuthResult> => {
accessToken, accessToken,
username, username,
preRequestUserState, preRequestUserState,
}; };
}, },
[dispatchActionPromise, restoreProtocol], [dispatchActionPromise, restoreProtocol],
); );
const dispatch = useDispatch();
const { addLog } = useDebugLogs();
const restoreUserData = React.useCallback(
async (identityAuthResult: ?IdentityAuthResult) => {
if (!fullBackupSupport) {
return;
}
try {
const { sqliteAPI } = getConfig();
if (!identityAuthResult) {
throw new Error('Missing identityAuthResult');
}
const backupData = await commCoreModule.getQRAuthBackupData();
await sqliteAPI.restoreUserData(backupData, identityAuthResult);
const clientDBStore = await sqliteAPI.getClientDBStore(
identityAuthResult.userID,
);
dispatch({
type: setClientDBStoreActionType,
payload: clientDBStore,
});
} catch (e) {
addLog(
'Error when restoring User Data',
getMessageForException(e) ?? 'unknown error',
);
}
},
[addLog, dispatch],
);
const logIn = useLogIn('restore'); const logIn = useLogIn('restore');
return React.useCallback( return React.useCallback(
(userIdentifier: string, secret: string, siweSocialProof?: SignedMessage) => async (
logIn(restoreAuth(userIdentifier, secret, siweSocialProof)), userIdentifier: string,
[logIn, restoreAuth], secret: string,
siweSocialProof?: SignedMessage,
) => {
const identityAuthResult = await logIn(
restoreAuth(userIdentifier, secret, siweSocialProof),
);
await restoreUserData(identityAuthResult);
return identityAuthResult;
},
[logIn, restoreAuth, restoreUserData],
); );
} }
function useV1Login(): ( function useV1Login(): (
userIdentifier: string, userIdentifier: string,
credentials: credentials:
| { | {
+type: 'password', +type: 'password',
Show All 28 Lines
View Options

native/account/restore.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { import {
restoreUserActionTypes, restoreUserActionTypes,
type RestoreUserResult, type RestoreUserResult,
} from 'lib/actions/user-actions.js'; } from 'lib/actions/user-actions.js';
import { useDebugLogs } from 'lib/components/debug-logs-context.js';
import { import {
useLogIn, useLogIn,
usePasswordLogIn, usePasswordLogIn,
useWalletLogIn, useWalletLogIn,
} from 'lib/hooks/login-hooks.js'; } from 'lib/hooks/login-hooks.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityAuthResult, type IdentityAuthResult,
type SignedDeviceList, type SignedDeviceList,
platformToIdentityDeviceType, platformToIdentityDeviceType,
} from 'lib/types/identity-service-types.js'; } from 'lib/types/identity-service-types.js';
import type { SignedMessage } from 'lib/types/siwe-types.js'; import type { SignedMessage } from 'lib/types/siwe-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { getContentSigningKey } from 'lib/utils/crypto-utils.js'; import { getContentSigningKey } from 'lib/utils/crypto-utils.js';
import { composeRawDeviceList } from 'lib/utils/device-list-utils.js'; import { composeRawDeviceList } from 'lib/utils/device-list-utils.js';
import { getMessageForException } from 'lib/utils/errors.js'; import { getMessageForException } from 'lib/utils/errors.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
import { useSelector } from 'lib/utils/redux-utils.js'; import { useDispatch, useSelector } from 'lib/utils/redux-utils.js';
import { fullBackupSupport } from 'lib/utils/services-utils.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { useClientBackup } from '../backup/use-client-backup.js'; import { useClientBackup } from '../backup/use-client-backup.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { codeVersion, persistConfig } from '../redux/persist.js'; import { codeVersion, persistConfig } from '../redux/persist.js';
function useRestoreProtocol(): ( function useRestoreProtocol(): (
// username or wallet address // username or wallet address
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Lines ): Promise<IdentityAuthResult> => {
accessToken, accessToken,
username, username,
preRequestUserState, preRequestUserState,
}; };
}, },
[dispatchActionPromise, restoreProtocol], [dispatchActionPromise, restoreProtocol],
); );
const dispatch = useDispatch();
const { addLog } = useDebugLogs();
const restoreUserData = React.useCallback(
async (identityAuthResult: ?IdentityAuthResult) => {
if (!fullBackupSupport) {
return;
}
try {
const { sqliteAPI } = getConfig();
if (!identityAuthResult) {
throw new Error('Missing identityAuthResult');
}
const backupData = await commCoreModule.getQRAuthBackupData();
await sqliteAPI.restoreUserData(backupData, identityAuthResult);
const clientDBStore = await sqliteAPI.getClientDBStore(
identityAuthResult.userID,
);
dispatch({
type: setClientDBStoreActionType,
payload: clientDBStore,
});
} catch (e) {
addLog(
'Error when restoring User Data',
getMessageForException(e) ?? 'unknown error',
);
}
},
[addLog, dispatch],
);
const logIn = useLogIn('restore'); const logIn = useLogIn('restore');
return React.useCallback( return React.useCallback(
(userIdentifier: string, secret: string, siweSocialProof?: SignedMessage) => async (
logIn(restoreAuth(userIdentifier, secret, siweSocialProof)), userIdentifier: string,
[logIn, restoreAuth], secret: string,
siweSocialProof?: SignedMessage,
) => {
const identityAuthResult = await logIn(
restoreAuth(userIdentifier, secret, siweSocialProof),
);
await restoreUserData(identityAuthResult);
return identityAuthResult;
},
[logIn, restoreAuth, restoreUserData],
); );
} }
function useV1Login(): ( function useV1Login(): (
userIdentifier: string, userIdentifier: string,
credentials: credentials:
| { | {
+type: 'password', +type: 'password',
Show All 28 Lines