@igea/oac_backend 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_backend",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Backend service for the OAC project",
   "main": "src/index.js",
   "scripts": {

package/src/config/development.json

@@ -2,7 +2,7 @@
 	"protocol": "http",
 	"url_register": "http://localhost:4001/register",
 	"port_range": {
-		"min": 5000, "max": 6000
+		"min": 4100, "max": 4199
 	},
 	"database": {
 		"host": "127.0.0.1",
@@ -23,12 +23,18 @@
 	},
 	"jwt_secret": "@igea#",
 	"smtp": {
-		"host": "smtp.aruba.it",
+		"host": "smtps.aruba.it",
 		"port": 465,
 		"secure": true,
 		"auth": {
-			"user": "your_smtp_user",
-			"pass": "your_smtp_password"
+			"user": "supporto@igea-soluzioni.it",
+			"pass": "<your_smtp_password>"
 		}
+	},
+	"exposed":{
+		"protocol": "http",
+		"host": "localhost",
+		"port": "4000"
 	}
+	
 }

package/src/config/production.json

@@ -2,7 +2,7 @@
 	"protocol": "http",
 	"url_register": "http://localhost:4001/register",
 	"port_range": {
-		"min": 5000, "max": 6000
+		"min": 4100, "max": 4199
 	},
 	"database": {
 		"host": "127.0.0.1",
@@ -27,8 +27,13 @@
 		"port": 465,
 		"secure": true,
 		"auth": {
-			"user": "your_smtp_user",
-			"pass": "your_smtp_password"
+			"user": "supporto@igea-soluzioni.it",
+			"pass": "<your_smtp_password>"
 		}
+	},
+	"exposed":{
+		"protocol": "http",
+		"host": "localhost",
+		"port": "4000"
 	}
 }

package/src/controllers/auth.js

@@ -1,6 +1,12 @@
 const express = require('express');
 const router = express.Router();
 const Users = require('../models/users');
+const EmailSender = require('../models/EmailSender');
+const config = require('../config');
+const EXPOSED = config.exposed || {};
+const { randomUUID } = require('crypto');
+
+
 
 module.exports = function(jwtLib){
   /**
@@ -67,6 +73,39 @@ module.exports = function(jwtLib){
       });
   });
 
+  router.post('/password_recovery', (req, res) => {  
+    let body = req.body 
+    let user_or_email = body.user
+    Users.fromUserOrEmail(user_or_email)
+      .then(async response => {
+        let email = response.email
+        console.log(`Send email to ${email} with recovery instructions`)
+        const token = randomUUID();
+        await Users.setPasswordRecoveryToken(response.id, token)
+        const activationLink = `${EXPOSED.protocol}://${EXPOSED.host}:${EXPOSED.port}/frontend/users/reset_password/${response.id}/${token}`
+        EmailSender.sendPasswordRecoveryEmail(
+          email, activationLink
+        ).then( () => {
+          console.log("Email sent")
+          res.json({ 
+            success: true
+          });
+        }).catch( err => {
+          console.log("Error sending email", err)
+          res.json({ 
+              success: false, 
+              message: `${ err }`
+          });
+        })
+      }).catch(err => { 
+        console.log(err)  
+        res.json({ 
+            success: false, 
+            message: `${ err }`
+        });
+    })
+  })
+
   return router
 
 }

package/src/index.js

@@ -9,10 +9,10 @@ const jwtLib = jwtLibFactory({
     secret: process.env.JWT_SECRET || config.jwt_secret,
     excludePaths: [
         `/${serviceName}/auth/authenticate`,
+        `/${serviceName}/auth/password_recovery`,
         `/${serviceName}/auth/echo`,
         `/${serviceName}/health`,
         `/${serviceName}/fuseki/upload/vocabularies`
-        
     ],
     signOptions: { expiresIn: '15m' }
 });

package/src/models/EmailSender.js

@@ -0,0 +1,52 @@
+const nodemailer = require('nodemailer');
+const config = require('../config');
+const SMTP = config.smtp || {};
+
+class EmailSender {
+
+  static sendPasswordRecoveryEmail(userEmail, recoveryLink) {
+    // Logic to send email
+    console.log(`Sending password recovery email to ${userEmail} with link: ${recoveryLink}`);
+    return this.sendEmail(userEmail, {
+      subject: 'Password Recovery Instructions',
+      text: `Please use the following link to recover your password: ${recoveryLink}`,
+      html: `<p>Please use the following link to recover your password:</p><a href="${recoveryLink}">${recoveryLink}</a>`
+    });     
+  } 
+
+  static sendEmail(email, message) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const smtpOptions = {
+          host: SMTP.host,
+          port: SMTP.port,
+          secure: SMTP.secure, // true for 465, false for other ports
+          auth: {
+            user: SMTP.auth.user,
+            pass: SMTP.auth.pass,
+          }
+        }
+        console.log(smtpOptions)
+        let transporter = nodemailer.createTransport(smtpOptions);
+        
+        let mailOptions = {
+          from: `"OAC" <${SMTP.auth.user}>`, // sender address
+          to: email, // list of receivers
+          subject: message.subject, // Subject line
+          text: message.text, // plain text body
+          html: message.html, // html body
+        };
+
+        let info = await transporter.sendMail(mailOptions);
+        console.log('Message sent: %s', info.messageId);
+        resolve(info);
+      } catch (error) {
+        console.error('Error sending email:', error);
+        reject(error);
+      }
+    });
+  } 
+
+}
+
+module.exports = EmailSender;

package/src/models/users.js

@@ -34,6 +34,30 @@ class Users {
             }
         });
     }
+
+    static fromUserOrEmail(userOrEmail){
+        
+        return new Promise(async (resolve, reject) => {
+            try{
+                let userFound = await db(table)
+                    .where(function() {
+                        this.whereRaw(
+                            '(username = ? OR email = ?)', 
+                            [userOrEmail, userOrEmail]
+                        );
+                    })
+                    .first();
+                if(userFound && userFound["is_active"]) {
+                    delete userFound["password"]
+                    resolve(userFound)
+                }else{
+                    reject(new Error("User not found or not active"))        
+                }
+            }catch(e){
+                reject(e)
+            }
+        });
+    }
     
     static find(id){
        return new Promise(async (resolve, reject) => {
@@ -99,46 +123,20 @@ class Users {
         }); 
     }
 
-    static sendResetPassword(user_or_email, resetToken, resetLink) {
+    static setPasswordRecoveryToken(id, resetToken) {
         return new Promise(async (resolve, reject) => {
-            let user = null;
             try {
-                user = await db(table)
-                    .where(function() {
-                        this.where('username', user_or_email)
-                            .orWhere('email', user_or_email);
-                    })
-                    .first();
-            } catch (e) {
-                return reject(e);
-            }
-            if(!user){
-                return resolve();
-            }
-
-            // TODO:
-            // Here we have to store the resetToken and expiration date (utc) 
-            // in the database associated with the user
-
-            // Send the email
-            try{
-                const smtpConfig = config.smtp;
-                let transporter = nodemailer.createTransport(smtpConfig);
-                let mailOptions = {
-                    from: smtpConfig.auth.user,
-                    to: user.email,
-                    subject: 'Password Reset',
-                    text: `Hello ${user.name},\n\nYou can reset your password using the following link:\n${resetLink}\n\nIf you did not request a password reset, please ignore this email.\n\nBest regards,\nYour Company`
-                };
-                transporter.sendMail(mailOptions, (error, info) => {
-                    if (error) {
-                        return reject(error);
-                    }
-                    resolve();
+                let count = await db(table)
+                .where({ id })
+                .update({
+                    id,
+                    reset_token: resetToken,
+                    reset_token_expiration: Math.ceil((new Date().getTime())/1000)
                 });
-            }catch(e){
-                reject(e)
-            }
+                resolve();
+            } catch (e) {
+                reject(e);
+            }            
         });
     }