From 41d2d14d390a7eede71d46f8d6f54d3d8e5f19ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 21 Oct 2022 13:46:53 +0200
Subject: [PATCH] try

---
 back/models/account.js                        | 39 +++++++++++++++++--
 back/views/{newVerify.ejs => verifyES.ejs}    |  3 --
 .../email/email-verify/email-verify.js        |  2 +-
 3 files changed, 36 insertions(+), 8 deletions(-)
 rename back/views/{newVerify.ejs => verifyES.ejs} (69%)

diff --git a/back/models/account.js b/back/models/account.js
index c9b0941b69..480a84e779 100644
--- a/back/models/account.js
+++ b/back/models/account.js
@@ -4,6 +4,8 @@ const app = require('../../loopback/server/server.js');
 const dataSources = require('../../loopback/server/datasources.json');
 const LoopBackContext = require('loopback-context');
 const path = require('path');
+// const {Email} = require('vn-print');
+// const qs = require('querystring');
 
 module.exports = Self => {
     require('../methods/account/login')(Self);
@@ -71,21 +73,50 @@ module.exports = Self => {
         const origin = headers.origin;
 
         const userId = ctx.instance.id;
+        const user = await models.user.findById(userId);
+
+        /* //generate verification url
+        const generateVerificationToken = models.User.generateVerificationToken(user);
+        verifyOptions.verifyHref =
+        verifyOptions.protocol +
+        '://' +
+        verifyOptions.host +
+        displayPort +
+        urlPath +
+        '?' + qs.stringify({
+          uid: '' + verifyOptions.user[pkName],
+          redirect: verifyOptions.redirect,
+        });
+        verifyOptions.verifyHref +=
+        verifyOptions.verifyHref.indexOf('?') === -1 ? '?' : '&';
+      verifyOptions.verifyHref += 'token=' + user.verificationToken;
+
+      verifyOptions.verificationToken = user.verificationToken;
+      verifyOptions.text = verifyOptions.text || g.f('Please verify your email by opening ' +
+        'this link in a web browser:\n\t%s', verifyOptions.verifyHref);
+      verifyOptions.text = verifyOptions.text.replace(/\{href\}/g, verifyOptions.verifyHref);
+        const email = new Email('email-verify', {
+            recipient: instance.email,
+            lang: ctx.req.getLocale(),
+            url:
+        });
+        await email.send();
+*/
         const options = {
             type: 'email',
             to: instance.email,
-            from: dataSources.email.transports[0].auth.from,
+            from: 'test@test.es', // dataSources.email.transports[0].auth.from,
             subject: 'Verify email',
-            template: path.resolve(__dirname, '../views/verify.ejs'),
+            template: path.resolve(__dirname, '../views/verify.ejs'), // user.country.code = 'es' ? verifyES.ejs : verify.ejs
             redirect: `${origin}/#!/account/${instance.id}/basic-data?emailConfirmed`,
             host: origin.split(':')[1].split('/')[2],
             port: origin.split(':')[2],
             protocol: origin.split(':')[0],
             user: Self
         };
+        console.log(options);
 
-        const user = await models.user.findById(userId);
-        await user.verify(options);
+        // await user.verify(options);
     });
 
     Self.remoteMethod('getCurrentUserData', {
diff --git a/back/views/newVerify.ejs b/back/views/verifyES.ejs
similarity index 69%
rename from back/views/newVerify.ejs
rename to back/views/verifyES.ejs
index 49f4e981ab..90a4344632 100644
--- a/back/views/newVerify.ejs
+++ b/back/views/verifyES.ejs
@@ -1,6 +1,3 @@
-<p>
-    Thanks for registering,
-</p>
 <p>
     Click <a href="<%=verifyHref%>">here</a> to confirm your email address.
 </p>
diff --git a/print/templates/email/email-verify/email-verify.js b/print/templates/email/email-verify/email-verify.js
index b589411a9a..7f0b80a13c 100755
--- a/print/templates/email/email-verify/email-verify.js
+++ b/print/templates/email/email-verify/email-verify.js
@@ -3,7 +3,7 @@ const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
 module.exports = {
-    name: 'recover-password',
+    name: 'email-verify',
     components: {
         'email-header': emailHeader.build(),
         'email-footer': emailFooter.build()