v1.37.0

Author: andris9

.eslintrc

@@ -7,6 +7,6 @@
     },
     "extends": ["nodemailer", "prettier"],
     "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2020
     }
 }

docs/api/openapi.yml

@@ -4831,6 +4831,19 @@ components:
                     description: Attachments for the message
                 verificationResults:
                     $ref: '#/components/schemas/VerificationResults'
+                bimi:
+                    type: object
+                    description: BIMI logo info. If logo validation failed in any way, then this property is not set
+                    properties:
+                        certified:
+                            type: boolean
+                            description: If true, then this logo is from a VMC file
+                        url:
+                            type: string
+                            description: URL of the resource the logo was retrieved from
+                        image:
+                            type: string
+                            description: Data URL for the SVG image
                 contentType:
                     $ref: '#/components/schemas/ContentType'
                 metaData:

indexes.yaml

@@ -698,6 +698,14 @@ indexes:
           key:
               metadata.subject: 1
 
+    - collection: bimi
+      index:
+          name: by_type
+          unique: true
+          key:
+              type: 1
+              url: 1
+
     - collection: webhooks
       index:
           name: by_type

lib/api/messages.js

@@ -939,6 +939,23 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
             }
 
             if (messageData.verificationResults) {
+                if (messageData.verificationResults.bimi) {
+                    try {
+                        let bimiData = await db.database.collection('bimi').findOne({ _id: messageData.verificationResults.bimi });
+                        if (bimiData?.content && !bimiData?.error) {
+                            response.bimi = {
+                                certified: bimiData.type === 'authority',
+                                url: bimiData.url,
+                                image: `data:image/svg+xml;base64,${bimiData.content.toString('base64')}`
+                            };
+                        }
+                    } catch (err) {
+                        log.error('BIMI', 'message=%s error=%s', messageData._id, err.message);
+                    }
+
+                    delete messageData.verificationResults.bimi;
+                }
+
                 response.verificationResults = messageData.verificationResults;
             }