Remove MatrixClient.requestVerification call

element-hq · Oct 16, 2024 · 5fb100b · 5fb100b
1 parent 77c822a
commit 5fb100b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
@@ -52,7 +52,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
-import { legacyVerifyUser, verifyDevice, verifyUser } from "../../../verification";
+import { verifyDevice, verifyUser } from "../../../verification";
 import { Action } from "../../../dispatcher/actions";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
@@ -1551,13 +1551,7 @@ const BasicUserInfo: React.FC<{
  <AccessibleButton
  kind="link"
  className="mx_UserInfo_field mx_UserInfo_verifyButton"
- onClick={() => {
- if (hasCrossSigningKeys) {
- verifyUser(cli, member as User);
- } else {
- legacyVerifyUser(cli, member as User);
- }
- }}
+ onClick={() => verifyUser(cli, member as User)}
  >
  {_t("action|verify")}
  </AccessibleButton>

diff --git a/src/verification.ts b/src/verification.ts
@@ -66,21 +66,6 @@ export async function verifyDevice(matrixClient: MatrixClient, user: User, devic
  });
 }
 
-export async function legacyVerifyUser(matrixClient: MatrixClient, user: User): Promise<void> {
- if (matrixClient.isGuest()) {
- dis.dispatch({ action: "require_registration" });
- return;
- }
- // if cross-signing is not explicitly disabled, check if it should be enabled first.
- if (matrixClient.getCryptoTrustCrossSignedDevices()) {
- if (!(await enable4SIfNeeded(matrixClient))) {
- return;
- }
- }
- const verificationRequestPromise = matrixClient.requestVerification(user.userId);
- setRightPanel({ member: user, verificationRequestPromise });
-}
-
 export async function verifyUser(matrixClient: MatrixClient, user: User): Promise<void> {
  if (matrixClient.isGuest()) {
  dis.dispatch({ action: "require_registration" });

diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
@@ -97,7 +97,6 @@ export function createTestClient(): MatrixClient {
  getDeviceId: jest.fn().mockReturnValue("ABCDEFGHI"),
  getStoredCrossSigningForUser: jest.fn(),
  getStoredDevice: jest.fn(),
- requestVerification: jest.fn(),
  deviceId: "ABCDEFGHI",
  getDevices: jest.fn().mockResolvedValue({ devices: [{ device_id: "ABCDEFGHI" }] }),
  getSessionId: jest.fn().mockReturnValue("iaszphgvfku"),