Merge pull request #1283 from Turbo87/session-cleanup

Cleanup `session` service code

Author: Turbo87

app/controllers/crate/version.js

@@ -1,4 +1,5 @@
 import { alias, readOnly, gt, or } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ArrayProxy from '@ember/array/proxy';
@@ -12,6 +13,8 @@ const NUM_VERSIONS = 5;
 const PromiseArray = ArrayProxy.extend(PromiseProxyMixin);
 
 export default Controller.extend({
+    session: service(),
+
     isDownloading: false,
 
     downloadsContext: computed('requestedVersion', 'model', 'crate', function() {
@@ -27,8 +30,8 @@ export default Controller.extend({
     keywords: alias('crate.keywords'),
     categories: alias('crate.categories'),
     badges: alias('crate.badges'),
-    isOwner: computed('crate.owner_user', function() {
-        return this.get('crate.owner_user').findBy('login', this.session.get('currentUser.login'));
+    isOwner: computed('crate.owner_user', 'session.currentUser.login', function() {
+        return this.get('crate.owner_user').findBy('login', this.get('session.currentUser.login'));
     }),
 
     sortedVersions: readOnly('crate.versions'),

app/initializers/session.js

@@ -3,9 +3,10 @@ import { inject as service } from '@ember/service';
 
 export default Mixin.create({
     flashMessages: service(),
+    session: service(),
 
     beforeModel(transition) {
-        return this.session.checkCurrentUser(transition, () => {
+        return this.get('session').checkCurrentUser(transition, () => {
             this.get('flashMessages').queue('Please log in to proceed');
         });
     },

app/mixins/authenticated-route.js

@@ -3,9 +3,10 @@ import { inject as service } from '@ember/service';
 
 export default Route.extend({
     flashMessages: service(),
+    session: service(),
 
     beforeModel() {
-        this.session.loadUser();
+        this.get('session').loadUser();
     },
 
     actions: {

app/routes/application.js

@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 export default Route.extend({
     flashMessages: service(),
     ajax: service(),
+    session: service(),
 
     async model(params) {
         try {
@@ -19,9 +20,9 @@ export default Route.extend({
 
                 Suggestions of a more ideomatic way to fix/test this are welcome!
             */
-            if (this.session.get('isLoggedIn')) {
+            if (this.get('session.isLoggedIn')) {
                 this.get('ajax').request('/api/v1/me').then((response) => {
-                    this.session.set('currentUser', this.store.push(this.store.normalize('user', response.user)));
+                    this.get('session').set('currentUser', this.store.push(this.store.normalize('user', response.user)));
                 });
             }
 

app/routes/confirm.js

@@ -3,8 +3,8 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-
     ajax: service(),
+    session: service(),
 
     flashMessages: service(),
 
@@ -84,7 +84,7 @@ export default Route.extend({
         controller.set('requestedVersion', requestedVersion);
         controller.set('fetchingFollowing', true);
 
-        if (this.session.get('currentUser')) {
+        if (this.get('session.currentUser')) {
             this.get('ajax').request(`/api/v1/crates/${crate.get('name')}/following`)
                 .then((d) => controller.set('following', d.following))
                 .finally(() => controller.set('fetchingFollowing', false));

app/routes/crate/version.js

@@ -22,7 +22,7 @@ export default Route.extend(AuthenticatedRoute, {
     },
 
     model() {
-        return this.session.get('currentUser');
+        return this.get('session.currentUser');
     },
 
     async afterModel(user) {

app/routes/dashboard.js

@@ -10,6 +10,7 @@ import { inject as service } from '@ember/service';
  */
 export default Route.extend({
     flashMessages: service(),
+    session: service(),
 
     beforeModel(transition) {
         try {
@@ -68,8 +69,8 @@ export default Route.extend({
             }
 
             let user = this.store.push(this.store.normalize('user', data.user));
-            let transition = this.session.get('savedTransition');
-            this.session.loginUser(user);
+            let transition = this.get('session.savedTransition');
+            this.get('session').loginUser(user);
             if (transition) {
                 transition.retry();
             }

app/routes/login.js

@@ -3,13 +3,13 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-
     ajax: service(),
+    session: service(),
 
     async activate() {
         await this.get('ajax').delete(`/logout`);
         run(() => {
-            this.session.logoutUser();
+            this.get('session').logoutUser();
             this.transitionTo('index');
         });
     }

app/routes/logout.js

@@ -9,7 +9,7 @@ export default Route.extend(AuthenticatedRoute, {
     },
 
     model(params) {
-        params.user_id = this.session.get('currentUser.id');
+        params.user_id = this.get('session.currentUser.id');
         return this.store.query('crate', params);
     },
 });

app/routes/me/crates.js

@@ -5,7 +5,7 @@ import AuthenticatedRoute from '../../mixins/authenticated-route';
 export default Route.extend(AuthenticatedRoute, {
     model() {
         return {
-            user: this.session.get('currentUser'),
+            user: this.get('session.currentUser'),
             api_tokens: this.get('store').findAll('api-token'),
         };
     },

app/routes/me/index.js

@@ -83,6 +83,10 @@ export default function() {
         };
     });
 
+    this.get('/crates/:crate_id/following', (/* schema, request */) => {
+        // TODO
+    });
+
     this.get('/crates/:crate_id/versions', (schema, request) => {
         let crate = request.params.crate_id;
         return schema.versions.where({ crate }).sort((a, b) => compareIsoDates(b.created_at, a.created_at));

mirage/config.js

@@ -182,14 +182,13 @@ test('navigating to the owners page when not logged in', async function(assert)
 test('navigating to the owners page when not an owner', async function(assert) {
     server.loadFixtures();
 
-    this.application.register('service:session-b', Service.extend({
+    this.application.__deprecatedInstance__.register('service:session', Service.extend({
         currentUser: {
             login: 'iain8'
-        }
+        },
+        loadUser() {},
     }));
 
-    this.application.inject('controller', 'session', 'service:session-b');
-
     await visit('/crates/nanomsg');
 
     assert.dom('#crate-owners p a').doesNotExist();
@@ -198,14 +197,13 @@ test('navigating to the owners page when not an owner', async function(assert) {
 test('navigating to the owners page', async function(assert) {
     server.loadFixtures();
 
-    this.application.register('service:session-b', Service.extend({
+    this.application.__deprecatedInstance__.register('service:session', Service.extend({
         currentUser: {
             login: 'thehydroimpulse'
-        }
+        },
+        loadUser() {},
     }));
 
-    this.application.inject('controller', 'session', 'service:session-b');
-
     await visit('/crates/nanomsg');
     await click('#crate-owners p a');