thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop custom session

Browse source
This commit is contained in:
Matthew Dillon 2015-06-23 18:47:47 -08:00
parent 6f6faee122
commit 4c8cbd20c7
6 changed files with 30 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/pods/application/route.js
View file

@ -4,7 +4,10 @@ import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin';
export default Ember.Route.extend(ApplicationRouteMixin, {
actions: {
invalidateSession: function() {
this.get('session').invalidate();
this.get('session').invalidate().then(() => {
// Wait until promise is resolved
return true;
});
},
didTransition: function() {

8
app/pods/login/controller.js
View file

@ -1,16 +1,22 @@
import Ember from 'ember';
import parseBase64 from '../../utils/parse-base64';
export default Ember.Controller.extend({
actions: {
authenticate: function() {
let credentials = this.getProperties('identification', 'password');
let session = this.get('session');
let authenticator = 'simple-auth-authenticator:token';
this.set('loading', true);
// Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages();
this.get('session').authenticate(authenticator, credentials).then(()=>{
session.authenticate(authenticator, credentials).then(()=>{
this.set('loading', false);
let t = parseBase64(session.get('secure.token'));
this.store.find('user', t['sub']).then((user) => {
session.set('currentUser', user);
});
}, (error)=> {
this.set('loading', false);
this.get('flashMessages').error(error.error);