Fix failing email notifications while case contains Teams.

Better notifications.

Author: TontonSancho

colander/core/api/views.py

@@ -1,4 +1,5 @@
 from django.http import Http404, HttpResponse, JsonResponse
+from django.urls import reverse
 from rest_framework import mixins, status
 from rest_framework.authentication import SessionAuthentication, TokenAuthentication
 from rest_framework.decorators import action
@@ -293,7 +294,8 @@ def perform_create(self, serializer):
         CaseContextConsumer.send_message_to_user_consumers(
             self.request.user, {
                 'msg': 'A new drop is available',
-                'detail': inst.filename
+                'detail': inst.filename,
+                'url': reverse('dropped_files_triage_base_view'),
             }
         )
         return inst

colander/core/archives/exporters/__init__.py

@@ -43,6 +43,7 @@ def _archive_export_end(task):
         CaseContextConsumer.send_message_to_user_consumers(archive_export.case.owner, {
             'msg': 'A new archive is available',
             'detail': archive_export.filename,
+            'url': archive_export.case.get_absolute_url(),
         })
         notify_case_archive_done(archive_export)
 

colander/core/notifications.py

@@ -41,10 +41,10 @@ def notify_case_archive_done(archive_export: ArchiveExport):
         # json.dumps with DjangoJSONEncoder: serialize all django 'objects' as str
         # json.loads: get back json object to by stored in database
 
-        ctx['case'] = json.loads(json.dumps(model_to_dict(archive_export.case), cls=DjangoJSONEncoder))
+        ctx['case'] = json.loads(json.dumps(model_to_dict(archive_export.case, exclude=['teams']), cls=DjangoJSONEncoder))
         ctx['user'] = json.loads(json.dumps(model_to_dict(archive_export.case.owner, exclude=['password']), cls=DjangoJSONEncoder))
         ctx['subject'] = "A new archive is available"
-        ctx['url'] = f"{base_url}{reverse('case_details_view', kwargs={'pk': str(archive_export.case.id)})}"
+        ctx['url'] = f"{base_url}{archive_export.case.get_absolute_url()}"
 
         nm = NotificationMessage.objects.create(
             template_path='notification/case-archive-done',

colander/frontend/colander-vue-components/NotificationCenter.vue

@@ -9,25 +9,48 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       opened: false,
       notifications: [],
       lastNotification: null,
     };
   },
-  ready() {
+  created() {
     this.$logger(this, 'NotificationCenter');
   },
+  watch: {
+    'notifications.length'(new_value, old_value) {
+      if (!this.loaded) return;
+      this.save();
+    }
+  },
   mounted() {
     this.$bus.on('notification', this.onNotification);
     document.addEventListener('click', (evt) => {
       if (!evt.target.closest('#notification-center')) {
         this.close();
       }
     });
+    this.load();
   },
   methods: {
+    load() {
+      let existingNotifications = this.$localStorage.get('notifications', []);
+      for(let n of existingNotifications) {
+        this.notifications.push(n);
+      }
+      this.loaded = true;
+      this.$debug('loaded');
+    },
+    save() {
+      this.$localStorage.set('notifications', this.notifications);
+      this.$debug('saved');
+    },
     onNotification(notification) {
-      let notif = Object.assign({id: new Date().getTime()}, notification);
+      let now = new Date().getTime();
+      let idSuffix = (Math.random() + 1).toString(36).substring(7);
+      let id = `${now}-${idSuffix}`;
+      let notif = Object.assign({id: id, timestamp: now}, notification);
       this.notifications.splice(0, 0, notif);
       this.lastNotification = Object.assign({}, notif);
     },
@@ -78,7 +101,7 @@ export default {
         <Badge v-if="hasNotifications" :value="notificationCount" :severity="maxSeverity" size="small" class="local-badge" />
     </a>
     <div class="notification-container">
-      <Message v-if="lastNotification" severity="info" life="10000" @lifeEnd="dismissLastNotification()">
+      <Message v-if="lastNotification" severity="info" :life="3000" @lifeEnd="dismissLastNotification()" closable>
         <strong class="notification-msg">{{lastNotification.msg}}</strong>
         <div v-if="lastNotification.detail" class="notification-detail">{{lastNotification.detail}}</div>
       </Message>
@@ -90,6 +113,10 @@ export default {
                  closable @close="ack(index)">
           <strong class="notification-msg">{{notif.msg}}</strong>
           <div v-if="notif.detail" class="notification-detail">{{notif.detail}}</div>
+          <a v-if="notif.url" class="notification-url link-secondary" :href="notif.url">
+            <i class="fa fa-eye"></i>
+            Open
+          </a>
         </Message>
       </div>
       <div v-else>
@@ -122,10 +149,17 @@ a.activable.active
   z-index: 10;
 
   .p-message {
+    position: relative;
     margin: 1rem;
     box-shadow: 0 0 1rem white;
   }
 
+  .p-message-close-button {
+    position: absolute;
+    right: 0.25rem;
+    top: 0.25rem;
+  }
+
   .notification-msg {}
   .notification-detail {}
 }

colander/frontend/colander/index.js

@@ -6,9 +6,10 @@ import ToastService from 'primevue/toastservice';
 import ColanderTheme from './theme-preset';
 
 import CachePlugin from './plugins/Cache';
+import EventBusPlugin from './plugins/EventBus';
 import i18nPlugin from './plugins/i18n';
+import LocalStorage from "./plugins/LocalStorage";
 import LoggerPlugin, {LogLevel} from './plugins/Logger';
-import EventBusPlugin from './plugins/EventBus';
 import ThemeUtilsPlugin from './plugins/ThemeUtils';
 
 import HarAnalyzerPlugin from 'har-analyzer-vue';
@@ -168,6 +169,7 @@ export default () => {
   } catch(err) {}
 
   // -- Plugin registration
+  colander_application.use(LocalStorage);
   colander_application.use(LoggerPlugin, {
     logLevel: localLogLevel,
   });

colander/frontend/colander/plugins/LocalStorage.js

@@ -0,0 +1,26 @@
+class LocalStorage {
+  static DEFAULT_OPTIONS = Object.freeze({ prefix: 'colander' });
+
+  options
+  constructor(options) {
+    this.options = Object.assign({}, LocalStorage.DEFAULT_OPTIONS, options);
+  }
+  _key(subKey) {
+    return `${this.options.prefix}.${subKey}`;
+  }
+  get(key, _default) {
+    _default ??= "";
+    let _stored = localStorage.getItem(this._key(key));
+    if (_stored) return JSON.parse(_stored);
+    return _default;
+  }
+  set(key, value) {
+    localStorage.setItem(this._key(key), JSON.stringify(value));
+  }
+}
+
+export default {
+  install(app, options) {
+    app.config.globalProperties.$localStorage = new LocalStorage(options);
+  }
+};