Merge branch 'master' into clostridium

* master:
  Refresh token
This commit is contained in:
Matthew Dillon 2015-09-17 15:58:25 -07:00
commit 418b294634
2 changed files with 5 additions and 1 deletions

View file

@ -5,7 +5,7 @@ export default Ember.Controller.extend({
authenticate: function() {
let credentials = this.getProperties('identification', 'password');
let session = this.get('session');
let authenticator = 'simple-auth-authenticator:token';
let authenticator = 'simple-auth-authenticator:jwt';
// Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages();