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

roughing in custom session (again :( )

Browse source
This commit is contained in:
Matthew Dillon 2015-07-09 20:52:01 -08:00
parent bb2386807c
commit 72c957f8dc
7 changed files with 42 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,17 @@
import Ember from 'ember';
import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin';
// import parseBase64 from '../../utils/parse-base64';
export default Ember.Route.extend(ApplicationRouteMixin, {
// model: function() {
// let token = this.get('session.secure.token');
// if (Ember.isNone(token)) {
// return null;
// }
// let user = parseBase64(token);
// return this.store.find('user', user.sub);
// },
actions: {
invalidateSession: function() {
this.get('session').invalidate().then(() => {

3
app/pods/index/route.js
View file

@ -2,7 +2,8 @@ import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
beforeModel: function() {
beforeModel: function(transition) {
this._super(transition);
this.transitionTo('compare');
}
});

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

@ -11,13 +11,7 @@ export default Ember.Controller.extend({
this.set('loading', true);
// Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages();
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)=> {
session.authenticate(authenticator, credentials).then(null, (error)=> {
this.set('loading', false);
this.get('flashMessages').error(error.error);
});

3
app/pods/species/new/route.js
View file

@ -2,7 +2,8 @@ import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
beforeModel: function() {
beforeModel: function(transition) {
this._super(transition);
if (this.get('session.currentUser.role') === 'R') {
this.transitionTo('species.index');
}

3
app/pods/strains/new/route.js
View file

@ -2,7 +2,8 @@ import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
beforeModel: function() {
beforeModel: function(transition) {
this._super(transition);
if (this.get('session.currentUser.role') === 'R') {
this.transitionTo('strains.index');
}