Merge pull request #2647 from mattermost/signup-fix

Fix email signup when LDAP is present

webapp/components/signup_user_complete.jsx

@@ -25,6 +25,7 @@ class SignupUserComplete extends React.Component {
 
         this.handleSubmit = this.handleSubmit.bind(this);
         this.inviteInfoRecieved = this.inviteInfoRecieved.bind(this);
+        this.handleLdapSignup = this.handleLdapSignup.bind(this);
 
         this.state = {
             data: '',
@@ -81,6 +82,23 @@ class SignupUserComplete extends React.Component {
             teamId: data.id
         });
     }
+
+    handleLdapSignup(method, loginId, password, token) {
+        Client.loginByLdap(this.state.teamName, loginId, password, token,
+            () => {
+                const redirect = Utils.getUrlParameter('redirect');
+                if (redirect) {
+                    browserHistory.push(decodeURIComponent(redirect));
+                } else {
+                    browserHistory.push('/' + this.state.teamName + '/channels/town-square');
+                }
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+    }
+
     handleSubmit(e) {
         e.preventDefault();
 
@@ -368,7 +386,7 @@ class SignupUserComplete extends React.Component {
                             defaultMessage='With your LDAP credentials'
                         />
                     </strong></h5>
-                    <LoginLdap teamName={this.state.teamName}/>
+                    <LoginLdap submit={this.handleLdapSignup}/>
                 </div>
             );
         }
@@ -376,7 +394,7 @@ class SignupUserComplete extends React.Component {
         let emailSignup;
         if (global.window.mm_config.EnableSignUpWithEmail === 'true') {
             emailSignup = (
-                <div>
+                <form>
                     <div className='inner__content'>
                         {email}
                         {yourEmailIs}
@@ -432,7 +450,7 @@ class SignupUserComplete extends React.Component {
                             </button>
                         </p>
                     </div>
-                </div>
+                </form>
             );
         }
 
@@ -485,8 +503,6 @@ class SignupUserComplete extends React.Component {
                 </div>
                 <div className='col-sm-12'>
                     <div className='signup-team__container padding--less'>
-                        <div>
-                            <form>
                         <img
                             className='signup-team-logo'
                             src={logoImage}
@@ -517,8 +533,6 @@ class SignupUserComplete extends React.Component {
                         {ldapSignup}
                         {emailSignup}
                         {serverError}
-                            </form>
-                        </div>
                     </div>
                 </div>
             </div>