Changing the way we mattermost handles URLs. team.domain.com becomes domain.com/team.

Renaming team.Name to team.DisplayName and team.Domain to team.Name.
So: team.Name -> url safe name. team.DisplayName -> nice name for users

web/react/components/password_reset.jsx

@@ -10,13 +10,6 @@ SendResetPasswordLink = React.createClass({
         e.preventDefault();
         var state = {};
 
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
         var email = this.refs.email.getDOMNode().value.trim();
         if (!email) {
             state.error = "Please enter a valid email address."
@@ -29,17 +22,17 @@ SendResetPasswordLink = React.createClass({
 
         data = {};
         data['email'] = email;
-        data['domain'] = domain;
+        data['name'] = this.props.teamName;
 
         client.sendPasswordReset(data,
-            function(data) {
-                this.setState({ error: null, update_text: <p>A password reset link has been sent to <b>{email}</b> for your <b>{this.props.teamName}</b> team on {config.SiteName}.com.</p>, more_update_text: "Please check your inbox." });
-                $(this.refs.reset_form.getDOMNode()).hide();
-            }.bind(this),
-            function(err) {
-                this.setState({ error: err.message, update_text: null, more_update_text: null });
-            }.bind(this)
-        );
+             function(data) {
+                 this.setState({ error: null, update_text: <p>A password reset link has been sent to <b>{email}</b> for your <b>{this.props.teamDisplayName}</b> team on {window.location.hostname}.</p>, more_update_text: "Please check your inbox." });
+                 $(this.refs.reset_form.getDOMNode()).hide();
+             }.bind(this),
+             function(err) {
+                 this.setState({ error: err.message, update_text: null, more_update_text: null });
+             }.bind(this)
+            );
     },
     getInitialState: function() {
         return {};
@@ -48,24 +41,13 @@ SendResetPasswordLink = React.createClass({
         var update_text = this.state.update_text ? <div className="reset-form alert alert-success">{this.state.update_text}{this.state.more_update_text}</div> : null;
         var error = this.state.error ? <div className="form-group has-error"><label className="control-label">{this.state.error}</label></div> : null;
 
-        var subDomain = utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
         return (
             <div className="col-sm-12">
                 <div className="signup-team__container">
                     <h3>Password Reset</h3>
                     { update_text }
                     <form onSubmit={this.handleSendLink} ref="reset_form">
-                        <p>{"To reset your password, enter the email address you used to sign up for " + this.props.teamName + "."}</p>
-                        <div className="form-group">
-                            <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                        </div>
+                        <p>{"To reset your password, enter the email address you used to sign up for " + this.props.teamDisplayName + "."}</p>
                         <div className={error ? 'form-group has-error' : 'form-group'}>
                             <input type="text" className="form-control" name="email" ref="email" placeholder="Email" />
                         </div>
@@ -83,13 +65,6 @@ ResetPassword = React.createClass({
         e.preventDefault();
         var state = {};
 
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
         var password = this.refs.password.getDOMNode().value.trim();
         if (!password || password.length < 5) {
             state.error = "Please enter at least 5 characters."
@@ -104,41 +79,30 @@ ResetPassword = React.createClass({
         data['new_password'] = password;
         data['hash'] = this.props.hash;
         data['data'] = this.props.data;
-        data['domain'] = domain;
+        data['name'] = this.props.teamName;
 
         client.resetPassword(data,
-            function(data) {
-                this.setState({ error: null, update_text: "Your password has been updated successfully." });
-            }.bind(this),
-            function(err) {
-                this.setState({ error: err.message, update_text: null });
-            }.bind(this)
-        );
+             function(data) {
+                 this.setState({ error: null, update_text: "Your password has been updated successfully." });
+             }.bind(this),
+             function(err) {
+                 this.setState({ error: err.message, update_text: null });
+             }.bind(this)
+            );
     },
     getInitialState: function() {
         return {};
     },
     render: function() {
-        var update_text = this.state.update_text ? <div className="form-group"><br/><label className="control-label reset-form">{this.state.update_text} Click <a href="/login">here</a> to log in.</label></div> : null;
+        var update_text = this.state.update_text ? <div className="form-group"><br/><label className="control-label reset-form">{this.state.update_text} Click <a href={"/" + this.props.teamName + "/login"}>here</a> to log in.</label></div> : null;
         var error = this.state.error ? <div className="form-group has-error"><label className="control-label">{this.state.error}</label></div> : null;
 
-        var subDomain = this.props.domain != "" ? this.props.domain : utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
         return (
             <div className="col-sm-12">
                 <div className="signup-team__container">
                     <h3>Password Reset</h3>
                     <form onSubmit={this.handlePasswordReset}>
-                        <p>{"Enter a new password for your " + this.props.teamName + " " + config.SiteName + " account."}</p>
-                        <div className="form-group">
-                            <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                        </div>
+                        <p>{"Enter a new password for your " + this.props.teamDisplayName + " " + config.SiteName + " account."}</p>
                         <div className={error ? 'form-group has-error' : 'form-group'}>
                             <input type="password" className="form-control" name="password" ref="password" placeholder="Password" />
                         </div>
@@ -161,14 +125,15 @@ module.exports = React.createClass({
         if (this.props.isReset === "false") {
             return (
                 <SendResetPasswordLink
+                    teamDisplayName={this.props.teamDisplayName}
                     teamName={this.props.teamName}
                 />
             );
         } else {
             return (
                 <ResetPassword
+                    teamDisplayName={this.props.teamDisplayName}
                     teamName={this.props.teamName}
-                    domain={this.props.domain}
                     hash={this.props.hash}
                     data={this.props.data}
                 />