WIP sas in right panel
This commit is contained in:
parent
d8a38e6b74
commit
c02fc44d25
3 changed files with 135 additions and 9 deletions
30
src/components/views/right_panel/EncryptionInfo.js
Normal file
30
src/components/views/right_panel/EncryptionInfo.js
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import sdk from "../../..";
|
||||||
|
|
||||||
|
export default class EncryptionInfo extends React.PureComponent {
|
||||||
|
render() {
|
||||||
|
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||||
|
return (<div>
|
||||||
|
<p>End-to-end encryption is great!</p>
|
||||||
|
<div>
|
||||||
|
<AccessibleButton onClick={this.props.onStartVerification}>Start verification</AccessibleButton>
|
||||||
|
</div>
|
||||||
|
</div>);
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,4 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2015, 2016 OpenMarket Ltd
|
|
||||||
Copyright 2017, 2018 Vector Creations Ltd
|
|
||||||
Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
|
|
||||||
Copyright 2019 The Matrix.org Foundation C.I.C.
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
@ -18,16 +15,27 @@ limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import EncryptionInfo from "./EncryptionInfo";
|
||||||
|
import VerificationPanel from "./VerificationPanel";
|
||||||
|
import MatrixClientPeg from "../../../MatrixClientPeg";
|
||||||
|
|
||||||
export default class EncryptionPanel extends React.PureComponent {
|
export default class EncryptionPanel extends React.PureComponent {
|
||||||
render() {
|
render() {
|
||||||
const request = this.props.verificationRequest;
|
const request = this.props.verificationRequest || this.state.verificationRequest;
|
||||||
|
const {member} = this.props;
|
||||||
if (request) {
|
if (request) {
|
||||||
return <p>got a request, go straight to wizard</p>;
|
return <VerificationPanel request={request} />;
|
||||||
} else if (this.props.member) {
|
} else if (member) {
|
||||||
return <p>show encryption options for member {this.props.member.name}</p>;
|
return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
|
||||||
} else {
|
|
||||||
return <p>nada</p>;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_onStartVerification = async () => {
|
||||||
|
const client = MatrixClientPeg.get();
|
||||||
|
const {member} = this.props;
|
||||||
|
// TODO: get the room id of the DM here?
|
||||||
|
// will this panel be shown in non-DM rooms?
|
||||||
|
const verificationRequest = await client.requestVerificationDM(member.userId, member.roomId);
|
||||||
|
this.setState({verificationRequest});
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
88
src/components/views/right_panel/VerificationPanel.js
Normal file
88
src/components/views/right_panel/VerificationPanel.js
Normal file
|
@ -0,0 +1,88 @@
|
||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import sdk from "../../..";
|
||||||
|
import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
|
||||||
|
|
||||||
|
export default class VerificationPanel extends React.PureComponent {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||||
|
const Spinner = sdk.getComponent('elements.Spinner');
|
||||||
|
const {request} = this.props;
|
||||||
|
|
||||||
|
if (request.requested) {
|
||||||
|
return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
|
||||||
|
} else if (request.ready) {
|
||||||
|
return (<p>{request.otherUserId} is ready, start <AccessibleButton onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
|
||||||
|
} else if (request.started) {
|
||||||
|
if (this.state.sasEvent) {
|
||||||
|
const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
|
||||||
|
return (<div>
|
||||||
|
<VerificationShowSas
|
||||||
|
sas={this.state.sasEvent.sas}
|
||||||
|
onCancel={this._onSasMismatchesClick}
|
||||||
|
onDone={this._onSasMatchesClick}
|
||||||
|
/>
|
||||||
|
</div>);
|
||||||
|
} else {
|
||||||
|
return (<p>Setting up SAS verification...</p>);
|
||||||
|
}
|
||||||
|
} else if (request.done) {
|
||||||
|
return <p>verified {request.otherUserId}!!</p>;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_startSAS = async () => {
|
||||||
|
const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
|
||||||
|
verifier.on('show_sas', this._onVerifierShowSas);
|
||||||
|
try {
|
||||||
|
await this._verifier.verify();
|
||||||
|
} finally {
|
||||||
|
this.setState({sasEvent: null});
|
||||||
|
verifier.removeListener('show_sas', this._onVerifierShowSas);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
_onSasMatchesClick = () => {
|
||||||
|
this.state.sasEvent.confirm();
|
||||||
|
};
|
||||||
|
|
||||||
|
_onSasMismatchesClick = () => {
|
||||||
|
this.state.sasEvent.cancel();
|
||||||
|
};
|
||||||
|
|
||||||
|
_onVerifierShowSas = (sasEvent) => {
|
||||||
|
this.setState({sasEvent});
|
||||||
|
};
|
||||||
|
|
||||||
|
_onRequestChange = () => {
|
||||||
|
this.forceUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.props.request.on("change", this._onRequestChange);
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.props.request.off("change", this._onRequestChange);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue