From d0e3d9aef8bc1ec64449b016148a2015cc18308a Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 18 Aug 2015 17:45:42 -0700
Subject: Url parameters are now removed after logging in

---
 web/react/components/login.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index b61ea931e..926a775e2 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -8,6 +8,12 @@ var BrowserStore = require('../stores/browser_store.jsx');
 var Constants = require('../utils/constants.jsx');
 
 module.exports = React.createClass({
+    displayName: 'Login',
+    propTypes: {
+        teamName: React.PropTypes.string,
+        teamDisplayName: React.PropTypes.string,
+        authServices: React.PropTypes.object
+    },
     handleSubmit: function(e) {
         e.preventDefault();
         var state = {};
@@ -49,9 +55,9 @@ module.exports = React.createClass({
 
                 var redirect = utils.getUrlParameter('redirect');
                 if (redirect) {
-                    window.location.pathname = decodeURIComponent(redirect);
+                    window.location.href = decodeURIComponent(redirect);
                 } else {
-                    window.location.pathname = '/' + name + '/channels/town-square';
+                    window.location.href = '/' + name + '/channels/town-square';
                 }
             },
             function loginFailed(err) {
-- 
cgit v1.2.3-1-g7c22


From c7185ffb689cd4fa5dd8aa7cc8fb6ec1e337a703 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 19 Aug 2015 12:22:37 -0700
Subject: Additional cosmetic reformatting to meet new es6 requirements

---
 web/react/components/login.jsx | 70 +++++++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 18 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 926a775e2..678a2ff87 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -7,14 +7,13 @@ var UserStore = require('../stores/user_store.jsx');
 var BrowserStore = require('../stores/browser_store.jsx');
 var Constants = require('../utils/constants.jsx');
 
-module.exports = React.createClass({
-    displayName: 'Login',
-    propTypes: {
-        teamName: React.PropTypes.string,
-        teamDisplayName: React.PropTypes.string,
-        authServices: React.PropTypes.object
-    },
-    handleSubmit: function(e) {
+export default class Login extends React.Component {
+    constructor(props) {
+        super(props);
+        this.handleSubmit = this.handleSubmit.bind(this);
+        this.state = {};
+    }
+    handleSubmit(e) {
         e.preventDefault();
         var state = {};
 
@@ -70,11 +69,8 @@ module.exports = React.createClass({
                 this.setState(state);
             }.bind(this)
         );
-    },
-    getInitialState: function() {
-        return { };
-    },
-    render: function() {
+    }
+    render() {
         var serverError;
         if (this.state.serverError) {
             serverError = <label className='control-label'>{this.state.serverError}</label>;
@@ -130,13 +126,33 @@ module.exports = React.createClass({
                         {serverError}
                     </div>
                     <div className={'form-group' + errorClass}>
-                        <input autoFocus={focusEmail} type='email' className='form-control' name='email' defaultValue={priorEmail} ref='email' placeholder='Email' />
+                        <input
+                            autoFocus={focusEmail}
+                            type='email'
+                            className='form-control'
+                            name='email'
+                            defaultValue={priorEmail}
+                            ref='email'
+                            placeholder='Email'
+                        />
                     </div>
                     <div className={'form-group' + errorClass}>
-                        <input autoFocus={focusPassword} type='password' className='form-control' name='password' ref='password' placeholder='Password' />
+                        <input
+                            autoFocus={focusPassword}
+                            type='password'
+                            className='form-control'
+                            name='password'
+                            ref='password'
+                            placeholder='Password'
+                        />
                     </div>
                     <div className='form-group'>
-                        <button type='submit' className='btn btn-primary'>Sign in</button>
+                        <button
+                            type='submit'
+                            className='btn btn-primary'
+                        >
+                            Sign in
+                        </button>
                     </div>
                     {loginMessage}
                     <div className='form-group margin--extra form-group--small'>
@@ -146,10 +162,28 @@ module.exports = React.createClass({
                         <a href={'/' + teamName + '/reset_password'}>I forgot my password</a>
                     </div>
                     <div className='margin--extra'>
-                        <span>{'Want to create your own ' + strings.Team + '?'} <a href='/' className='signup-team-login'>Sign up now</a></span>
+                        <span>{'Want to create your own ' + strings.Team + '? '}
+                            <a
+                                href='/'
+                                className='signup-team-login'
+                            >
+                                Sign up now
+                            </a>
+                        </span>
                     </div>
                 </form>
             </div>
         );
     }
-});
+}
+
+Login.defaultProps = {
+    teamName: '',
+    teamDisplayName: '',
+    authServices: ''
+};
+Login.propTypes = {
+    teamName: React.PropTypes.string,
+    teamDisplayName: React.PropTypes.string,
+    authServices: React.PropTypes.string
+};
-- 
cgit v1.2.3-1-g7c22