Remove deprecated mixins in favor of session service

packages/classic-test-app/app/adapters/application.js

@@ -1,11 +1,11 @@
-/* eslint-disable ember/no-mixins */
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 import config from '../config/environment';
 import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default JSONAPIAdapter.extend(DataAdapterMixin, {
+export default JSONAPIAdapter.extend({
   host: config.apiHost,
+  session: service(),
 
   headers: computed('session.{data.authenticated.access_token,isAuthenticated}', function() {
     let headers = {};
@@ -15,4 +15,11 @@ export default JSONAPIAdapter.extend(DataAdapterMixin, {
 
     return headers;
   }),
+
+  handleResponse(status) {
+    if (status === 401 && this.get('session.isAuthenticated')) {
+      this.get('session').invalidate();
+    }
+    return this._super(...arguments);
+  },
 });

packages/classic-test-app/app/routes/application.js

@@ -1,21 +1,10 @@
-/* eslint-disable ember/no-mixins */
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
-import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
-export default Route.extend(ApplicationRouteMixin, {
-  sessionAccount: service('session-account'),
+export default Route.extend({
+  session: service(),
 
   beforeModel() {
-    return this._loadCurrentUser();
+    return this.session.setup();
   },
-
-  sessionAuthenticated() {
-    this._super(...arguments);
-    this._loadCurrentUser();
-  },
-
-  _loadCurrentUser() {
-    return this.get('sessionAccount').loadCurrentUser().catch(() => this.get('session').invalidate());
-  }
 });

packages/classic-test-app/app/routes/auth-error.js

@@ -1,10 +1,13 @@
-/* eslint-disable ember/no-mixins */
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend({
   store: service(),
+  session: service(),
+
+  beforeModel(transition) {
+    this.get('session').requireAuthentication(transition, 'login');
+  },
 
   model() {
     return this.get('store').find('post', 3);

packages/classic-test-app/app/routes/callback.js

@@ -1,7 +1,17 @@
-/* eslint-disable ember/no-mixins */
 import Route from '@ember/routing/route';
-import OAuth2ImplicitGrantCallbackRouteMixin from 'ember-simple-auth/mixins/oauth2-implicit-grant-callback-route-mixin';
+import { inject as service } from '@ember/service';
+import { parseResponse } from 'ember-simple-auth/authenticators/oauth2-implicit-grant';
 
-export default Route.extend(OAuth2ImplicitGrantCallbackRouteMixin, {
-  authenticator: 'authenticator:oauth2-implicit-grant'
+export default Route.extend({
+  session: service(),
+
+  activate() {
+    if (!this.fastboot.isFastBoot) {
+      let hash = parseResponse(window.location.hash);
+
+      this.get('session').authenticate('authenticator:oauth2-implicit-grant', hash).catch((error) => {
+        this.set('error', error);
+      });
+    }
+  },
 });

packages/classic-test-app/app/routes/login.js

@@ -1,5 +1,10 @@
-/* eslint-disable ember/no-mixins */
 import Route from '@ember/routing/route';
-import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
+import { inject as service } from '@ember/service'
 
-export default Route.extend(UnauthenticatedRouteMixin);
+export default Route.extend({
+  session: service(),
+
+  beforeModel(transition) {
+    this.get('session').prohibitAuthentication('index');
+  }
+});

packages/classic-test-app/app/routes/protected.js

@@ -1,10 +1,13 @@
-/* eslint-disable ember/no-mixins */
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend({
   store: service(),
+  session: service(),
+
+  beforeModel(transition) {
+    this.get('session').requireAuthentication(transition, 'login');
+  },
 
   model() {
     return this.get('store').findAll('post');

packages/classic-test-app/app/services/session.js

@@ -0,0 +1,12 @@
+import { inject as service } from '@ember/service';
+import SessionService from 'ember-simple-auth/services/session';
+
+export default SessionService.extend({
+  sessionAccount: service(),
+
+  handleAuthentication() {
+    this._super(...arguments);
+
+    this.get('sessionAccount').loadCurrentUser().catch(() => this.invalidate());
+  }
+});

packages/classic-test-app/ember-cli-build.js

@@ -4,7 +4,11 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
   let app = new EmberApp(defaults, {
-    // Add options here
+    // Fixes automatic setup deprecation
+    // ember-simple-auth.initializer.setup-session-restoration
+    'ember-simple-auth': {
+      useSessionSetupMethod: true,
+    }
   });
 
   // Use `app.import` to add additional libraries to the generated

packages/classic-test-app/lib/my-engine/addon/routes/index.js

@@ -1,9 +1,10 @@
-/* eslint-disable ember/no-mixins */
 import Route from '@ember/routing/route';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
+import { inject as service } from '@ember/service'
 
-export default Route.extend(AuthenticatedRouteMixin, {
-  triggerAuthentication() {
-    this.transitionToExternal('login');
+export default Route.extend({
+  session: service(),
+
+  beforeModel(transition) {
+    this.get('session').requireAuthentication(transition, 'login');
   }
 });

packages/ember-simple-auth/addon/authenticators/oauth2-implicit-grant.js

@@ -33,7 +33,7 @@ export function parseResponse(locationHash) {
  ([RFC 6749](http://tools.ietf.org/html/rfc6749)), specifically the _"Implicit
  Grant Type"_.
 
- Use {{#crossLink "OAuth2ImplicitGrantCallbackMixin"}}{{/crossLink}} in your
+ Use {{#crossLink "SessionService/authenticate:method"}}{{/crossLink}} in your
  OAuth 2.0 redirect route to parse authentication parameters from location
  hash string into an object.