OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Pass the room id to scalar

pull/21833/head
David Baker 2016-05-06 14:42:00 +01:00
parent 6da4b9d671
commit bb9316edfa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ScalarAuthClient.js
View File

@ -33,7 +33,7 @@ class ScalarAuthClient {
if (err) {
defer.reject(err);
} else {
defer.resolve(body);
defer.resolve(body.access_token);
}
});

3
src/components/views/rooms/RoomSettings.js
View File

@ -367,7 +367,8 @@ module.exports = React.createClass({
getScalarInterfaceUrl: function() {
var url = SdkConfig.get().integrations_ui_url;
url += "?token=" + this.state.scalar_token;
url += "?token=" + encodeURIComponent(this.state.scalar_token);
url += "&room_id=" + encodeURIComponent(this.props.room.roomId);
return url;
},