Merge branch 'brian_dev_brevo' of fyindr/siimee into dev

backend/README.md

@@ -7,9 +7,10 @@ An API for the siimee application
 You will need...
 
 ### Node.js 14+
-* OSX: `brew install node` using [Homebrew](http://brew.sh/)
-* Linux: `apt install nodejs` ([see Ubuntu/Debian specific instructions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)) or `pacman -S nodejs` (Arch Linux)
-* Windows: [Install](https://nodejs.org/en/download/)
+
+-   OSX: `brew install node` using [Homebrew](http://brew.sh/)
+-   Linux: `apt install nodejs` ([see Ubuntu/Debian specific instructions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)) or `pacman -S nodejs` (Arch Linux)
+-   Windows: [Install](https://nodejs.org/en/download/)
 
 ## :package: Installation
 
@@ -19,20 +20,43 @@ You will need...
 4. A test database container is provided and can be started with `docker-compose up -d`
 5. Populate some basic tables for your database using `npm run generate && npm run reseed`
 
+## :package: Installing Brevo
+
+This note is added in case Brevo fails to install correctly, as it requires some extra configuration:
+
+1. Should brevo fail to work upon spinning up, ensure that brevo is installed:
+
+```
+npm install @getbrevo/brevo --save
+```
+
+2. Then run 'npm install' again.
+3. Link the brevo package globally by running 'npm link'.
+4. You'll also need to link it directly within the backend directory (here):
+
+```
+npm link .
+```
+
+Transactional emails using the Brevo api should now be working.
+
 ## :package: Migrations
 
 We use Knex.js,which comes with a couple nice database migration and seeding tools.
 Migrating tracks changes in schema. Migration steps are contained in the `./db/migrations` folder. Seeding adds dummy data once our database tables have been created and schemas are set. Starting seed steps are contained in `./db/seeds` and use the `mock.js` file as the main dummy data source.
 
 ### Migrating
-* Run `npm run migrate` to run all migrations and establish the base schema
-* Run `npm run unmigrate` to roll back one migration
+
+-   Run `npm run migrate` to run all migrations and establish the base schema
+-   Run `npm run unmigrate` to roll back one migration
 
 ### Seeding
-* Run `npm run generate` to generate dummy data
-* Run `npm run seed` to seed the database with generated dummy data
+
+-   Run `npm run generate` to generate dummy data
+-   Run `npm run seed` to seed the database with generated dummy data
 
 ### Restarting
+
 Since we can't unseed the database, it's best to destroy the `dev` database and rebuild it.
 
 1. Stop the database by navigating to the project root directory `cd ../` and running `docker-compose down`
@@ -52,13 +76,18 @@ TBD
 ## :pill: Tests & Code Quality
 
 Tests are run with AVA with code coverage reporting via nyc. Look at the example test for ideas, as well as the [ava documentation](https://github.com/avajs/ava/blob/main/docs/01-writing-tests.md)
-* Run tests with coverage report with `npm test`
+
+-   Run tests with coverage report with `npm test`
 
 ## :heart: Built With
 
-* [Hapi](https://hapy.dev/) - Happy APIs
-* [Objection](https://vincit.github.io/objection.js/) - Light ORM
-* [Knex.js](https://knexjs.org/) - Query builder
-* [Schiwfty](https://hapipal.com/docs/schwifty) - Model layer
-* [Ava](https://github.com/avajs/ava) - Easy testing
-* [Nyc](https://github.com/istanbuljs/nyc) - Test coverage with Istanbul's CLI
+-   [Hapi](https://hapy.dev/) - Happy APIs
+-   [Objection](https://vincit.github.io/objection.js/) - Light ORM
+-   [Knex.js](https://knexjs.org/) - Query builder
+-   [Schiwfty](https://hapipal.com/docs/schwifty) - Model layer
+-   [Ava](https://github.com/avajs/ava) - Easy testing
+-   [Nyc](https://github.com/istanbuljs/nyc) - Test coverage with Istanbul's CLI
+
+```
+
+```

backend/lib/services/user.js

@@ -7,11 +7,12 @@ const Schmervice = require('@hapipal/schmervice')
 const SecurePassword = require('secure-password')
 
 // Configuration for Brevo
-const SibApiV3Sdk = require('sib-api-v3-sdk')
-const defaultClient = SibApiV3Sdk.ApiClient.instance
+const Brevo = require('@getbrevo/brevo')
+const defaultClient = Brevo.ApiClient.instance
 const apiKey = defaultClient.authentications['api-key']
 apiKey.apiKey = process.env.BREVO_KEY
-const apiInstance = new SibApiV3Sdk.TransactionalEmailsApi()
+const apiInstance = new Brevo.TransactionalEmailsApi()
+const sendSmtpEmail = new Brevo.SendSmtpEmail()
 
 // TODO: Consider implementing, nice use of SecurePassword,
 // but currently not used anywhere...
@@ -333,19 +334,23 @@ module.exports = class UserService extends Schmervice.Service {
             emailWasRespondedTo: false,
             accessToken: null,
         }
-        const sendSmtpEmail = {
-            to: [
-                {
-                    email: userCredentials.email,
-                },
-            ],
-            templateId: Number(process.env.BREVO_TEMPLATE_ID),
-            params: {
-                // TODO: Change this in production...
-                link: `${process.env.BREVO_LINK}/verify/${hashedSessionToken}`,
+        // NOTE: Although this looks messy, Brevo requries these
+        // parameters be defined individually like this, attempts
+        // to configure this in a singel object cause errors on their API
+        sendSmtpEmail.sender = {
+            name: 'My Test Company',
+            email: 'mytestemail@email.com',
+        }
+        sendSmtpEmail.subject = 'My Test Company'
+        sendSmtpEmail.to = [
+            {
+                email: userCredentials.email,
             },
+        ]
+        sendSmtpEmail.templateId = Number(process.env.BREVO_TEMPLATE_ID)
+        sendSmtpEmail.params = {
+            link: `${process.env.BREVO_LINK}/verify/${hashedSessionToken}`,
         }
-
         return await apiInstance.sendTransacEmail(sendSmtpEmail).then(
             data => {
                 return { wasSuccessfull: true, data: data }

backend/package-lock.json

@@ -9,6 +9,7 @@
             "version": "1.0.0",
             "license": "UNLICENSED",
             "dependencies": {
+                "@getbrevo/brevo": "^1.0.1",
                 "@hapi/glue": "^8.0.0",
                 "@hapi/hapi": "^20.1.3",
                 "@hapi/inert": "^6.0.3",
@@ -28,8 +29,7 @@
                 "knex": "^0.21.19",
                 "mysql": "^2.18.1",
                 "objection": "^2.2.18",
-                "secure-password": "^4.0.0",
-                "sib-api-v3-sdk": "^8.5.0"
+                "secure-password": "^4.0.0"
             },
             "devDependencies": {
                 "ava": "^3.15.0",
@@ -577,6 +577,15 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/@getbrevo/brevo": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@getbrevo/brevo/-/brevo-1.0.1.tgz",
+            "integrity": "sha512-NwUOlkft6NwLSKTph9FWQujMM5ysSGWOa9Wdf0Bc/RezejOW5VG5KXvTmXrF1Q+MHmjzTh6GDWjq5EukQsDdnA==",
+            "dependencies": {
+                "querystring": "^0.2.1",
+                "superagent": "^8.0.9"
+            }
+        },
         "node_modules/@hapi/accept": {
             "version": "5.0.2",
             "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz",
@@ -1409,6 +1418,11 @@
                 "node": ">=8"
             }
         },
+        "node_modules/asap": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+            "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+        },
         "node_modules/assign-symbols": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -1876,12 +1890,13 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.1",
+                "set-function-length": "^1.1.1"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -2481,6 +2496,7 @@
             "version": "3.2.7",
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
             "dependencies": {
                 "ms": "^2.1.1"
             }
@@ -2565,6 +2581,19 @@
             "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
             "dev": true
         },
+        "node_modules/define-data-property": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/define-property": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -2615,6 +2644,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/dezalgo": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+            "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+            "dependencies": {
+                "asap": "^2.0.0",
+                "wrappy": "1"
+            }
+        },
         "node_modules/diff": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@@ -3370,6 +3408,11 @@
             "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
             "dev": true
         },
+        "node_modules/fast-safe-stringify": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+        },
         "node_modules/fastq": {
             "version": "1.11.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -3536,16 +3579,16 @@
             }
         },
         "node_modules/form-data": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-            "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
             "dependencies": {
                 "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.6",
+                "combined-stream": "^1.0.8",
                 "mime-types": "^2.1.12"
             },
             "engines": {
-                "node": ">= 0.12"
+                "node": ">= 6"
             }
         },
         "node_modules/format-util": {
@@ -3554,10 +3597,15 @@
             "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
         },
         "node_modules/formidable": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
-            "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
-            "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
+            "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
+            "dependencies": {
+                "dezalgo": "^1.0.4",
+                "hexoid": "^1.0.0",
+                "once": "^1.4.0",
+                "qs": "^6.11.0"
+            },
             "funding": {
                 "url": "https://ko-fi.com/tunnckoCore/commissions"
             }
@@ -3614,9 +3662,12 @@
             }
         },
         "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/functional-red-black-tree": {
             "version": "1.0.1",
@@ -3803,6 +3854,17 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "dependencies": {
+                "get-intrinsic": "^1.1.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/got": {
             "version": "9.6.0",
             "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -3918,6 +3980,17 @@
                 "node": ">=4"
             }
         },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.1.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/has-proto": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -4028,6 +4101,14 @@
             "resolved": "https://registry.npmjs.org/haversine/-/haversine-1.1.1.tgz",
             "integrity": "sha512-KW4MS8+krLIeiw8bF5z532CptG0ZyGGFj0UbKMxx25lKnnJ1hMUbuzQl+PXQjNiDLnl1bOyz23U6hSK10r4guw=="
         },
+        "node_modules/hexoid": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+            "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -5337,14 +5418,14 @@
             }
         },
         "node_modules/mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
             "bin": {
                 "mime": "cli.js"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=4.0.0"
             }
         },
         "node_modules/mime-db": {
@@ -5830,9 +5911,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.12.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-            "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -5904,7 +5985,6 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
             "dependencies": {
                 "wrappy": "1"
             }
@@ -6499,9 +6579,9 @@
             }
         },
         "node_modules/querystring": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+            "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
             "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
             "engines": {
                 "node": ">=0.4.x"
@@ -6935,6 +7015,20 @@
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
             "dev": true
         },
+        "node_modules/set-function-length": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+            "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+            "dependencies": {
+                "define-data-property": "^1.1.1",
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/set-value": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -6989,16 +7083,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/sib-api-v3-sdk": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/sib-api-v3-sdk/-/sib-api-v3-sdk-8.5.0.tgz",
-            "integrity": "sha512-6Ratp5kLN/rEEvk4XVIQ4L8IrCIrcfE9m1HjvHz/WepC+CVXPsjOlgRcK/jQjpN5kC+dmhDAqrTo1OtnF6i1wA==",
-            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-            "dependencies": {
-                "querystring": "0.2.0",
-                "superagent": "3.7.0"
-            }
-        },
         "node_modules/side-channel": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -7578,24 +7662,58 @@
             }
         },
         "node_modules/superagent": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz",
-            "integrity": "sha512-/8trxO6NbLx4YXb7IeeFTSmsQ35pQBiTBsLNvobZx7qBzBeHYvKCyIIhW2gNcWbLzYxPAjdgFbiepd8ypwC0Gw==",
-            "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
-            "dependencies": {
-                "component-emitter": "^1.2.0",
-                "cookiejar": "^2.1.0",
-                "debug": "^3.1.0",
-                "extend": "^3.0.0",
-                "form-data": "^2.3.1",
-                "formidable": "^1.1.1",
-                "methods": "^1.1.1",
-                "mime": "^1.4.1",
-                "qs": "^6.5.1",
-                "readable-stream": "^2.0.5"
+            "version": "8.1.2",
+            "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
+            "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
+            "dependencies": {
+                "component-emitter": "^1.3.0",
+                "cookiejar": "^2.1.4",
+                "debug": "^4.3.4",
+                "fast-safe-stringify": "^2.1.1",
+                "form-data": "^4.0.0",
+                "formidable": "^2.1.2",
+                "methods": "^1.1.2",
+                "mime": "2.6.0",
+                "qs": "^6.11.0",
+                "semver": "^7.3.8"
             },
             "engines": {
-                "node": ">= 4.0"
+                "node": ">=6.4.0 <13 || >=14"
+            }
+        },
+        "node_modules/superagent/node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/superagent/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "node_modules/superagent/node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/supertap": {
@@ -8200,8 +8318,7 @@
         "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "node_modules/write-file-atomic": {
             "version": "3.0.3",

backend/package.json

@@ -17,6 +17,7 @@
     "author": "TOJ",
     "license": "UNLICENSED",
     "dependencies": {
+        "@getbrevo/brevo": "^1.0.1",
         "@hapi/glue": "^8.0.0",
         "@hapi/hapi": "^20.1.3",
         "@hapi/inert": "^6.0.3",
@@ -36,8 +37,7 @@
         "knex": "^0.21.19",
         "mysql": "^2.18.1",
         "objection": "^2.2.18",
-        "secure-password": "^4.0.0",
-        "sib-api-v3-sdk": "^8.5.0"
+        "secure-password": "^4.0.0"
     },
     "devDependencies": {
         "ava": "^3.15.0",

frontend/src/views/VerifyView.vue

@@ -7,15 +7,12 @@
 <script>
 import { currentProfile, authenticator } from '../services'
 let hash = null
-let hashedAccessToken = null
 export default {
     name: 'VerifyView',
     async created() {
         hash = this.$route.params.hashedToken
-        hashedAccessToken = authenticator.grabStoredCookie('siimee_access')
         try {
             this.isHashInUrl(hash)
-            await this.doesAccessTokenExist(hashedAccessToken)
             await this.verifyActiveSession(hash)
             const sessionData =
                 await authenticator.verifySessionCookie('siimee_session')
@@ -33,10 +30,6 @@ export default {
         isHashInUrl(hash) {
             if (!hash) throw new Error('URL contains no hash!')
         },
-        async doesAccessTokenExist(hashedAccessToken) {
-            if (!hashedAccessToken)
-                throw new Error('accessToken not in cookie store!')
-        },
         async verifyActiveSession(hashedToken) {
             const sessionData = await authenticator.verifySession(hashedToken)
             if (!sessionData.hashesMatch)