sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1013 from matrix-org/dbkr/fix_3pid_invite_pwlu

Browse Source 
Fix accepting a 3pid invite
This commit is contained in:
David Baker
2017-06-02 16:33:13 +01:00
committed by GitHub
parent ec0ad93ad7 2cc9f9c403
commit 792f825ea9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/structures/RoomView.js
+3 -1
View File
@@ -764,11 +764,13 @@ module.exports = React.createClass({
// If the user is a ROU, allow them to transition to a PWLU // If the user is a ROU, allow them to transition to a PWLU
if (cli && cli.isGuest()) { if (cli && cli.isGuest()) {
// Join this room once the user has registered and logged in // Join this room once the user has registered and logged in
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
dis.dispatch({ dis.dispatch({
action: 'do_after_sync_prepared', action: 'do_after_sync_prepared',
deferred_action: { deferred_action: {
action: 'join_room', action: 'join_room',
room_id: this.state.roomId, opts: { inviteSignUrl: signUrl },
}, },
}); });