From 30e9c7608945aefeebf1ca42b69411978dd4295c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 20:44:13 +0200
Subject: [PATCH] login as guest button on the login page

---
 src/components/structures/MatrixChat.js  |  6 ++++--
 src/components/structures/login/Login.js | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5869c8ef33..0a9231247c 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -175,7 +175,7 @@ module.exports = React.createClass({
                 guest: true
             });
         }, function(err) {
-            console.error(err.data);
+            console.error("Failed to register as guest: " + err + " " + err.data);
             self._setAutoRegisterAsGuest(false);
         });
     },
@@ -970,7 +970,9 @@ module.exports = React.createClass({
                     onRegisterClick={this.onRegisterClick}
                     homeserverUrl={this.props.config.default_hs_url}
                     identityServerUrl={this.props.config.default_is_url}
-                    onForgotPasswordClick={this.onForgotPasswordClick} />
+                    onForgotPasswordClick={this.onForgotPasswordClick} 
+                    onLoginAsGuestClick={this.props.enableGuest && this.props.config && this.props.config.default_hs_url ? this._registerAsGuest: undefined}
+                    />
             );
         }
     }
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index b853b8fd95..356439b0cc 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -35,7 +35,8 @@ module.exports = React.createClass({displayName: 'Login',
         // login shouldn't know or care how registration is done.
         onRegisterClick: React.PropTypes.func.isRequired,
         // login shouldn't care how password recovery is done.
-        onForgotPasswordClick: React.PropTypes.func
+        onForgotPasswordClick: React.PropTypes.func,
+        onLoginAsGuestClick: React.PropTypes.func,
     },
 
     getDefaultProps: function() {
@@ -167,6 +168,13 @@ module.exports = React.createClass({displayName: 'Login',
         var LoginFooter = sdk.getComponent("login.LoginFooter");
         var loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
 
+        var loginAsGuestJsx;
+        if (this.props.onLoginAsGuestClick) {
+            loginAsGuestJsx =
+                <a className="mx_Login_create" onClick={this.props.onLoginAsGuestClick} href="#">
+                    Login as guest
+                </a>
+        }
         return (
             <div className="mx_Login">
                 <div className="mx_Login_box">
@@ -188,6 +196,7 @@ module.exports = React.createClass({displayName: 'Login',
                         <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
                             Create a new account
                         </a>
+                        { loginAsGuestJsx }
                         <br/>
                         <LoginFooter />
                     </div>