Replace decprected route mixins (ember-simple-auth)

app/routes/application.js

@@ -1,39 +1,22 @@
 import Route from '@ember/routing/route';
-import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 import { inject as service } from '@ember/service';
-import ENV from 'frontend-loket/config/environment';
 import { warn } from '@ember/debug';
 import 'moment';
 import 'moment-timezone';
 
-export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin) {
+export default class ApplicationRoute extends Route {
   @service() currentSession;
   @service() moment;
+  @service() session;
 
   beforeModel() {
     const moment = this.moment;
     moment.setLocale('nl-be');
     moment.setTimeZone('Europe/Brussels');
     moment.set('defaultFormat', 'DD MMM YYYY, HH:mm');
-
     return this._loadCurrentSession();
   }
 
-  sessionAuthenticated() {
-    super.sessionAuthenticated(...arguments);
-    this._loadCurrentSession();
-  }
-
-  sessionInvalidated() {
-    const logoutUrl = ENV['torii']['providers']['acmidm-oauth2']['logoutUrl'];
-    if (logoutUrl.startsWith('http')) {
-      window.location.replace(logoutUrl);
-    }
-    else {
-      warn('Incorrect logout URL configured', { id: 'session-invalidation-failure' });
-    }
-  }
-
   _loadCurrentSession() {
     return this.currentSession.load().catch((e) => {
       warn(e, { id: 'session-load-failure' });
@@ -42,4 +25,3 @@ export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin
 
   }
 }
-

app/routes/bbcdr.js

@@ -1,11 +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 BbcdrRoute extends Route.extend(AuthenticatedRouteMixin) {
+export default class BbcdrRoute extends Route {
+  @service session;
   @service() currentSession;
 
-  beforeModel() {
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+
     if (!this.currentSession.canAccessBbcdr)
       this.transitionTo('index');
   }

app/routes/berichtencentrum.js

@@ -1,12 +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 BerichtencentrumRoute extends Route.extend(AuthenticatedRouteMixin) {
 
+export default class BerichtencentrumRoute extends Route {
+  @service() session;
   @service() currentSession;
 
-  beforeModel() {
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+
     if (!this.currentSession.canAccessBerichten)
       this.transitionTo('index');
   }

app/routes/index.js

@@ -1,6 +1,10 @@
 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 class IndexRoute extends Route.extend(AuthenticatedRouteMixin) {
-
+export default class IndexRoute extends Route {
+  @service session;
+
+  async beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+  }
 }

app/routes/leidinggevendenbeheer.js

@@ -1,17 +1,19 @@
 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, {
-  currentSession: service(),
+export default class LeidinggevendenbeheerRoute extends Route {
+  @service session;
+  @service currentSession;
+
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
 
-  beforeModel() {
     if (!this.currentSession.canAccessLeidinggevenden)
       this.transitionTo('index');
-  },
+  }
 
   model() {
     return this.currentSession.group;
   }
 
-});
+}

app/routes/login.js

@@ -3,9 +3,8 @@ import { inject as service } from '@ember/service';
 
 export default class LoginRoute extends Route {
   @service() session;
-  
+
   beforeModel() {
-    if (this.session.isAuthenticated)
-      this.transitionTo('index');
+    this.session.prohibitAuthentication('index');
   }
 }

app/routes/mandatenbeheer.js

@@ -1,16 +1,18 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import RSVP from 'rsvp';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend({
   currentSession: service(),
+  session: service(),
 
   queryParams: {
     startDate: { refreshModel: true }
   },
 
-  beforeModel() {
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
+
     if (!this.currentSession.canAccessMandaat)
       this.transitionTo('index');
   },

app/routes/mock-login.js

@@ -12,10 +12,9 @@ export default class MockLoginRoute extends Route {
   }
 
   beforeModel() {
-    if (this.session.isAuthenticated)
-      this.transitionTo('index');
+    this.session.prohibitAuthentication('index');
   }
-  
+
   model(params) {
     const filter = { provider: 'https://github.com/lblod/mock-login-service' };
     if (params.gemeente)

app/routes/personeelsbeheer.js

@@ -1,11 +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 Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend({
   currentSession: service(),
+  session: service(),
+
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
 
-  beforeModel() {
     if (!this.currentSession.canAccessPersoneelsbeheer)
       this.transitionTo('index');
   },

app/routes/subsidy.js

@@ -1,13 +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 SubsidyRoute extends Route {
+  @service session;
+  @service currentSession;
 
-export default class SubsidyRoute extends Route.extend(AuthenticatedRouteMixin) {
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
 
-  @service currentSession
-
-  beforeModel() {
     if (!this.currentSession.canAccessSubsidies)
       this.transitionTo('index');
   }

app/routes/subsidy/applications/index.js

@@ -1,8 +1,8 @@
 import Route from '@ember/routing/route';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
+import { inject as service } from '@ember/service';
 import DataTableRouteMixin from 'ember-data-table/mixins/route';
 
-export default class SubsidyApplicationsIndexRoute extends Route.extend(AuthenticatedRouteMixin, DataTableRouteMixin) {
+export default class SubsidyApplicationsIndexRoute extends Route.extend(DataTableRouteMixin) {
   modelName = 'application-form';
 
   mergeQueryOptions() {

app/routes/supervision.js

@@ -1,13 +1,12 @@
 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 SupervisionRoute extends Route.extend(AuthenticatedRouteMixin) {
-
+export default class SupervisionRoute extends Route {
+  @service session;
   @service currentSession
 
-  beforeModel() {
+  beforeModel(transition) {
+    this.session.requireAuthentication(transition, 'login');
     if (!this.currentSession.canAccessToezicht)
       this.transitionTo('index');
   }

app/routes/supervision/submissions/index.js

@@ -1,9 +1,12 @@
 import Route from '@ember/routing/route';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import DataTableRouteMixin from 'ember-data-table/mixins/route';
+import { inject as service } from '@ember/service';
+
+export default class SupervisionSubmissionsIndexRoute extends Route.extend(DataTableRouteMixin) {
+  @service() session;
 
-export default class SupervisionSubmissionsIndexRoute extends Route.extend(AuthenticatedRouteMixin, DataTableRouteMixin) {
   modelName = 'submission'
+
   mergeQueryOptions() {
     return {
       include: [

app/routes/switch-login.js

@@ -1,13 +1,16 @@
-import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
-export default class SwitchLoginRoute extends Route.extend(UnauthenticatedRouteMixin) {
+export default class SwitchLoginRoute extends Route {
   @service() session;
 
+  beforeModel(){
+    this.session.prohibitAuthentication('index');
+  }
+
   async model() {
     try {
-      await this.session.authenticate('authenticator:torii', 'acmidm-oauth2');
+      return await this.session.authenticate('authenticator:torii', 'acmidm-oauth2');
     }
     catch(e) {
       return 'Fout bij het aanmelden. Gelieve opnieuw te proberen.';

app/services/session.js

@@ -0,0 +1,22 @@
+import { warn } from '@ember/debug';
+import { inject as service } from '@ember/service';
+import SessionService from 'ember-simple-auth/services/session';
+import ENV from 'frontend-loket/config/environment';
+
+export default class LoketSessionService extends SessionService {
+  @service currentSession;
+
+  handleAuthentication(routeAfterAuthentication) {
+    super.handleAuthentication(routeAfterAuthentication);
+    this.currentSession.load();
+  }
+
+  handleInvalidation() {
+    const logoutUrl = ENV['torii']['providers']['acmidm-oauth2']['logoutUrl'];
+    if (logoutUrl.startsWith('http')) {
+      super.handleInvalidation(logoutUrl);
+    } else {
+      warn('Incorrect logout URL configured', { id: 'session-invalidation-failure' });
+    }
+  }
+}