chore: work on notif icons

Author: albanm

api/config/custom-environment-variables.cjs

@@ -31,7 +31,6 @@ module.exports = {
     port: 'OBSERVER_PORT'
   },
   theme: {
-    logo: 'THEME_LOGO',
     notificationIcon: 'THEME_NOTIFICATION_ICON',
     notificationBadge: 'THEME_NOTIFICATION_BADGE'
   },

api/config/default.cjs

@@ -29,9 +29,8 @@ module.exports = {
     loopInterval: 4000
   },
   theme: {
-    logo: null,
-    notificationIcon: null,
-    notificationBadge: null
+    // notificationIcon: '',
+    // notificationBadge: ''
   },
   i18n: {
     locales: ['fr', 'en'],

api/config/type/schema.json

@@ -111,16 +111,12 @@
     "theme": {
       "type": "object",
       "additionalProperties": false,
-      "required": ["logo", "notificationIcon", "notificationBadge"],
       "properties": {
-        "logo": {
-          "type": ["string", "null"]
-        },
         "notificationIcon": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "notificationBadge": {
-          "type": ["string", "null"]
+          "type": "string"
         }
       }
     },

api/src/notifications/service.ts

@@ -24,7 +24,7 @@ export const prepareSubscriptionNotification = (event: FullEvent, subscription:
   delete localizedEvent.originator
   delete localizedEvent.urlParams
   const notification: Notification = {
-    icon: subscription.icon || config.theme.notificationIcon || config.theme.logo || (subscription.origin + '/events/logo-192x192.png'),
+    icon: subscription.icon || config.theme.notificationIcon || (subscription.origin + '/events/logo-192x192.png'),
     locale: subscription.locale,
     ...localizedEvent,
     _id: nanoid(),

api/src/push/router.ts

@@ -90,7 +90,7 @@ router.post('/registrations', async (req, res) => {
       title: 'Un nouvel appareil recevra vos notifications',
       body: `L'appareil ${newRegistration.deviceName} est confirmé comme destinataire de vos notifications.`,
       date,
-      icon: config.theme.notificationIcon || config.theme.logo || (origin + '/events/logo-192x192.png')
+      icon: config.theme.notificationIcon || (origin + '/events/logo-192x192.png')
     }, newRegistration)
     if (error) return res.status(500).send(error)
     sub.registrations.push(newRegistration)
@@ -118,7 +118,7 @@ router.post('/registrations/:i/_test', async (req, res) => {
     recipient: { id: user.id, name: user.name },
     title: 'Cet appareil est correctement configuré pour recevoir vos notifications',
     date: new Date().toISOString(),
-    icon: config.theme.notificationIcon || config.theme.logo || (origin + '/events/logo-192x192.png')
+    icon: config.theme.notificationIcon || (origin + '/events/logo-192x192.png')
   }, i)
   res.send({ error: errors[0] })
 })

ui/public/badge-72x72.png

@@ -15,8 +15,7 @@ self.addEventListener('push', function (event) {
   event.waitUntil(
     self.registration.showNotification(data.title, {
       body: data.body,
-      // temporarily comment sending icon as I can't make it work with CSP rules for some unknown reason
-      // icon: data.icon,
+      icon: data.icon,
       // badge: data.badge,
       timestamp: new Date(data.date).getTime(),
       vibrate: [300, 100, 400],