BhawanSingh
/
va-tracker-middleware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a

This commit is contained in:
=bhagwanSingh 2025-11-24 16:41:45 +05:30
parent dcda1629ff
commit 599779ee8e
5 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
node_modules node_modules
logs logs
.env .env
public/builds

16
src/controllers/passwordReset.controllers.js
View File

@ -1,17 +1,17 @@
import PasswordResetRepository from "../repository/passwordReset.repository.js"; import PasswordResetRepository from "../repository/passwordReset.repository.js";
import PasswordResetService from "../services/passwordReset.service.js"; import PasswordResetService from "../services/passwordReset.service.js";
import EmailService from "../services/email.service.js"; // import EmailService from "../services/email.service.js";
import logger from "../config/logger.js"; import logger from "../config/logger.js";
const passwordResetService = new PasswordResetService( const passwordResetService = new PasswordResetService(
new PasswordResetRepository(), new PasswordResetRepository(),
new EmailService({ // new EmailService({
host: process.env.SMTP_HOST, // host: process.env.SMTP_HOST,
port: process.env.SMTP_PORT, // port: process.env.SMTP_PORT,
user: process.env.SMTP_USER, // user: process.env.SMTP_USER,
pass: process.env.SMTP_PASS, // pass: process.env.SMTP_PASS,
from: process.env.EMAIL_FROM, // from: process.env.EMAIL_FROM,
}) // })
); );
// VA: Request password reset // VA: Request password reset

70
src/controllers/va/vaProjects/vaProjectLog.controller.js
View File

@ -189,47 +189,47 @@ async function va_project_log_callback(req, res) {
const createdLog = await LoggedModel.create({ loggedType: type, vaId, vaEmail, projectId }) const createdLog = await LoggedModel.create({ loggedType: type, vaId, vaEmail, projectId })
// console.log(createdLog) // console.log(createdLog)
// try { try {
// const salesforceUrl = `${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/va-project-log`; const salesforceUrl = `${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/va-project-log`;
// const sfData = { const sfData = {
// "_id": createdLog._id, "_id": createdLog._id,
// "loggedType": type, "loggedType": type,
// "vaId": vaId, "vaId": vaId,
// "vaEmail": vaEmail, "vaEmail": vaEmail,
// "projectId": projectId, "projectId": projectId,
// "time": createdLog.time, "time": createdLog.time,
// } }
// const response = await fetch(salesforceUrl, { const response = await fetch(salesforceUrl, {
// method: 'POST', method: 'POST',
// headers: { headers: {
// 'Content-Type': 'application/json', 'Content-Type': 'application/json',
// // Add any required headers for Salesforce authentication // Add any required headers for Salesforce authentication
// // 'Authorization': 'Bearer ' + process.env.SF_ACCESS_TOKEN // 'Authorization': 'Bearer ' + process.env.SF_ACCESS_TOKEN
// }, },
// body: JSON.stringify(sfData) body: JSON.stringify(sfData)
// }); });
// if (!response.ok) { if (!response.ok) {
// const errorText = await response.text(); const errorText = await response.text();
// throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`); throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`);
// } }
// const result = await response.json(); const result = await response.json();
// // console.log("✅ Successfully synced VA data to Salesforce:", result); // console.log("✅ Successfully synced VA data to Salesforce:", result);
// res.status(201).json({ success: true, message: `${type} Successfully`, logId: createdLog._id, SyncSalesforce: result }); res.status(201).json({ success: true, message: `${type} Successfully`, logId: createdLog._id, SyncSalesforce: result });
// } catch (error) { } catch (error) {
// console.error("Failed to sync with Salesforce:", error.message); console.error("Failed to sync with Salesforce:", error.message);
// console.log(error) console.log(error)
// // Create a custom error to distinguish Salesforce errors // Create a custom error to distinguish Salesforce errors
// const salesforceError = new Error(`Salesforce sync failed: ${error.message}`); const salesforceError = new Error(`Salesforce sync failed: ${error.message}`);
// salesforceError.isSalesforceError = true; salesforceError.isSalesforceError = true;
// throw salesforceError; throw salesforceError;
// } }
return res.status(201).send({ success: true, message: `${type} Successfully`, logId: createdLog._id }); // return res.status(201).send({ success: true, message: `${type} Successfully`, logId: createdLog._id });
} catch (error) { } catch (error) {
return res.status(500).send("Internal Server Error"); return res.status(500).send("Internal Server Error");

24
src/services/passwordReset.service.js
View File

@ -2,11 +2,12 @@ import jwt from "jsonwebtoken";
import bcrypt from "bcrypt"; import bcrypt from "bcrypt";
import { VAModel, ClientModel } from "../models/vaModel.js"; import { VAModel, ClientModel } from "../models/vaModel.js";
import logger from "../config/logger.js"; import logger from "../config/logger.js";
import axios from "axios";
class PasswordResetService { class PasswordResetService {
constructor(passwordResetRepository, emailService) { constructor(passwordResetRepository) {
this.passwordResetRepository = passwordResetRepository; this.passwordResetRepository = passwordResetRepository;
this.emailService = emailService; // this.emailService = emailService;
} }
async requestPasswordReset(email, userType) { async requestPasswordReset(email, userType) {
@ -150,7 +151,7 @@ class PasswordResetService {
await resetRecord.save(); await resetRecord.save();
// Send confirmation email // Send confirmation email
await this.sendPasswordChangedEmail(decoded.email, userType); // await this.sendPasswordChangedEmail(decoded.email, userType);
logger.info(`Password successfully reset for ${userType}: ${decoded.email}`); logger.info(`Password successfully reset for ${userType}: ${decoded.email}`);
return { return {
@ -166,16 +167,15 @@ class PasswordResetService {
async sendResetEmail(email, resetLink, userType) { async sendResetEmail(email, resetLink, userType) {
try { try {
const userTypeText = userType === 'va' ? 'Virtual Assistant' : 'Client'; const userTypeText = userType === 'va' ? 'VA' : 'CLIENT';
const emailData = { await axios.post(`${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/forgot-password`, {
to: email, data: {
subject: `${userTypeText} - Password Reset Request`, email: email,
html: this.generateResetEmailTemplate(resetLink, userTypeText), url: resetLink,
}; userType: userTypeText
}
await this.emailService.sendEmail(emailData); });
logger.info(`Password reset email sent to ${userType}: ${email}`);
} catch (error) { } catch (error) {
logger.error(`PasswordReset Service - sendResetEmail error for ${userType}: ${error.message}`); logger.error(`PasswordReset Service - sendResetEmail error for ${userType}: ${error.message}`);

10
views/download_tracker.ejs
View File

@ -139,7 +139,7 @@
<script> <script>
const osButtons = document.querySelectorAll(".os-btn"); const osButtons = document.querySelectorAll(".os-btn");
const downloadBtn = document.getElementById("downloadBtn"); const downloadBtn = document.getElementById("downloadBtn");
const version = "<%= version || '3.2.1' %>"; const version = "<%= version || '1.1.1' %>";
let selectedOS = "windows"; let selectedOS = "windows";
@ -171,7 +171,13 @@
// -------- Download -------- // -------- Download --------
downloadBtn.addEventListener("click", () => { downloadBtn.addEventListener("click", () => {
window.location.href = `/download-file?os=${selectedOS}`;
const link = document.createElement("a");
link.href = `/public/builds/build-1.1.1.1/windows/VA Tracker-Setup-1.1.1.exe`;
link.setAttribute("download", "");
link.click()
// window.location.href = ``;
}); });
</script> </script>