From 92cf14d5e9dbf864b2619225de1140c54ee46b8e Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 4 Dec 2015 15:28:35 +0000
Subject: [PATCH] Support registration as a guest

---
 src/GuestAccess.js                      |  2 +-
 src/components/structures/MatrixChat.js | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/GuestAccess.js b/src/GuestAccess.js
index b1a059425d..a76e198b4e 100644
--- a/src/GuestAccess.js
+++ b/src/GuestAccess.js
@@ -43,7 +43,7 @@ class GuestAccess {
     }
 
     getRooms() {
-        return this.rooms.entries();
+        return Array.from(this.rooms.entries());
     }
 
     isGuest() {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 6bb16dafd2..4af6e96c96 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -140,7 +140,14 @@ module.exports = React.createClass({
             config.default_hs_url, config.default_is_url
         );
         MatrixClientPeg.get().registerGuest().done(function(creds) {
-            console.log("Registered as guest: %s", JSON.stringify(creds));
+            console.log("Registered as guest: %s", creds.user_id);
+            self.onLoggedIn({
+                userId: creds.user_id,
+                accessToken: creds.access_token,
+                homeserverUrl: config.default_hs_url,
+                identityServerUrl: config.default_is_url,
+                guest: true
+            });
         }, function(err) {
             console.error(err.data);
             self._setAutoRegisterAsGuest(false);
@@ -361,10 +368,11 @@ module.exports = React.createClass({
     },
 
     onLoggedIn: function(credentials) {
-        console.log("onLoggedIn => %s", credentials.userId);
+        credentials.guest = Boolean(credentials.guest);
+        console.log("onLoggedIn => %s (guest=%s)", credentials.userId, credentials.guest);
         MatrixClientPeg.replaceUsingAccessToken(
             credentials.homeserverUrl, credentials.identityServerUrl,
-            credentials.userId, credentials.accessToken
+            credentials.userId, credentials.accessToken, credentials.guest
         );
         this.setState({
             screen: undefined,