fix logout

Author: abhishek97

app/adapters/application.js

@@ -5,6 +5,7 @@ import { underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
 
 export default DS.JSONAPIAdapter.extend(DataAdapterMixin, {
+  session: service(),
   authorize (xhr) {
     let { key } = this.get('session.data.authenticated')
     xhr.setRequestHeader('Authorization', `Bearer ${key}`);
@@ -41,5 +42,12 @@ export default DS.JSONAPIAdapter.extend(DataAdapterMixin, {
     } else  {
       return this._super(...arguments);
     }
+  },
+  actions: {
+    error (e, transition) {
+      if(e && e.status === 401) {
+        this.get('session').invalidate()
+      }
+    }
   }
 })

app/authenticators/custom.js

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 
 export default Base.extend({
   api: service(),
+  router: service(),
   restore (data) {
     return Promise.resolve(data)
   },
@@ -12,6 +13,8 @@ export default Base.extend({
     })
   },
   invalidate () {
-    return this.get('api').request('/logout')
+    return this.get('api').request('/logout').then(() => {
+      this.get('router').transitionTo('index')
+    }).catch(() => {})
   }
 })

app/pods/application/route.js

@@ -1,7 +1,8 @@
 import Route from '@ember/routing/route';
+import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 import { inject as service } from '@ember/service' 
 
-export default Route.extend({
+export default Route.extend(ApplicationRouteMixin, {
   session: service(),
   currentUser: service(),
   beforeModel () {

app/pods/callback/route.js

@@ -3,12 +3,14 @@ import { inject as service } from '@ember/service'
 
 export default Route.extend({
   session: service(),
+  currentUser: service(),
   beforeModel (transition) {
     if(this.get('session.isAuthenticated')) {
       return ;
     }
 
     return this.get('session').authenticate('authenticator:custom', transition.queryParams.code)
+      .then(() => this.get('currentUser').load())
   },
   afterModel () {
     this.transitionTo('index', {

app/pods/components/nav-bar/component.js

@@ -5,6 +5,7 @@ import config from 'trouble-maker-frontend/config/environment';
 export default Component.extend({
   session: service(),
   currentUser: service(),
+  router: service(),
   loginUrl: `https://account.codingblocks.com/oauth/authorize?response_type=code&client_id=${config.ONEAUTH.clientID}&redirect_uri=${config.ONEAUTH.callbackURL}`,
   actions: {
     logout () {

app/services/current-user.js

@@ -9,6 +9,8 @@ export default Service.extend({
     if (this.get('session.isAuthenticated')) {
       return this.get('api').request('/users/me').then(data => {
         this.set('user', data);
+      }).catch(err => {
+        this.get('session').invalidate()
       })
     }
   }