Remove deprecated calls to hasSecretStorageKey

matrix-org · Jan 8, 2024 · 8464448 · 8464448
1 parent 9abb2d9
commit 8464448
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
@@ -350,7 +350,7 @@ export async function accessSecretStorage(func = async (): Promise<void> => {},
 async function doAccessSecretStorage(func: () => Promise<void>, forceReset: boolean): Promise<void> {
     try {
         const cli = MatrixClientPeg.safeGet();
-        if (!(await cli.hasSecretStorageKey()) || forceReset) {
+        if (!(await cli.secretStorage.hasKey()) || forceReset) {
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createDialogAsync(

diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
@@ -77,7 +77,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
@@ -274,7 +274,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/SecurityManager-test.ts b/test/SecurityManager-test.ts
@@ -31,7 +31,7 @@ describe("SecurityManager", () => {
                 bootstrapSecretStorage: () => {},
             } as unknown as CryptoApi;
             const client = stubClient();
-            mocked(client.hasSecretStorageKey).mockResolvedValue(true);
+            mocked(client.secretStorage.hasKey).mockResolvedValue(true);
             mocked(client.getCrypto).mockReturnValue(crypto);
 
             // When I run accessSecretStorage
@@ -48,7 +48,7 @@ describe("SecurityManager", () => {
             it("throws if crypto is unavailable", async () => {
                 // Given a client with no crypto
                 const client = stubClient();
-                mocked(client.hasSecretStorageKey).mockResolvedValue(true);
+                mocked(client.secretStorage.hasKey).mockResolvedValue(true);
                 mocked(client.getCrypto).mockReturnValue(undefined);
 
                 // When I run accessSecretStorage

diff --git a/test/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx b/test/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx
@@ -42,7 +42,7 @@ describe("CreateKeyBackupDialog", () => {
 
     it("should display an error message when backup creation failed", async () => {
         const matrixClient = createTestClient();
-        mocked(matrixClient.hasSecretStorageKey).mockResolvedValue(true);
+        mocked(matrixClient.secretStorage.hasKey).mockResolvedValue(true);
         mocked(matrixClient.getCrypto()!.resetKeyBackup).mockImplementation(() => {
             throw new Error("failed");
         });
@@ -57,7 +57,7 @@ describe("CreateKeyBackupDialog", () => {
 
     it("should display an error message when there is no Crypto available", async () => {
         const matrixClient = createTestClient();
-        mocked(matrixClient.hasSecretStorageKey).mockResolvedValue(true);
+        mocked(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
@@ -49,7 +49,6 @@ import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
 import { MatrixRTCSessionManager } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
 // eslint-disable-next-line no-restricted-imports
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
-import { ServerSideSecretStorage } from "matrix-js-sdk/src/secret-storage";
 
 import type { GroupCall } from "matrix-js-sdk/src/matrix";
 import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
@@ -115,11 +114,11 @@ export function createTestClient(): MatrixClient {
         getSessionId: jest.fn().mockReturnValue("iaszphgvfku"),
         credentials: { userId: "@userId:matrix.org" },
         bootstrapCrossSigning: jest.fn(),
-        hasSecretStorageKey: jest.fn(),
 
         secretStorage: {
             get: jest.fn(),
-        } as unknown as ServerSideSecretStorage,
+            hasKey: jest.fn(),
+        },
 
         store: {
             getPendingEvents: jest.fn().mockResolvedValue([]),