Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Ensure the first device on a newly-registered account gets cross-signed properly #8750

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Ensure the first device on a newly-registered account gets cross-signed properly #8750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cypress/integration/1-register/register.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,10 @@ describe("Registration", () => {

cy.url().should('contain', '/#/home');
cy.stopMeasuring("from-submit-to-home");

cy.get('[aria-label="User menu"]').click();
cy.get('[aria-label="Security & Privacy"]').click();
cy.get(".mx_DevicesPanel_myDevice .mx_DevicesPanel_deviceTrust .mx_E2EIcon")
.should("have.class", "mx_E2EIcon_verified");
});
});
4 changes: 2 additions & 2 deletions src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
});
};

private doBootstrapUIAuth = async (makeRequest: (authData: any) => void): Promise<void> => {
private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<void>): Promise<void> => {
if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
makeRequest({
await makeRequest({
type: 'm.login.password',
identifier: {
type: 'm.id.user',
Expand Down
6 changes: 3 additions & 3 deletions src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
}
}

private doBootstrapUIAuth = async (makeRequest: (authData: any) => void): Promise<void> => {
private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<void>): Promise<void> => {
if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
makeRequest({
await makeRequest({
type: 'm.login.password',
identifier: {
type: 'm.id.user',
Expand All @@ -106,7 +106,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
});
} else if (this.props.tokenLogin) {
// We are hoping the grace period is active
makeRequest({});
await makeRequest({});
} else {
const dialogAesthetics = {
[SSOAuthEntry.PHASE_PREAUTH]: {
Expand Down