Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/actions/LoginActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import {LOGIN_USER, LOGOUT_USER} from '../constants/LoginConstants.js';
import RouterContainer from '../services/RouterContainer'

export default {
loginUser: (jwt) => {
loginUser: (jwt, rememberMe) => {
var savedJwt = localStorage.getItem('jwt');

rememberMe = rememberMe || false;

AppDispatcher.dispatch({
actionType: LOGIN_USER,
jwt: jwt
Expand All @@ -15,7 +16,10 @@ export default {
var nextPath = RouterContainer.get().getCurrentQuery().nextPath || '/';

RouterContainer.get().transitionTo(nextPath);
localStorage.setItem('jwt', jwt);

if(rememberMe) {
localStorage.setItem('jwt', jwt);
}
}
},
logoutUser: () => {
Expand Down
15 changes: 13 additions & 2 deletions src/components/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ export default class Login extends React.Component {
super()
this.state = {
user: '',
password: ''
password: '',
rememberMe: false
};
}

login(e) {
e.preventDefault();
Auth.login(this.state.user, this.state.password)
Auth.login(this.state.user, this.state.password, this.state.rememberMe)
.catch(function(err) {
alert("There's an error logging in");
console.log("Error logging in", err);
Expand All @@ -34,11 +35,21 @@ export default class Login extends React.Component {
<label htmlFor="password">Password</label>
<input type="password" valueLink={this.linkState('password')} className="form-control" id="password" ref="password" placeholder="Password" />
</div>
<div className="form-group">
<label htmlFor="rememberMe">Remember me</label>
<input type="checkbox" className="form-control" id="rememberMe" ref="rememberMe" placeholder="Remember Me" onChange={this.toggleRememberMe} />
</div>
<button type="submit" className="btn btn-default" onClick={this.login.bind(this)}>Submit</button>
</form>
</div>
);
}

toggleRememberMe() {
this.setState({
rememberMe: !this.state.rememberMe
});
}
}

ReactMixin(Login.prototype, React.addons.LinkedStateMixin);
8 changes: 4 additions & 4 deletions src/services/AuthService.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import LoginActions from '../actions/LoginActions';

class AuthService {

login(username, password) {
login(username, password, rememberMe) {
return this.handleAuth(when(request({
url: LOGIN_URL,
method: 'POST',
Expand All @@ -14,7 +14,7 @@ class AuthService {
data: {
username, password
}
})));
})), rememberMe);
}

logout() {
Expand All @@ -33,11 +33,11 @@ class AuthService {
})));
}

handleAuth(loginPromise) {
handleAuth(loginPromise, rememberMe) {
return loginPromise
.then(function(response) {
var jwt = response.id_token;
LoginActions.loginUser(jwt);
LoginActions.loginUser(jwt, rememberMe);
return true;
});
}
Expand Down