From bb9316edfa7186215ec900360319fa579456ff7a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 May 2016 14:42:00 +0100
Subject: [PATCH] Pass the room id to scalar

---
 src/ScalarAuthClient.js                    | 2 +-
 src/components/views/rooms/RoomSettings.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 0607e072ac..8216f20314 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -33,7 +33,7 @@ class ScalarAuthClient {
             if (err) {
                 defer.reject(err);
             } else {
-                defer.resolve(body);
+                defer.resolve(body.access_token);
             }
         });
 
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 86dfbcf886..87985ae262 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -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;
     },