OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix name & tests

dbkr/key_backup_by_default
David Baker 2024-10-22 15:36:04 +01:00
parent 2c7247713a
commit 7f10cd6a9e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/auth/E2eSetup.tsx
View File

@ -11,7 +11,7 @@ import { MatrixClient } from "matrix-js-sdk/src/matrix";
import AuthPage from "../../views/auth/AuthPage"; import AuthPage from "../../views/auth/AuthPage";
import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody"; import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody";
import InitialCryptoSetup from "../../views/dialogs/security/InitialCryptoSetup"; import InitialCryptoSetupDialog from "../../views/dialogs/security/InitialCryptoSetup";
interface IProps { interface IProps {
matrixClient: MatrixClient; matrixClient: MatrixClient;
@ -25,7 +25,7 @@ export default class E2eSetup extends React.Component<IProps> {
return ( return (
<AuthPage> <AuthPage>
<CompleteSecurityBody> <CompleteSecurityBody>
<InitialCryptoSetup <InitialCryptoSetupDialog
matrixClient={this.props.matrixClient} matrixClient={this.props.matrixClient}
onFinished={this.props.onFinished} onFinished={this.props.onFinished}
accountPassword={this.props.accountPassword} accountPassword={this.props.accountPassword}

4
src/components/views/dialogs/security/InitialCryptoSetup.tsx → src/components/views/dialogs/security/InitialCryptoSetupDialog.tsx
View File

@ -29,7 +29,7 @@ interface Props {
* up message key backup. In most cases, only a spinner is shown, but for more * up message key backup. In most cases, only a spinner is shown, but for more
* complex auth like SSO, the user may need to complete some steps to proceed. * complex auth like SSO, the user may need to complete some steps to proceed.
*/ */
const InitialCryptoSetup: React.FC<Props> = ({ matrixClient, accountPassword, tokenLogin, onFinished }) => { const InitialCryptoSetupDialog: React.FC<Props> = ({ matrixClient, accountPassword, tokenLogin, onFinished }) => {
const [error, setError] = useState(false); const [error, setError] = useState(false);
const doSetup = useCallback(async () => { const doSetup = useCallback(async () => {
@ -102,4 +102,4 @@ const InitialCryptoSetup: React.FC<Props> = ({ matrixClient, accountPassword, to
); );
}; };
export default InitialCryptoSetup; export default InitialCryptoSetupDialog;

14
test/components/views/dialogs/security/CreateCrossSigningDialog-test.tsx → test/components/views/dialogs/security/InitialCryptoSetupDialog-test.tsx
View File

@ -12,14 +12,14 @@ import { mocked } from "jest-mock";
import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { createCrossSigning } from "../../../../../src/CreateCrossSigning"; import { createCrossSigning } from "../../../../../src/CreateCrossSigning";
import CreateCrossSigningDialog from "../../../../../src/components/views/dialogs/security/CreateCrossSigningDialog"; import InitialCryptoSetupDialog from "../../../../../src/components/views/dialogs/security/InitialCryptoSetupDialog";
import { createTestClient } from "../../../../test-utils"; import { createTestClient } from "../../../../test-utils";
jest.mock("../../../../../src/CreateCrossSigning", () => ({ jest.mock("../../../../../src/CreateCrossSigning", () => ({
createCrossSigning: jest.fn(), createCrossSigning: jest.fn(),
})); }));
describe("CreateCrossSigningDialog", () => { describe("InitialCryptoSetupDialog", () => {
let client: MatrixClient; let client: MatrixClient;
let createCrossSigningResolve: () => void; let createCrossSigningResolve: () => void;
let createCrossSigningReject: (e: Error) => void; let createCrossSigningReject: (e: Error) => void;
@ -43,7 +43,7 @@ describe("CreateCrossSigningDialog", () => {
const onFinished = jest.fn(); const onFinished = jest.fn();
render( render(
<CreateCrossSigningDialog <InitialCryptoSetupDialog
matrixClient={client} matrixClient={client}
accountPassword="hunter2" accountPassword="hunter2"
tokenLogin={false} tokenLogin={false}
@ -61,7 +61,7 @@ describe("CreateCrossSigningDialog", () => {
it("should display an error if createCrossSigning fails", async () => { it("should display an error if createCrossSigning fails", async () => {
render( render(
<CreateCrossSigningDialog <InitialCryptoSetupDialog
matrixClient={client} matrixClient={client}
accountPassword="hunter2" accountPassword="hunter2"
tokenLogin={false} tokenLogin={false}
@ -78,7 +78,7 @@ describe("CreateCrossSigningDialog", () => {
const onFinished = jest.fn(); const onFinished = jest.fn();
render( render(
<CreateCrossSigningDialog <InitialCryptoSetupDialog
matrixClient={client} matrixClient={client}
accountPassword="hunter2" accountPassword="hunter2"
tokenLogin={true} tokenLogin={true}
@ -95,7 +95,7 @@ describe("CreateCrossSigningDialog", () => {
const onFinished = jest.fn(); const onFinished = jest.fn();
render( render(
<CreateCrossSigningDialog <InitialCryptoSetupDialog
matrixClient={client} matrixClient={client}
accountPassword="hunter2" accountPassword="hunter2"
tokenLogin={false} tokenLogin={false}
@ -113,7 +113,7 @@ describe("CreateCrossSigningDialog", () => {
it("should retry when the retry button is clicked", async () => { it("should retry when the retry button is clicked", async () => {
render( render(
<CreateCrossSigningDialog <InitialCryptoSetupDialog
matrixClient={client} matrixClient={client}
accountPassword="hunter2" accountPassword="hunter2"
tokenLogin={false} tokenLogin={false}