x-b-e
diff --git a/‎.travis.yml
+1-1 b/‎.travis.yml
+1-1
diff --git a/‎README.md
+16-1 b/‎README.md
+16-1
diff --git a/‎addon/authenticators/devise.js
+32-22 b/‎addon/authenticators/devise.js
+32-22
diff --git a/‎addon/authenticators/oauth2-password-grant.js
+45-20 b/‎addon/authenticators/oauth2-password-grant.js
+45-20
diff --git a/‎addon/initializers/setup-session.js
+1 b/‎addon/initializers/setup-session.js
+1
diff --git a/‎addon/mixins/application-route-mixin.js
+13-2 b/‎addon/mixins/application-route-mixin.js
+13-2
diff --git a/‎addon/mixins/authenticated-route-mixin.js
+12-1 b/‎addon/mixins/authenticated-route-mixin.js
+12-1
diff --git a/‎addon/mixins/unauthenticated-route-mixin.js
+16-3 b/‎addon/mixins/unauthenticated-route-mixin.js
+16-3
@@ -35,7 +35,7 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - ember try:one $EMBER_TRY_SCENARIO test && npm run nodetest && npm run fastboot-nodetest
 
 notifications:
   email: false
 
@@ -540,7 +540,9 @@ store if `localStorage` is available.
 
 [The Cookie store](http://ember-simple-auth.com/api/classes/CookieStore.html)
 stores its data in a cookie. This is used by the adaptive store if
-`localStorage` is not available.
+`localStorage` is not available. __This store must be used when the
+application uses
+[FastBoot](https://github.com/ember-fastboot/ember-cli-fastboot).__
 
 #### Ephemeral Store
 
@@ -590,6 +592,19 @@ export default Base.extend({
 });
 ```
 
+## FastBoot
+
+Ember Simple Auth works with FastBoot out of the box as long as the Cookie
+session store is being used. In order to enable the cookie store, define it as
+the application store:
+
+```js
+// app/session-stores/application.js
+import CookieStore from 'ember-simple-auth/session-stores/cookie';
+
+export default CookieStore.extend();
+```
+
 ## Testing
 
 Ember Simple Auth comes with a __set of test helpers that can be used in
 
@@ -1,9 +1,12 @@
 import Ember from 'ember';
 import BaseAuthenticator from './base';
+import fetch from 'ember-network/fetch';
 
-const { RSVP: { Promise }, isEmpty, run, $: jQuery, assign: emberAssign, merge } = Ember;
+const { RSVP: { Promise }, isEmpty, run, assign: emberAssign, merge } = Ember;
 const assign = emberAssign || merge;
 
+const JSON_CONTENT_TYPE = 'application/json';
+
 /**
   Authenticator that works with the Ruby gem
   [devise](https://github.com/plataformatec/devise).
@@ -118,18 +121,25 @@ export default BaseAuthenticator.extend({
       data[resourceName] = { password };
       data[resourceName][identificationAttributeName] = identification;
 
-      return this.makeRequest(data).then(
-        (response) => {
-          if (this._validate(response)) {
-            const resourceName = this.get('resourceName');
-            const _response = response[resourceName] ? response[resourceName] : response;
-            run(null, resolve, _response);
+      this.makeRequest(data).then((response) => {
+        if (response.ok) {
+          response.json().then((json) => {
+            if (this._validate(json)) {
+              const resourceName = this.get('resourceName');
+              const _json = json[resourceName] ? json[resourceName] : json;
+              run(null, resolve, _json);
+            } else {
+              run(null, reject, `Check that server response includes ${tokenAttributeName} and ${identificationAttributeName}`);
+            }
+          });
+        } else {
+          if (useXhr) {
+            run(null, reject, response);
           } else {
-            run(null, reject, `Check that server response includes ${tokenAttributeName} and ${identificationAttributeName}`);
+            response.json().then((json) => run(null, reject, json));
           }
-        },
-        (xhr) => run(null, reject, useXhr ? xhr : (xhr.responseJSON || xhr.responseText))
-      );
+        }
+      }).catch((error) => run(null, reject, error));
     });
   },
 
@@ -149,25 +159,25 @@ export default BaseAuthenticator.extend({
 
     @method makeRequest
     @param {Object} data The request data
-    @param {Object} options Ajax configuration object merged into argument of `$.ajax`
-    @return {jQuery.Deferred} A promise like jQuery.Deferred as returned by `$.ajax`
+    @param {Object} options request options that are passed to `fetch`
+    @return {Promise} The promise returned by `fetch`
     @protected
   */
-  makeRequest(data, options) {
-    const serverTokenEndpoint = this.get('serverTokenEndpoint');
+  makeRequest(data, options = {}) {
+    let url = options.url || this.get('serverTokenEndpoint');
     let requestOptions = {};
+    let body = JSON.stringify(data);
     assign(requestOptions, {
-      url:      serverTokenEndpoint,
-      type:     'POST',
-      dataType: 'json',
-      data,
-      beforeSend(xhr, settings) {
-        xhr.setRequestHeader('Accept', settings.accepts.json);
+      body,
+      method:   'POST',
+      headers:  {
+        'accept':       JSON_CONTENT_TYPE,
+        'content-type': JSON_CONTENT_TYPE
       }
     });
     assign(requestOptions, options || {});
 
-    return jQuery.ajax(requestOptions);
+    return fetch(url, requestOptions);
   },
 
   _validate(data) {
 
@@ -1,6 +1,7 @@
 /* jscs:disable requireDotNotation */
 import Ember from 'ember';
 import BaseAuthenticator from './base';
+import fetch from 'ember-network/fetch';
 
 const {
   RSVP,
@@ -11,7 +12,6 @@ const {
   assign: emberAssign,
   merge,
   A,
-  $: jQuery,
   testing,
   warn,
   keys: emberKeys
@@ -137,9 +137,24 @@ export default BaseAuthenticator.extend({
     @property rejectWithXhr
     @type Boolean
     @default false
+    @deprecated OAuth2PasswordGrantAuthenticator/rejectWithResponse:property
     @public
   */
-  rejectWithXhr: false,
+  rejectWithXhr: computed.deprecatingAlias('rejectWithResponse'),
+
+  /**
+    When authentication fails, the rejection callback is provided with the whole
+    fetch response object instead of it's response JSON or text.
+
+    This is useful for cases when the backend provides additional context not
+    available in the response body.
+
+    @property rejectWithResponse
+    @type Boolean
+    @default false
+    @public
+  */
+  rejectWithResponse: false,
 
   /**
     Restores the session from a session data object; __will return a resolving
@@ -209,7 +224,7 @@ export default BaseAuthenticator.extend({
     return new RSVP.Promise((resolve, reject) => {
       const data                = { 'grant_type': 'password', username: identification, password };
       const serverTokenEndpoint = this.get('serverTokenEndpoint');
-      const useXhr = this.get('rejectWithXhr');
+      const useResponse = this.get('rejectWithResponse');
       const scopesString = makeArray(scope).join(' ');
       if (!isEmpty(scopesString)) {
         data.scope = scopesString;
@@ -228,8 +243,8 @@ export default BaseAuthenticator.extend({
 
           resolve(response);
         });
-      }, (xhr) => {
-        run(null, reject, useXhr ? xhr : (xhr.responseJSON || xhr.responseText));
+      }, (response) => {
+        run(null, reject, useResponse ? response : response.responseJSON);
       });
     });
   },
@@ -283,29 +298,39 @@ export default BaseAuthenticator.extend({
     @param {String} url The request URL
     @param {Object} data The request data
     @param {Object} headers Additional headers to send in request
-    @return {jQuery.Deferred} A promise like jQuery.Deferred as returned by `$.ajax`
+    @return {Promise} A promise that resolves with the response object`
     @protected
   */
   makeRequest(url, data, headers = {}) {
+    headers['Content-Type'] = 'application/x-www-form-urlencoded';
+
+    const body = keys(data).map((key) => {
+      return `${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`;
+    }).join('&');
+
     const options = {
-      url,
-      data,
-      type:        'POST',
-      dataType:    'json',
-      contentType: 'application/x-www-form-urlencoded',
-      headers
+      body,
+      headers,
+      method: 'POST'
     };
 
     const clientIdHeader = this.get('_clientIdHeader');
     if (!isEmpty(clientIdHeader)) {
       merge(options.headers, clientIdHeader);
     }
-
-    if (isEmpty(keys(options.headers))) {
-      delete options.headers;
-    }
-
-    return jQuery.ajax(options);
+    return new RSVP.Promise((resolve, reject) => {
+      fetch(url, options).then((response) => {
+        response.text().then((text) => {
+          let json = text ? JSON.parse(text) : {};
+          if (!response.ok) {
+            response.responseJSON = json;
+            reject(response);
+          } else {
+            resolve(json);
+          }
+        });
+      }).catch(reject);
+    });
   },
 
   _scheduleAccessTokenRefresh(expiresIn, expiresAt, refreshToken) {
@@ -340,8 +365,8 @@ export default BaseAuthenticator.extend({
           this.trigger('sessionDataUpdated', data);
           resolve(data);
         });
-      }, (xhr, status, error) => {
-        warn(`Access token could not be refreshed - server responded with ${error}.`);
+      }, (response) => {
+        warn(`Access token could not be refreshed - server responded with ${response.responseJSON}.`);
         reject();
       });
     });
 
@@ -13,5 +13,6 @@ export default function setupSession(registry) {
     store = 'session-store:test';
     registry.register(store, Ephemeral);
   }
+
   inject(registry, 'session:main', 'store', store);
 }
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import getOwner from 'ember-getowner-polyfill';
 import Configuration from './../configuration';
 
 const { inject, Mixin, A, run: { bind }, testing, computed } = Ember;
@@ -22,7 +23,7 @@ const { inject, Mixin, A, run: { bind }, testing, computed } = Ember;
       applicationRoute.transitionTo('index');
     });
     session.on('invalidationSucceeded', function() {
-      window.location.reload();
+      applicationRoute.transitionTo('bye');
     });
   };
 
@@ -52,6 +53,12 @@ export default Mixin.create({
   */
   session: inject.service('session'),
 
+  _isFastBoot: computed(function() {
+    const fastboot = getOwner(this).lookup('service:fastboot');
+
+    return fastboot ? fastboot.get('isFastBoot') : false;
+  }),
+
   /**
     The route to transition to after successful authentication.
 
@@ -120,7 +127,11 @@ export default Mixin.create({
   */
   sessionInvalidated() {
     if (!testing) {
-      window.location.replace(Configuration.baseURL);
+      if (this.get('_isFastBoot')) {
+        this.transitionTo(Configuration.baseURL);
+      } else {
+        window.location.replace(Configuration.baseURL);
+      }
     }
   }
 });
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import getOwner from 'ember-getowner-polyfill';
 import Configuration from './../configuration';
 
 const { inject: { service }, Mixin, assert, computed } = Ember;
@@ -33,6 +34,12 @@ export default Mixin.create({
   */
   session: service('session'),
 
+  _isFastBoot: computed(function() {
+    const fastboot = getOwner(this).lookup('service:fastboot');
+
+    return fastboot ? fastboot.get('isFastBoot') : false;
+  }),
+
   /**
     The route to transition to for authentication. The
     {{#crossLink "AuthenticatedRouteMixin"}}{{/crossLink}} will transition to
@@ -72,7 +79,11 @@ export default Mixin.create({
       let authenticationRoute = this.get('authenticationRoute');
       assert('The route configured as Configuration.authenticationRoute cannot implement the AuthenticatedRouteMixin mixin as that leads to an infinite transitioning loop!', this.get('routeName') !== authenticationRoute);
 
-      this.set('session.attemptedTransition', transition);
+      if (!this.get('_isFastBoot')) {
+        transition.abort();
+        this.set('session.attemptedTransition', transition);
+      }
+
       return this.transitionTo(authenticationRoute);
     } else {
       return this._super(...arguments);
 
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import getOwner from 'ember-getowner-polyfill';
 import Configuration from './../configuration';
 
 const { inject: { service }, Mixin, assert, computed } = Ember;
@@ -34,6 +35,12 @@ export default Mixin.create({
   */
   session: service('session'),
 
+  _isFastBoot: computed(function() {
+    const fastboot = getOwner(this).lookup('service:fastboot');
+
+    return fastboot ? fastboot.get('isFastBoot') : false;
+  }),
+
   /**
     The route to transition to if a route that implements the
     {{#crossLink "UnauthenticatedRouteMixin"}}{{/crossLink}} is accessed when
@@ -61,10 +68,16 @@ export default Mixin.create({
     @param {Transition} transition The transition that lead to this route
     @public
   */
-  beforeModel() {
+  beforeModel(transition) {
     if (this.get('session').get('isAuthenticated')) {
-      assert('The route configured as Configuration.routeIfAlreadyAuthenticated cannot implement the UnauthenticatedRouteMixin mixin as that leads to an infinite transitioning loop!', this.get('routeName') !== this.get('routeIfAlreadyAuthenticated'));
-      this.transitionTo(this.get('routeIfAlreadyAuthenticated'));
+      let routeIfAlreadyAuthenticated = this.get('routeIfAlreadyAuthenticated');
+      assert('The route configured as Configuration.routeIfAlreadyAuthenticated cannot implement the UnauthenticatedRouteMixin mixin as that leads to an infinite transitioning loop!', this.get('routeName') !== routeIfAlreadyAuthenticated);
+
+      if (!this.get('_isFastBoot')) {
+        transition.abort();
+      }
+
+      return this.transitionTo(routeIfAlreadyAuthenticated);
     } else {
       return this._super(...arguments);
     }
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ export default function setupSession(registry) {`
`13`	`13`	`store = 'session-store:test';`
`14`	`14`	`registry.register(store, Ephemeral);`
`15`	`15`	`}`
	`16`	`+`
`16`	`17`	`inject(registry, 'session:main', 'store', store);`
`17`	`18`	`}`