Merge pull request mainmatter#2315 from BobrImperator/2302-use-di-part-2

[2302]  put internal-session into DI system

packages/ember-simple-auth/addon/initializers/setup-session.js

@@ -1,16 +1,11 @@
 import Ember from 'ember';
 import InternalSession from '../internal-session';
 import Ephemeral from '../session-stores/ephemeral';
-import inject from '../utils/inject';
 
 export default function setupSession(registry) {
   registry.register('session:main', InternalSession);
 
-  let store = 'session-store:application';
   if (Ember.testing) {
-    store = 'session-store:test';
-    registry.register(store, Ephemeral);
+    registry.register('session-store:test', Ephemeral);
   }
-
-  inject(registry, 'session:main', 'store', store);
 }

packages/ember-simple-auth/addon/internal-session.js

@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import RSVP from 'rsvp';
 import { isEmpty, isNone } from '@ember/utils';
 import ObjectProxy from '@ember/object/proxy';
@@ -17,6 +18,12 @@ export default ObjectProxy.extend(Evented, {
   init() {
     this._super(...arguments);
     this.set('content', { authenticated: {} });
+    let storeFactory = 'session-store:application';
+    if (Ember.testing) {
+      storeFactory = 'session-store:test';
+    }
+
+    this.set('store', getOwner(this).lookup(storeFactory));
     this._busy = false;
     this._bindToStoreEvents();
   },

packages/ember-simple-auth/addon/services/session.js

@@ -137,8 +137,11 @@ export default Service.extend(Evented, {
   */
   attemptedTransition: alias('session.attemptedTransition'),
 
+  session: null,
+
   init() {
     this._super(...arguments);
+    this.set('session', getOwner(this).lookup('session:main'));
     this._forwardSessionEvents();
   },
 

packages/ember-simple-auth/app/initializers/ember-simple-auth.js

@@ -1,7 +1,6 @@
 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';
 import Adaptive from 'ember-simple-auth/session-stores/adaptive';
 import LocalStorage from 'ember-simple-auth/session-stores/local-storage';
@@ -20,7 +19,6 @@ export default {
     registry.register('session-store:local-storage', LocalStorage);
 
     setupSession(registry);
-    setupSessionService(registry);
     setupSessionRestoration(registry);
   }
 };

packages/ember-simple-auth/tests/unit/initializers/setup-session-service-test.js

@@ -1,27 +1,21 @@
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
 import sinonjs from 'sinon';
-import setupSessionService from 'ember-simple-auth/initializers/setup-session-service';
+import { setupTest } from 'ember-mocha';
 
 describe('setupSessionService', () => {
+  setupTest();
   let sinon;
-  let registry;
 
   beforeEach(function() {
     sinon = sinonjs.createSandbox();
-    registry = {
-      injection() {}
-    };
   });
 
   afterEach(function() {
     sinon.restore();
   });
 
   it('injects the session into the session service', function() {
-    sinon.spy(registry, 'injection');
-    setupSessionService(registry);
-
-    expect(registry.injection).to.have.been.calledWith('service:session', 'session', 'session:main');
+    expect(this.owner.lookup('service:session').session).eq(this.owner.lookup('session:main'));
   });
 });

packages/ember-simple-auth/tests/unit/internal-session-store-test.js

@@ -0,0 +1,40 @@
+import Ember from 'ember';
+import { describe, beforeEach, it } from 'mocha';
+import { setupApplicationTest } from 'ember-mocha';
+import { expect } from 'chai';
+import sinonjs from 'sinon';
+
+describe('InternalSession store injection', () => {
+  setupApplicationTest();
+
+  let sinon;
+  let session;
+
+  beforeEach(function() {
+    sinon = sinonjs.createSandbox();
+  });
+
+  afterEach(function() {
+    sinon.restore();
+  });
+
+  describe('session store injection', function() {
+    afterEach(function() {
+      Ember.testing = true; // eslint-disable-line ember/no-ember-testing-in-module-scope
+    });
+
+    it('looks up the test session store when Ember.testing true', function() {
+      Ember.testing = true; // eslint-disable-line ember/no-ember-testing-in-module-scope
+
+      session = this.owner.lookup('session:main');
+      expect(session.get('store')).to.eql(this.owner.lookup('session-store:test'));
+    });
+
+    it('looks up the application session store when Ember.testing false', function() {
+      Ember.testing = false; // eslint-disable-line ember/no-ember-testing-in-module-scope
+
+      session = this.owner.lookup('session:main');
+      expect(session.get('store')).to.eql(this.owner.lookup('session-store:application'));
+    });
+  });
+});

packages/ember-simple-auth/tests/unit/internal-session-test.js

@@ -1,12 +1,9 @@
 import RSVP from 'rsvp';
 import { next } from '@ember/runloop';
-import { setOwner } from '@ember/application';
 import { describe, beforeEach, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import { expect } from 'chai';
 import sinonjs from 'sinon';
-import InternalSession from 'ember-simple-auth/internal-session';
-import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 import Authenticator from 'ember-simple-auth/authenticators/base';
 
 describe('InternalSession', () => {
@@ -20,12 +17,10 @@ describe('InternalSession', () => {
   beforeEach(function() {
     sinon = sinonjs.createSandbox();
 
-    store = EphemeralStore.create();
-    authenticator = Authenticator.create();
-    this.owner.register('authenticator:test', authenticator, { instantiate: false });
-
-    session = InternalSession.create({ store });
-    setOwner(session, this.owner);
+    this.owner.register('authenticator:test', Authenticator);
+    authenticator = this.owner.lookup('authenticator:test');
+    session = this.owner.lookup('session:main');
+    store = session.get('store');
   });
 
   afterEach(function() {
@@ -808,11 +803,4 @@ describe('InternalSession', () => {
       });
     });
   });
-
-  it('does not share the content object between multiple instances', function() {
-    let session2 = InternalSession.create({ store });
-    setOwner(session2, this.owner);
-
-    expect(session2.get('content')).to.not.equal(session.get('content'));
-  });
 });

packages/ember-simple-auth/tests/unit/mixins/application-route-mixin-test.js

@@ -8,8 +8,6 @@ import { setupTest } from 'ember-mocha';
 import { expect } from 'chai';
 import sinonjs from 'sinon';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
-import InternalSession from 'ember-simple-auth/internal-session';
-import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 import * as LocationUtil from 'ember-simple-auth/utils/location';
 
 describe('ApplicationRouteMixin', () => {
@@ -24,8 +22,7 @@ describe('ApplicationRouteMixin', () => {
   beforeEach(function() {
     sinon = sinonjs.createSandbox();
 
-    session = InternalSession.create({ store: EphemeralStore.create() });
-    this.owner.register('session:main', session, { instantiate: false });
+    session = this.owner.lookup('session:main');
     sessionService = this.owner.lookup('service:session');
 
     this.owner.register('service:cookies', Service.extend({

packages/ember-simple-auth/tests/unit/services/session-test.js

@@ -1,16 +1,12 @@
 import Ember from 'ember';
-import ObjectProxy from '@ember/object/proxy';
 import Service from '@ember/service';
-import { setOwner } from '@ember/application';
-import Evented from '@ember/object/evented';
 import { next } from '@ember/runloop';
 import EmberObject, { set } from '@ember/object';
 import { registerDeprecationHandler } from '@ember/debug';
 import { describe, beforeEach, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import { expect } from 'chai';
 import sinonjs from 'sinon';
-import Session from 'ember-simple-auth/services/session';
 import * as LocationUtil from 'ember-simple-auth/utils/location';
 
 describe('SessionService', () => {
@@ -22,20 +18,12 @@ describe('SessionService', () => {
 
   beforeEach(function() {
     sinon = sinonjs.createSandbox();
-    session = ObjectProxy.extend(Evented, {
-      init() {
-        this._super(...arguments);
-        this.content = {};
-      }
-    }).create();
-
     this.owner.register('authorizer:custom', EmberObject.extend({
       authorize() {}
     }));
 
-    sessionService = Session.create({ session });
-    setOwner(sessionService, this.owner);
-    this.owner.register('service:session', sessionService, { instantiate: false });
+    sessionService = this.owner.lookup('service:session');
+    session = sessionService.get('session');
   });
 
   afterEach(function() {
@@ -147,19 +135,19 @@ describe('SessionService', () => {
     it("is read from the session's content", function() {
       session.set('some', 'data');
 
-      expect(sessionService.get('data')).to.eql({ some: 'data' });
+      expect(sessionService.get('data')).to.eql({ some: 'data', authenticated: {} });
     });
 
     it("is written back to the session's content", function() {
       sessionService.set('data.some', { other: 'data' });
 
-      expect(session.content).to.eql({ some: { other: 'data' } });
+      expect(session.content).to.eql({ some: { other: 'data' }, authenticated: {} });
     });
 
     it('can be set with Ember.set', function() {
       set(sessionService, 'data.emberSet', 'ember-set-data');
 
-      expect(session.content).to.eql({ emberSet: 'ember-set-data' });
+      expect(session.content).to.eql({ emberSet: 'ember-set-data', authenticated: {} });
     });
 
     it('is read-only', function() {
@@ -325,7 +313,7 @@ describe('SessionService', () => {
         it("does not set the session's 'attemptedTransition' property", function() {
           sessionService.requireAuthentication(null, 'login');
 
-          expect(sessionService.get('attemptedTransition')).to.be.undefined;
+          expect(sessionService.get('attemptedTransition')).to.be.null;
         });
 
         it('does not set the redirectTarget cookie in fastboot', function() {