renamed session service content property to data, close #598

mainmatter · Aug 11, 2015 · 7b9c03d · 7b9c03d
1 parent 49504da
commit 7b9c03d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/services/session.js b/app/services/session.js
@@ -5,7 +5,7 @@ const { alias, oneWay } = computed;
 
 export default Ember.Service.extend(Ember.Evented, {
   isAuthenticated: oneWay('session.isAuthenticated'),
-  content:         alias('session.content'),
+  data:            alias('session.content'),
 
   _forwardSessionEvents: on('init', function() {
     Ember.A([

diff --git a/tests/dummy/app/adapters/application.js b/tests/dummy/app/adapters/application.js
@@ -10,7 +10,7 @@ export default DS.JSONAPIAdapter.extend({
     let hash = this._super(...arguments);
     let { beforeSend } = hash;
     hash.beforeSend = (xhr) => {
-      let accessToken = this.get('session.content.secure.access_token');
+      let accessToken = this.get('session.data.secure.access_token');
       if (this.get('session.isAuthenticated') && !Ember.isEmpty(accessToken)) {
         xhr.setRequestHeader('Authorization', `Bearer ${accessToken}`);
       }

diff --git a/tests/dummy/app/services/session-account.js b/tests/dummy/app/services/session-account.js
@@ -6,8 +6,8 @@ export default Ember.Service.extend({
   session: service('session'),
   store: Ember.inject.service(),
 
-  account: Ember.computed('session.content.secure.account_id', function() {
-    const accountId = this.get('session.content.secure.account_id');
+  account: Ember.computed('session.data.secure.account_id', function() {
+    const accountId = this.get('session.data.secure.account_id');
     if (!Ember.isEmpty(accountId)) {
       return DS.PromiseObject.create({
         promise: this.get('store').find('account', accountId)