From 30a544eb00a6a6877ba9f33318a85e99715241ec Mon Sep 17 00:00:00 2001
From: Marco Otte-Witte <marco.otte-witte@simplabs.com>
Date: Mon, 29 Feb 2016 20:45:47 +0100
Subject: [PATCH] =?UTF-8?q?prefer=20overriding=20init=20over=20on('init',?=
 =?UTF-8?q?=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/internal-session.js               |  7 ++++---
 addon/mixins/application-route-mixin.js | 11 ++++++++---
 addon/services/session.js               | 11 ++++++++---
 addon/session-stores/cookie.js          |  8 +++++---
 addon/session-stores/ephemeral.js       |  7 ++++---
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/addon/internal-session.js b/addon/internal-session.js
index 83c3fb1df..88d6323ab 100644
--- a/addon/internal-session.js
+++ b/addon/internal-session.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import getOwner from 'ember-getowner-polyfill';
 
-const { RSVP, on, isNone, isEmpty } = Ember;
+const { RSVP, isNone, isEmpty } = Ember;
 
 export default Ember.ObjectProxy.extend(Ember.Evented, {
   authenticator:       null,
@@ -12,6 +12,7 @@ export default Ember.ObjectProxy.extend(Ember.Evented, {
   init() {
     this._super(...arguments);
     this.set('content', { authenticated: {} });
+    this._bindToStoreEvents();
   },
 
   authenticate(authenticatorFactory, ...args) {
@@ -156,7 +157,7 @@ export default Ember.ObjectProxy.extend(Ember.Evented, {
     });
   },
 
-  _bindToStoreEvents: on('init', function() {
+  _bindToStoreEvents() {
     this.store.on('sessionDataUpdated', (content) => {
       let { authenticator: authenticatorFactory } = (content.authenticated || {});
       if (!!authenticatorFactory) {
@@ -176,7 +177,7 @@ export default Ember.ObjectProxy.extend(Ember.Evented, {
         this._clearWithContent(content, true);
       }
     });
-  }),
+  },
 
   _lookupAuthenticator(authenticator) {
     return getOwner(this).lookup(authenticator);
diff --git a/addon/mixins/application-route-mixin.js b/addon/mixins/application-route-mixin.js
index 2a22090c1..e773e6e93 100644
--- a/addon/mixins/application-route-mixin.js
+++ b/addon/mixins/application-route-mixin.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import Configuration from './../configuration';
 
-const { inject, on } = Ember;
+const { inject } = Ember;
 
 /**
   The mixin for the application route; __defines methods that are called when
@@ -52,7 +52,12 @@ export default Ember.Mixin.create({
   */
   session: inject.service('session'),
 
-  _subscribeToSessionEvents: on('init', function() {
+  init() {
+    this._super(...arguments);
+    this._subscribeToSessionEvents();
+  },
+
+  _subscribeToSessionEvents() {
     Ember.A([
       ['authenticationSucceeded', 'sessionAuthenticated'],
       ['invalidationSucceeded', 'sessionInvalidated']
@@ -61,7 +66,7 @@ export default Ember.Mixin.create({
         this[method](...arguments);
       }));
     });
-  }),
+  },
 
   /**
     This method handles the session's
diff --git a/addon/services/session.js b/addon/services/session.js
index e33d46eeb..f1879c419 100644
--- a/addon/services/session.js
+++ b/addon/services/session.js
@@ -3,7 +3,7 @@ import getOwner from 'ember-getowner-polyfill';
 
 const SESSION_DATA_KEY_PREFIX = /^data\./;
 
-const { computed, on }  = Ember;
+const { computed }  = Ember;
 
 /**
   __The session service provides access to the current session as well as
@@ -114,6 +114,11 @@ export default Ember.Service.extend(Ember.Evented, {
   */
   attemptedTransition: computed.alias('session.attemptedTransition'),
 
+  init() {
+    this._super(...arguments);
+    this._forwardSessionEvents();
+  },
+
   set(key, value) {
     const setsSessionData = SESSION_DATA_KEY_PREFIX.test(key);
     if (setsSessionData) {
@@ -124,7 +129,7 @@ export default Ember.Service.extend(Ember.Evented, {
     }
   },
 
-  _forwardSessionEvents: on('init', function() {
+  _forwardSessionEvents() {
     Ember.A([
       'authenticationSucceeded',
       'invalidationSucceeded'
@@ -137,7 +142,7 @@ export default Ember.Service.extend(Ember.Evented, {
         });
       }
     });
-  }),
+  },
 
   /**
     __Authenticates the session with an `authenticator`__ and appropriate
diff --git a/addon/session-stores/cookie.js b/addon/session-stores/cookie.js
index 1a4028d6a..44a29d0cd 100644
--- a/addon/session-stores/cookie.js
+++ b/addon/session-stores/cookie.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import BaseStore from './base';
 import objectsAreEqual from '../utils/objects-are-equal';
 
-const { RSVP, computed, on, run: { next } } = Ember;
+const { RSVP, computed, run: { next } } = Ember;
 
 /**
   Session store that persists data in a cookie.
@@ -87,13 +87,15 @@ export default BaseStore.extend({
     return visibilityState === 'visible';
   }).volatile(),
 
-  _setup: on('init', function() {
+  init() {
+    this._super(...arguments);
+
     next(() => {
       this._syncData().then(() => {
         this._renewExpiration();
       });
     });
-  }),
+  },
 
   /**
     Persists the `data` in the cookie.
diff --git a/addon/session-stores/ephemeral.js b/addon/session-stores/ephemeral.js
index cd159d0b6..4a98979fd 100644
--- a/addon/session-stores/ephemeral.js
+++ b/addon/session-stores/ephemeral.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import BaseStore from './base';
 
-const { RSVP, on } = Ember;
+const { RSVP } = Ember;
 
 /**
   Session store that __persists data in memory and thus is not actually
@@ -15,9 +15,10 @@ const { RSVP, on } = Ember;
   @public
 */
 export default BaseStore.extend({
-  _setup: on('init', function() {
+  init() {
+    this._super(...arguments);
     this.clear();
-  }),
+  },
 
   /**
     Persists the `data`. This replaces all currently stored data.