From f40cb103f81f745065c94a6eea8967bb2ed3c049 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Tue, 2 May 2023 22:49:51 +0100
Subject: [PATCH] Add CSS Inlining to minify.utils

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 src/services/dbAccess.services.js |  2 +-
 src/utils/auth.utils.js           | 17 +++++++----------
 src/utils/minify.utils.js         |  9 ++++++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/services/dbAccess.services.js b/src/services/dbAccess.services.js
index ad44dd4..e49e45c 100644
--- a/src/services/dbAccess.services.js
+++ b/src/services/dbAccess.services.js
@@ -75,7 +75,7 @@ async function delRegReq(uuid) {
 
 module.exports = {
   query,
-  increment, // Probqbly doesn't need exporting?
+  //increment, // Probqbly doesn't need exporting?
   addUser,
   userAtime,
   addRegReq,
diff --git a/src/utils/auth.utils.js b/src/utils/auth.utils.js
index b3c50c1..bff47cd 100644
--- a/src/utils/auth.utils.js
+++ b/src/utils/auth.utils.js
@@ -2,7 +2,7 @@ const log    = require('../utils/log.utils')
 const crypto = require('crypto')
 const db     = require('../services/dbAccess.services')
 const fs     = require('fs/promises')
-const minify = require('html-minifier').minify
+const minify = require('../utils/minify.utils')
 
 // Checks users registration key against issued keys
 async function isAuthed(uuid) {  // Needs testing
@@ -33,18 +33,15 @@ async function generateKey() {  // Needs testing & moving to 'register.utils'
 
 async function generateConfirmationEmail(eml, uuid) {
   try {
-    let htmlTpl = await fs.readFile('mail-templates/register.html', 'utf-8')
-    let mini = minify(((htmlTpl).replace(/>>ACCESSCODE<</g, uuid)), { // Add collapse whitespace here
-      removeComments: true,
-      collapseWhitespace: true,
-      minifyCSS: true
-    })
-    let txtTpl = fs.readFile('mail-templates/register.txt', 'utf-8')
-    return { // CSS Needs to be inlined.  See css-inline, or css-inliner
+    const htmlTpl = await fs.readFile('mail-templates/register.html', 'utf-8')
+    const htmlStr = htmlTpl.replace(/>>ACCESSCODE<</g, uuid)
+    const htmlMin = await minify(htmlStr)
+    const txtTpl = fs.readFile('mail-templates/register.txt', 'utf-8')
+    return {
       to: eml,
       subject: 'OwlBoard Registration',
       text: (await txtTpl).replace(/>>ACCESSCODE<</g, uuid),
-      html: mini
+      html: htmlMin
     }
   } catch(err) {
     log.out('mailServices.generateConfirmationEmail: Error reading templates, $(err)', 'err')
diff --git a/src/utils/minify.utils.js b/src/utils/minify.utils.js
index c2ef3c0..2c9e8ef 100644
--- a/src/utils/minify.utils.js
+++ b/src/utils/minify.utils.js
@@ -1,7 +1,10 @@
 const htmlShrink = require('html-minifier').minify
+const juice = require('juice')
 
 module.exports = async function minifyMail(input) {
-  // Minify HTML input, including inline styles.
-  //let inline = cssInliner(input) ??
-  return htmlShrink(input)
+  const inlined = juice(input)
+  return htmlShrink(inlined, {
+    removeComments: true,
+    collapseWhitespace: true
+  })
 }
\ No newline at end of file