Merge pull request #2880 from matrix-org/travis/remove-try-app-link

Remove 'try the app' link from login
matrix-org · Apr 5, 2019 · 2ca281f · 2ca281f
2 parents 67d22ab + 0e7688d
commit 2ca281f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 68 deletions.
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
@@ -203,9 +203,6 @@ export function handleInvalidStoreError(e) {
 function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
     console.log(`Doing guest login on ${hsUrl}`);
 
-    // TODO: we should probably de-duplicate this and Login.loginAsGuest.
-    // Not really sure where the right home for it is.
-
     // create a temporary MatrixClient to do the login
     const client = Matrix.createClient({
         baseUrl: hsUrl,

diff --git a/src/Login.js b/src/Login.js
@@ -81,26 +81,6 @@ export default class Login {
         return flowStep ? flowStep.type : null;
     }
 
-    loginAsGuest() {
-        const client = this._createTemporaryClient();
-        return client.registerGuest({
-            body: {
-                initial_device_display_name: this._defaultDeviceDisplayName,
-            },
-        }).then((creds) => {
-            return {
-                userId: creds.user_id,
-                deviceId: creds.device_id,
-                accessToken: creds.access_token,
-                homeserverUrl: this._hsUrl,
-                identityServerUrl: this._isUrl,
-                guest: true,
-            };
-        }, (error) => {
-            throw error;
-        });
-    }
-
     loginViaPassword(username, phoneCountry, phoneNumber, pass) {
         const self = this;
 

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
@@ -2032,7 +2032,6 @@ export default React.createClass({
                     fallbackHsUrl={this.getFallbackHsUrl()}
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onForgotPasswordClick={this.onForgotPasswordClick}
-                    enableGuest={this.props.enableGuest}
                     onServerConfigChange={this.onServerConfigChange}
                 />
             );

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
@@ -54,8 +54,6 @@ module.exports = React.createClass({
     propTypes: {
         onLoggedIn: PropTypes.func.isRequired,
 
-        enableGuest: PropTypes.bool,
-
         // The default server name to use when the user hasn't specified
         // one. If set, `defaultHsUrl` and `defaultHsUrl` were derived for this
         // via `.well-known` discovery. The server name is used instead of the
@@ -225,37 +223,6 @@ module.exports = React.createClass({
         }).done();
     },
 
-    _onLoginAsGuestClick: function(ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        const self = this;
-        self.setState({
-            busy: true,
-            errorText: null,
-            loginIncorrect: false,
-        });
-
-        this._loginLogic.loginAsGuest().then(function(data) {
-            self.props.onLoggedIn(data);
-        }, function(error) {
-            let errorText;
-            if (error.httpStatus === 403) {
-                errorText = _t("Guest access is disabled on this homeserver.");
-            } else {
-                errorText = self._errorTextFromError(error);
-            }
-            self.setState({
-                errorText: errorText,
-                loginIncorrect: false,
-            });
-        }).finally(function() {
-            self.setState({
-                busy: false,
-            });
-        }).done();
-    },
-
     onUsernameChanged: function(username) {
         this.setState({ username: username });
     },
@@ -627,14 +594,6 @@ module.exports = React.createClass({
 
         const errorText = this.props.defaultServerDiscoveryError || this.state.discoveryError || this.state.errorText;
 
-        let loginAsGuestJsx;
-        if (this.props.enableGuest) {
-            loginAsGuestJsx =
-                <a className="mx_AuthBody_changeFlow" onClick={this._onLoginAsGuestClick} href="#">
-                    { _t('Try the app first') }
-                </a>;
-        }
-
         let errorTextSection;
         if (errorText) {
             errorTextSection = (
@@ -658,7 +617,6 @@ module.exports = React.createClass({
                     <a className="mx_AuthBody_changeFlow" onClick={this.onRegisterClick} href="#">
                         { _t('Create account') }
                     </a>
-                    { loginAsGuestJsx }
                 </AuthBody>
             </AuthPage>
         );

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1478,7 +1478,6 @@
     "Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
-    "Guest access is disabled on this homeserver.": "Guest access is disabled on this homeserver.",
     "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
     "Unknown failure discovering homeserver": "Unknown failure discovering homeserver",
@@ -1487,7 +1486,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "Sign in with single sign-on": "Sign in with single sign-on",
-    "Try the app first": "Try the app first",
     "Create account": "Create account",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",