73daa80b7f
no issue
- upgrade to latest `ember-source` and related dependencies including `ember-cli`
- upgrade to latest `ember-mocha` and modern ember testing setup
- https://github.com/emberjs/rfcs/blob/master/text/0268-acceptance-testing-refactor.md
- switch from using global acceptance test helpers and `native-dom-helpers` to using the new `ember-test-helpers` methods
- use [`chai-dom`](https://github.com/nathanboktae/chai-dom) assertions where in some places (still a lot of places in the tests that could use these)
- pin `ember-in-viewport` to 3.0.x to work around incompatibilities between different versions used in `ember-light-table`, `ember-infinity`, and `ember-sticky-element`
- incompatibilities manifested as "Invalid value used as weak map key" errors thrown when using `ember-light-table` (subscribers screen)
- pin `ember-power-datepicker` to unreleased version that contains a move from global acceptance test helpers to modern test helpers
27 lines
838 B
JavaScript
27 lines
838 B
JavaScript
import RSVP from 'rsvp';
|
|
import SessionService from 'ember-simple-auth/services/session';
|
|
import {computed} from '@ember/object';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
export default SessionService.extend({
|
|
feature: service(),
|
|
dataStore: service('store'), // SessionService.store already exists
|
|
tour: service(),
|
|
|
|
user: computed(function () {
|
|
return this.get('dataStore').queryRecord('user', {id: 'me'});
|
|
}),
|
|
|
|
authenticate() {
|
|
return this._super(...arguments).then((authResult) => {
|
|
// TODO: remove duplication with application.afterModel
|
|
let preloadPromises = [
|
|
this.get('feature').fetch(),
|
|
this.get('tour').fetchViewed()
|
|
];
|
|
|
|
return RSVP.all(preloadPromises).then(() => authResult);
|
|
});
|
|
}
|
|
});
|