This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 827
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #494 from matrix-org/rav/reinstate_device_id
Add the deviceId back to memberdeviceinfo
- Loading branch information
Showing
4 changed files
with
160 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
| 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 MatrixClientPeg from '../../../MatrixClientPeg'; | ||
| import sdk from '../../../index'; | ||
| import Modal from '../../../Modal'; | ||
|
|
||
| export default React.createClass({ | ||
| displayName: 'DeviceVerifyButtons', | ||
|
|
||
| propTypes: { | ||
| userId: React.PropTypes.string.isRequired, | ||
| device: React.PropTypes.object.isRequired, | ||
| }, | ||
|
|
||
| onVerifyClick: function() { | ||
| var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); | ||
| Modal.createDialog(QuestionDialog, { | ||
| title: "Verify device", | ||
| description: ( | ||
| <div> | ||
| <p> | ||
| To verify that this device can be trusted, please contact its | ||
| owner using some other means (e.g. in person or a phone call) | ||
| and ask them whether the key they see in their User Settings | ||
| for this device matches the key below: | ||
| </p> | ||
| <div className="mx_UserSettings_cryptoSection"> | ||
| <ul> | ||
| <li><label>Device name:</label> <span>{ this.props.device.getDisplayName() }</span></li> | ||
| <li><label>Device ID:</label> <span><code>{ this.props.device.deviceId}</code></span></li> | ||
| <li><label>Device key:</label> <span><code><b>{ this.props.device.getFingerprint() }</b></code></span></li> | ||
| </ul> | ||
| </div> | ||
| <p> | ||
| If it matches, press the verify button below. | ||
| If it doesnt, then someone else is intercepting this device | ||
| and you probably want to press the block button instead. | ||
| </p> | ||
| <p> | ||
| In future this verification process will be more sophisticated. | ||
| </p> | ||
| </div> | ||
| ), | ||
| button: "I verify that the keys match", | ||
| onFinished: confirm=>{ | ||
| if (confirm) { | ||
| MatrixClientPeg.get().setDeviceVerified( | ||
| this.props.userId, this.props.device.deviceId, true | ||
| ); | ||
| } | ||
| }, | ||
| }); | ||
| }, | ||
|
|
||
| onUnverifyClick: function() { | ||
| MatrixClientPeg.get().setDeviceVerified( | ||
| this.props.userId, this.props.device.deviceId, false | ||
| ); | ||
| }, | ||
|
|
||
| onBlockClick: function() { | ||
| MatrixClientPeg.get().setDeviceBlocked( | ||
| this.props.userId, this.props.device.deviceId, true | ||
| ); | ||
| }, | ||
|
|
||
| onUnblockClick: function() { | ||
| MatrixClientPeg.get().setDeviceBlocked( | ||
| this.props.userId, this.props.device.deviceId, false | ||
| ); | ||
| }, | ||
|
|
||
| render: function() { | ||
| var blockButton = null, verifyButton = null; | ||
|
|
||
| if (this.props.device.isBlocked()) { | ||
| blockButton = ( | ||
| <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblock" | ||
| onClick={this.onUnblockClick}> | ||
| Unblock | ||
| </button> | ||
| ); | ||
| } else { | ||
| blockButton = ( | ||
| <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_block" | ||
| onClick={this.onBlockClick}> | ||
| Block | ||
| </button> | ||
| ); | ||
| } | ||
|
|
||
| if (this.props.device.isVerified()) { | ||
| verifyButton = ( | ||
| <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify" | ||
| onClick={this.onUnverifyClick}> | ||
| Unverify | ||
| </button> | ||
| ); | ||
| } else { | ||
| verifyButton = ( | ||
| <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify" | ||
| onClick={this.onVerifyClick}> | ||
| Verify | ||
| </button> | ||
| ); | ||
| } | ||
|
|
||
| // mx_MemberDeviceInfo because the vector's CSS on EncryptedEventDialog is awful | ||
| return ( | ||
| <div className="mx_MemberDeviceInfo mx_DeviceVerifyButtons" > | ||
| { verifyButton } | ||
| { blockButton } | ||
| </div> | ||
| ); | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters