imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites

Browse source 
Wire up support for keypair 3pid invites.
This commit is contained in:
David Baker 2016-02-23 16:37:55 +00:00
commit b384d8c91a
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/RoomView.js
View file

@ -63,6 +63,10 @@ module.exports = React.createClass({
roomId: React.PropTypes.string.isRequired,
// The URL used to join this room from an email invite
// (given as part of the link in the invite email)
inviteSignUrl: React.PropTypes.string,
// id of an event to jump to. If not given, will go to the end of the
// live timeline.
eventId: React.PropTypes.string,
@ -707,7 +711,7 @@ module.exports = React.createClass({
}
display_name_promise.then(() => {
return MatrixClientPeg.get().joinRoom(this.props.roomId)
return MatrixClientPeg.get().joinRoom(this.props.roomId, { inviteSignUrl: this.props.inviteSignUrl } )
}).done(function() {
// It is possible that there is no Room yet if state hasn't come down
// from /sync - joinRoom will resolve when the HTTP request to join succeeds,