Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 12:45:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Remove deprecated MatrixClient.keyBackupKeyFromPassword call. (#28233)

Browse Source 
- The `keyBackupKeyFromPassword` call is bound to the `keyCallback` props in `RestoreKeyBackupDialog` which is not used in `CreateSecretStorageDialog`
- Remove code bound to `keyCallback` props
This commit is contained in:
Florian Duros 2024-10-21 11:59:07 +02:00 committed by GitHub
parent 3294c6b5c5
commit 061c8217b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
View File

@ -404,13 +404,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
};
private restoreBackup = async (): Promise<void> => {
const keyCallback = (k: Uint8Array): void => {};
const { finished } = Modal.createDialog(
RestoreKeyBackupDialog,
{
showSummary: false,
keyCallback,
},
undefined,
/* priority = */ false,

14
src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
View File

@ -37,9 +37,6 @@ interface IProps {
// if false, will close the dialog as soon as the restore completes successfully
// default: true
showSummary?: boolean;
// If specified, gather the key from the user but then call the function with the backup
// key rather than actually (necessarily) restoring the backup.
keyCallback?: (key: Uint8Array) => void;
onFinished(done?: boolean): void;
}
@ -156,13 +153,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
this.state.backupInfo,
{ progressCallback: this.progressCallback },
);
if (this.props.keyCallback) {
const key = await MatrixClientPeg.safeGet().keyBackupKeyFromPassword(
this.state.passPhrase,
this.state.backupInfo,
);
this.props.keyCallback(key);
}
if (!this.props.showSummary) {
this.props.onFinished(true);
@ -197,10 +187,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
this.state.backupInfo,
{ progressCallback: this.progressCallback },
);
if (this.props.keyCallback) {
const key = decodeRecoveryKey(this.state.recoveryKey);
this.props.keyCallback(key);
}
if (!this.props.showSummary) {
this.props.onFinished(true);
return;

2
test/unit-tests/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
View File

@ -122,7 +122,6 @@ describe("CreateSecretStorageDialog", () => {
expect(modalSpy).toHaveBeenCalledWith(
RestoreKeyBackupDialog,
{
keyCallback: expect.any(Function),
showSummary: false,
},
undefined,
@ -200,7 +199,6 @@ describe("CreateSecretStorageDialog", () => {
expect(modalSpy).toHaveBeenCalledWith(
RestoreKeyBackupDialog,
{
keyCallback: expect.any(Function),
showSummary: false,
},
undefined,