matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Pass the room id to scalar

Browse Source
This commit is contained in:
David Baker
2016-05-06 14:42:00 +01:00
parent 6da4b9d671
commit bb9316edfa
2 changed files with 3 additions and 2 deletions
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) { if (err) {
defer.reject(err); defer.reject(err);
} else { } 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() { getScalarInterfaceUrl: function() {
var url = SdkConfig.get().integrations_ui_url; 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; return url;
}, },