setup-session-restoration: Convert to regular initializer (#1547)

Author: Turbo87

addon/initializers/setup-session-restoration.js

@@ -0,0 +1,23 @@
+import { getOwner } from '@ember/application';
+
+export default function setupSessionRestoration(registry) {
+  const ApplicationRoute = registry.resolveRegistration
+    ? registry.resolveRegistration('route:application')
+    : registry.resolve('route:application');
+
+  ApplicationRoute.reopen({
+    init() {
+      this._super(...arguments);
+
+      const originalBeforeModel = this.beforeModel;
+      this.beforeModel = function() {
+        const session = getOwner(this).lookup('session:main');
+
+        return session.restore().then(
+          () => originalBeforeModel.apply(this, arguments),
+          () => originalBeforeModel.apply(this, arguments)
+        );
+      };
+    },
+  });
+}

addon/instance-initializers/setup-session-restoration.js

@@ -2,6 +2,7 @@ import ENV from '../config/environment';
 import Configuration from 'ember-simple-auth/configuration';
 import setupSession from 'ember-simple-auth/initializers/setup-session';
 import setupSessionService from 'ember-simple-auth/initializers/setup-session-service';
+import setupSessionRestoration from 'ember-simple-auth/initializers/setup-session-restoration';
 
 export default {
   name: 'ember-simple-auth',
@@ -13,5 +14,6 @@ export default {
 
     setupSession(registry);
     setupSessionService(registry);
+    setupSessionRestoration(registry);
   }
 };

addon/utils/lookup.js

@@ -1,49 +1,59 @@
 import Route from '@ember/routing/route';
+import { getOwner, setOwner } from '@ember/application';
 import RSVP from 'rsvp';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
 import sinon from 'sinon';
-import setupSessionRestoration from 'ember-simple-auth/instance-initializers/setup-session-restoration';
+import setupSessionRestoration from 'ember-simple-auth/initializers/setup-session-restoration';
 
 describe('setupSessionRestoration', () => {
-  let container;
-  let containerStub;
-  let route;
+  let registry;
+  let resolveStub;
+  let ApplicationRoute;
 
   beforeEach(function() {
-    container = {
-      lookup() {}
+    registry = {
+      resolve() {}
     };
 
-    route = Route.extend().create();
+    ApplicationRoute = Route.extend();
 
-    containerStub = sinon.stub(container, 'lookup');
+    resolveStub = sinon.stub(registry, 'resolve');
   });
 
   it('adds a beforeModel method', function() {
-    containerStub.withArgs('route:application').returns(route);
-    setupSessionRestoration({ container });
+    resolveStub.withArgs('route:application').returns(ApplicationRoute);
+    setupSessionRestoration(registry);
 
+    const route = ApplicationRoute.create();
     expect(route).to.respondTo('beforeModel');
   });
 
   describe('the beforeModel method', function() {
-    let session;
+    let session, route;
 
     beforeEach(function() {
       session = {
         restore() {}
       };
 
-      route = Route.extend({
+      ApplicationRoute = Route.extend({
         beforeModel() {
           return RSVP.resolve('test');
         }
-      }).create();
+      });
+
+      resolveStub.withArgs('route:application').returns(ApplicationRoute);
+      setupSessionRestoration(registry);
+
+      route = ApplicationRoute.create({ container: {} });
+
+      if (setOwner) {
+        setOwner(route, { lookup() {} });
+      }
 
-      containerStub.withArgs('route:application').returns(route);
-      containerStub.withArgs('session:main').returns(session);
-      setupSessionRestoration({ container });
+      const owner = getOwner(route);
+      sinon.stub(owner, 'lookup').withArgs('session:main').returns(session);
     });
 
     describe('when session restoration resolves', function() {