Merge #1183

1183: Don’t use global events for login action r=carols10cents

Test coverage for this stuff is not great, but I tested it manually. (I have the whole stack running locally now \o/)

Author: bors-voyager[bot]

app/mixins/authenticated-route.js

@@ -1,30 +1,12 @@
 import Mixin from '@ember/object/mixin';
 import { inject as service } from '@ember/service';
-import $ from 'jquery';
 
 export default Mixin.create({
     flashMessages: service(),
 
     beforeModel(transition) {
-        let user = this.session.get('currentUser');
-        if (user !== null) {
-            return;
-        }
-
-        // The current user is loaded asynchronously, so if we haven't actually
-        // loaded the current user yet then we need to wait for it to be loaded.
-        // Once we've done that we can retry the transition and start the whole
-        // process over again!
-        if (!window.currentUserDetected) {
-            transition.abort();
-            $(window).on('currentUserDetected', function() {
-                $(window).off('currentUserDetected');
-                transition.retry();
-            });
-        } else {
-            this.session.set('savedTransition', transition);
+        return this.session.checkCurrentUser(transition, () => {
             this.get('flashMessages').queue('Please log in to proceed');
-            return this.transitionTo('index');
-        }
+        });
     },
 });

app/routes/application.js

@@ -1,27 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import $ from 'jquery';
 
 export default Route.extend({
-
-    ajax: service(),
-
     flashMessages: service(),
 
-    async beforeModel() {
-        if (this.session.get('isLoggedIn') && this.session.get('currentUser') === null) {
-            try {
-                let response = await this.get('ajax').request('/api/v1/me');
-                this.session.set('currentUser', this.store.push(this.store.normalize('user', response.user)));
-            } catch(_) {
-                this.session.logoutUser();
-            } finally {
-                window.currentUserDetected = true;
-                $(window).trigger('currentUserDetected');
-            }
-        } else {
-            window.currentUserDetected = true;
-        }
+    beforeModel() {
+        this.session.loadUser();
     },
 
     actions: {

app/services/session.js

@@ -1,9 +1,15 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 
 export default Service.extend({
     savedTransition: null,
+    abortedTransition: null,
     isLoggedIn: false,
     currentUser: null,
+    currentUserDetected: false,
+
+    ajax: service(),
+    store: service(),
+    router: service(),
 
     init() {
         this._super(...arguments);
@@ -29,6 +35,7 @@ export default Service.extend({
 
     logoutUser() {
         this.set('savedTransition', null);
+        this.set('abortedTransition', null);
         this.set('isLoggedIn', null);
         this.set('currentUser', null);
 
@@ -37,5 +44,50 @@ export default Service.extend({
         } catch(e) {
             // ignore error
         }
+    },
+
+    loadUser() {
+        if (this.get('isLoggedIn') && !this.get('currentUser')) {
+            this.fetchUser()
+                .catch(() => this.logoutUser())
+                .finally(() => {
+                    this.set('currentUserDetected', true);
+                    let transition = this.get('abortedTransition');
+                    if (transition) {
+                        transition.retry();
+                        this.set('abortedTransition', null);
+                    }
+                });
+        } else {
+            this.set('currentUserDetected', true);
+        }
+    },
+
+    fetchUser() {
+        return this.get('ajax').request('/api/v1/me')
+            .then((response) => {
+                this.set('currentUser', this.get('store').push(this.get('store').normalize('user', response.user)));
+            });
+    },
+
+    checkCurrentUser(transition, beforeRedirect) {
+        if (this.get('currentUser')) {
+            return;
+        }
+
+        // The current user is loaded asynchronously, so if we haven't actually
+        // loaded the current user yet then we need to wait for it to be loaded.
+        // Once we've done that we can retry the transition and start the whole
+        // process over again!
+        if (!this.get('currentUserDetected')) {
+            transition.abort();
+            this.set('abortedTransition', transition);
+        } else {
+            this.set('savedTransition', transition);
+            if (beforeRedirect) {
+                beforeRedirect();
+            }
+            return this.get('router').transitionTo('index');
+        }
     }
 });