Merge pull request #2391 from Turbo87/simple-auth

Fix ember-simple-auth deprecation warnings

Author: Turbo87

ember/app/routes/application.js

@@ -7,13 +7,12 @@ import Ember from 'ember';
 import RSVP from 'rsvp';
 
 import * as Sentry from '@sentry/browser';
-import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
 import _availableLocales from '../utils/locales';
 
 const FALLBACK_LOCALE = 'en';
 
-export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin) {
+export default class ApplicationRoute extends Route {
   @service account;
   @service ajax;
   @service cookies;
@@ -80,18 +79,6 @@ export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin
     }
   }
 
-  sessionAuthenticated() {
-    const attemptedTransition = this.get('session.attemptedTransition');
-    const inLoginRoute = this.controllerFor('application').get('inLoginRoute');
-
-    if (attemptedTransition) {
-      attemptedTransition.retry();
-      this.set('session.attemptedTransition', null);
-    } else if (inLoginRoute) {
-      this.transitionTo('index');
-    }
-  }
-
   @action
   loading(transition) {
     this.progress.handle(transition);

ember/app/routes/flight-upload.js

@@ -1,11 +1,14 @@
 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 class FlightUploadRoute extends Route.extend(AuthenticatedRouteMixin) {
+export default class FlightUploadRoute extends Route {
   @service ajax;
   @service account;
+  @service session;
+
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+  }
 
   async model() {
     let ajax = this.ajax;

ember/app/routes/login.js

@@ -1,8 +1,13 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
-import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
+export default class LoginRoute extends Route {
+  @service session;
+
+  beforeModel() {
+    this.session.prohibitAuthentication('index');
+  }
 
-export default class LoginRoute extends Route.extend(UnauthenticatedRouteMixin) {
   setupController() {
     super.setupController(...arguments);
     this.controllerFor('application').set('inLoginRoute', true);

ember/app/routes/notifications.js

@@ -1,19 +1,22 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
-
 const PER_PAGE = 20;
 
-export default Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend({
   ajax: service(),
+  session: service(),
 
   queryParams: {
     page: { refreshModel: true },
     user: { refreshModel: true },
     type: { refreshModel: true },
   },
 
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+  },
+
   model(params) {
     let data = {
       page: params.page,

ember/app/routes/settings.js

@@ -1,10 +1,13 @@
 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 class SettingsRoute extends Route.extend(AuthenticatedRouteMixin) {
+export default class SettingsRoute extends Route {
   @service ajax;
+  @service session;
+
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+  }
 
   model() {
     return this.ajax.request('/api/settings/');