From a5bfb0b02bc25b0a02c0affced2d43ec00c8bc31 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 6 May 2024 17:36:36 +0200
Subject: [PATCH] fix: the email confirmation link on mail message

---
 .../Authentication/AuthenticationMailMessages.ts     | 11 +++++------
 ...240425100821_add_confirmation_columns_to_users.js | 12 ++++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/services/Authentication/AuthenticationMailMessages.ts b/packages/server/src/services/Authentication/AuthenticationMailMessages.ts
index e974d22b9..533315e72 100644
--- a/packages/server/src/services/Authentication/AuthenticationMailMessages.ts
+++ b/packages/server/src/services/Authentication/AuthenticationMailMessages.ts
@@ -44,8 +44,10 @@ export default class AuthenticationMailMesssages {
   public async sendSignupVerificationMail(
     email: string,
     fullName: string,
-    token: string,
+    token: string
   ) {
+    const verifyUrl = `${config.baseURL}/auth/email_confirmation?token=${token}&email=${email}`;
+
     await new Mail()
       .setSubject('Bigcapital - Verify your email')
       .setView('mail/SignupVerifyEmail.html')
@@ -57,10 +59,7 @@ export default class AuthenticationMailMesssages {
           cid: 'bigcapital_logo',
         },
       ])
-      .setData({
-        verifyUrl: `${config.baseURL}/auth/reset_password/${token}`,
-        fullName,
-      })
-      .send(); 
+      .setData({ verifyUrl, fullName })
+      .send();
   }
 }
diff --git a/packages/server/src/system/migrations/20240425100821_add_confirmation_columns_to_users.js b/packages/server/src/system/migrations/20240425100821_add_confirmation_columns_to_users.js
index 125f508f5..fada1380f 100644
--- a/packages/server/src/system/migrations/20240425100821_add_confirmation_columns_to_users.js
+++ b/packages/server/src/system/migrations/20240425100821_add_confirmation_columns_to_users.js
@@ -1,8 +1,12 @@
 exports.up = function (knex) {
-  return knex.schema.table('users', (table) => {
-    table.string('verify_token');
-    table.boolean('verified').defaultTo(false);
-  });
+  return knex.schema
+    .table('users', (table) => {
+      table.string('verify_token');
+      table.boolean('verified').defaultTo(false);
+    })
+    .then(() => {
+      return knex('USERS').update({ verified: true });
+    });
 };
 
 exports.down = (knex) => {};