Merge pull request #407 from upfluence/mb/dra-1884

ActivityWatcher now disconnects users when token_destroyed is received

Author: Miexil

addon/services/activity-watcher.ts

@@ -137,6 +137,7 @@ export default class ActivityWatcher extends Service {
   @service declare eventsService: EventsService;
   @service declare toast: ToastService;
   @service declare intl: IntlService;
+  @service declare session: any;
 
   private declare _observer: Observable<ResourceEvent> | null;
 
@@ -147,7 +148,7 @@ export default class ActivityWatcher extends Service {
 
     this._observer = this.eventsService.watch(prefixPath('/notification'));
     this._observer.subscribe((evt: NotificationEvent) => {
-      this._processEvent(evt);
+      this.processEvent(evt);
     });
   }
 
@@ -160,8 +161,12 @@ export default class ActivityWatcher extends Service {
     this._observer = null;
   }
 
-  private _processEvent(evt: NotificationEvent): void {
-    const notif = this._buildNotification(evt);
+  private processEvent(evt: NotificationEvent): void {
+    if (evt.payload.notification_type === 'token_destroyed') {
+      this.checkIfUserNeedsToBeDisconnected(evt);
+      return;
+    }
+    const notif = this.buildNotification(evt);
 
     if (!notif) {
       return;
@@ -182,7 +187,14 @@ export default class ActivityWatcher extends Service {
     }
   }
 
-  private _buildNotification(evt: NotificationEvent): RenderedNotification | null {
+  private checkIfUserNeedsToBeDisconnected(event: NotificationEvent): void {
+    if (this.session.data.authenticated.access_token === event.payload.data.access_token) {
+      this.session.tooManyConnections = true;
+      this.session.invalidate();
+    }
+  }
+
+  private buildNotification(evt: NotificationEvent): RenderedNotification | null {
     const renderer = renderersByNotificationType[evt.payload.notification_type];
 
     if (!renderer) {

tests/unit/services/activity-watcher-test.ts

@@ -5,14 +5,23 @@ import { setupTest } from 'ember-qunit';
 import EventsServiceMock from '@upfluence/hyperevents/test-support/services/events-service';
 
 import sinon from 'sinon';
+import Service from '@ember/service';
+
+class SessionServiceMock extends Service {
+  tooManyConnections: boolean = false;
+
+  invalidate = sinon.stub();
+}
 
 module('Unit | Service | activity-watcher', function (hooks) {
   setupTest(hooks);
 
   hooks.beforeEach(function () {
     this.owner.register('service:events-service', EventsServiceMock);
+    this.owner.register('service:session', SessionServiceMock);
 
     this.eventService = this.owner.lookup('service:events-service');
+    this.sessionService = this.owner.lookup('service:session');
     this.activityWatcher = this.owner.lookup('service:activity-watcher');
   });
 
@@ -31,6 +40,22 @@ module('Unit | Service | activity-watcher', function (hooks) {
       this.activityWatcher.watch();
     });
 
+    test('When an event of type "token_destroyed" is received, it invalidates the session if the token is the same', function (assert) {
+      this.sessionService.data = { authenticated: { access_token: 'some-token' } };
+
+      this.eventService.dispatch({
+        resource: '/notification/some-uu-id',
+        payload: {
+          notification_type: 'token_destroyed',
+          data: {
+            access_token: 'some-token'
+          }
+        }
+      });
+
+      assert.true(this.sessionService.invalidate.calledOnce);
+    });
+
     const eventTypesTestCases = [
       {
         notification: {