Replace MatrixClient.hasSecretStorageKey by `MatrixClient.SecretSto…

…rage.hasKey`
element-hq · Oct 16, 2024 · bdfc4a4 · bdfc4a4
1 parent 6892035
commit bdfc4a4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
@@ -69,7 +69,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent<IProps, I
         const cli = MatrixClientPeg.safeGet();
         try {
             // Check if 4S already set up
-            const secretStorageAlreadySetup = await cli.hasSecretStorageKey();
+            const secretStorageAlreadySetup = await cli.secretStorage.hasKey();
 
             if (!secretStorageAlreadySetup) {
                 // bootstrap secret storage; that will also create a backup version

diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
@@ -280,7 +280,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
         try {
             const cli = MatrixClientPeg.safeGet();
             const backupInfo = await cli.getKeyBackupVersion();
-            const has4S = await cli.hasSecretStorageKey();
+            const has4S = await cli.secretStorage.hasKey();
             const backupKeyStored = has4S ? await cli.isKeyBackupKeyStored() : null;
             this.setState({
                 backupInfo,

diff --git a/test/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx b/test/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx
@@ -34,7 +34,7 @@ describe("CreateKeyBackupDialog", () => {
 
     it("should display an error message when backup creation failed", async () => {
         const matrixClient = createTestClient();
-        mocked(matrixClient.hasSecretStorageKey).mockResolvedValue(true);
+        jest.spyOn(matrixClient.secretStorage, "hasKey").mockResolvedValue(true);
         mocked(matrixClient.getCrypto()!.resetKeyBackup).mockImplementation(() => {
             throw new Error("failed");
         });
@@ -49,7 +49,7 @@ describe("CreateKeyBackupDialog", () => {
 
     it("should display an error message when there is no Crypto available", async () => {
         const matrixClient = createTestClient();
-        mocked(matrixClient.hasSecretStorageKey).mockResolvedValue(true);
+        jest.spyOn(matrixClient.secretStorage, "hasKey").mockResolvedValue(true);
         mocked(matrixClient.getCrypto).mockReturnValue(undefined);
         MatrixClientPeg.safeGet = MatrixClientPeg.get = () => matrixClient;
 

diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
@@ -99,13 +99,13 @@ export function createTestClient(): MatrixClient {
         getDevices: jest.fn().mockResolvedValue({ devices: [{ device_id: "ABCDEFGHI" }] }),
         getSessionId: jest.fn().mockReturnValue("iaszphgvfku"),
         credentials: { userId: "@userId:matrix.org" },
-        hasSecretStorageKey: jest.fn(),
         getKeyBackupVersion: jest.fn(),
 
         secretStorage: {
             get: jest.fn(),
             isStored: jest.fn().mockReturnValue(false),
             checkKey: jest.fn().mockResolvedValue(false),
+            hasKey: jest.fn().mockReturnValue(false),
         },
 
         store: {