Page MenuHomePhabricator
Files F3391325

D12576.id41762.diff
No OneTemporary
Actions

D12576.id41762.diff
View Options

diff --git a/native/backup/use-client-backup.js b/native/backup/use-client-backup.js
--- a/native/backup/use-client-backup.js
+++ b/native/backup/use-client-backup.js
@@ -5,7 +5,6 @@
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js';
import type { SIWEBackupSecrets } from 'lib/types/siwe-types.js';
-import { getContentSigningKey } from 'lib/utils/crypto-utils.js';
import { fetchNativeKeychainCredentials } from '../account/native-credentials.js';
import { commCoreModule } from '../native-modules.js';
@@ -43,26 +42,12 @@
}
function useClientBackup(): ClientBackup {
- const accessToken = useSelector(state => state.commServicesAccessToken);
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const currentUserInfo = useSelector(state => state.currentUserInfo);
const loggedIn = useSelector(isLoggedIn);
- const setMockCommServicesAuthMetadata = React.useCallback(async () => {
- if (!currentUserID) {
- return;
- }
-
- const ed25519 = await getContentSigningKey();
- await commCoreModule.setCommServicesAuthMetadata(
- currentUserID,
- ed25519,
- accessToken ? accessToken : '',
- );
- }, [accessToken, currentUserID]);
-
const uploadBackupProtocol = React.useCallback(async () => {
if (!loggedIn || !currentUserID) {
throw new Error('Attempt to upload backup for not logged in user.');
@@ -70,8 +55,6 @@
console.info('Start uploading backup...');
- await setMockCommServicesAuthMetadata();
-
if (accountHasPassword(currentUserInfo)) {
const backupSecret = await getBackupSecret();
await commCoreModule.createNewBackup(backupSecret);
@@ -81,12 +64,7 @@
}
console.info('Backup uploaded.');
- }, [
- currentUserID,
- loggedIn,
- setMockCommServicesAuthMetadata,
- currentUserInfo,
- ]);
+ }, [currentUserID, loggedIn, currentUserInfo]);
const restorePasswordUserBackupProtocol = React.useCallback(async () => {
if (!loggedIn || !currentUserID) {
@@ -100,7 +78,6 @@
}
console.info('Start restoring backup...');
- await setMockCommServicesAuthMetadata();
const backupSecret = await getBackupSecret();
await commCoreModule.restoreBackup(
@@ -110,12 +87,7 @@
console.info('Backup restored.');
return;
- }, [
- currentUserID,
- loggedIn,
- setMockCommServicesAuthMetadata,
- currentUserInfo,
- ]);
+ }, [currentUserID, loggedIn, currentUserInfo]);
const retrieveLatestSIWEBackupData = React.useCallback(async () => {
if (!loggedIn || !currentUserID) {
@@ -128,17 +100,11 @@
);
}
- await setMockCommServicesAuthMetadata();
const serializedBackupData =
await commCoreModule.retrieveLatestSIWEBackupData();
const siweBackupData: SIWEBackupData = JSON.parse(serializedBackupData);
return siweBackupData;
- }, [
- currentUserID,
- currentUserInfo,
- loggedIn,
- setMockCommServicesAuthMetadata,
- ]);
+ }, [currentUserID, currentUserInfo, loggedIn]);
return {
uploadBackupProtocol,

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 1, 3:25 AM (18 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2603503
Default Alt Text
D12576.id41762.diff (3 KB)

Event Timeline