Utils/sendPushNotification.js

@@ -1,12 +1,7 @@
 import admin from "firebase-admin";
-import { readFileSync } from "fs";
-
 // import serviceAccount from "../googlefirebasePushnotification.json" with { type: "json" };
-// import serviceAccount from "../googlefirebasePushnotification.json" assert { type: "json" };
-const serviceAccount = JSON.parse(
-  readFileSync("./googlefirebasePushnotification.json", "utf8")
-);
-export const sendPushNotification = async (userToken, title, message) => {
+import serviceAccount from "../googlefirebasePushnotification.json" assert { type: "json" };
+export const sendPushNotification = async (userToken,title, message) => {
   // const admin = require("firebase-admin");
   // const serviceAccount = require("./path/to/your-firebase-adminsdk.json");
 

app.js

@@ -7,16 +7,12 @@ import bodyParser from "body-parser";
 import fileUpload from "express-fileupload"; // important pkg for file upload
 import cors from "cors";
 import cookieParser from "cookie-parser";
-import { readFileSync } from "fs";
 
 // firebase admin push notification
 import admin from "firebase-admin";
 // import serviceAccount from "./googlefirebasePushnotification.json"  with { type: "json" };
-// import serviceAccount from "./googlefirebasePushnotification.json" assert { type: "json" };
+import serviceAccount from "./googlefirebasePushnotification.json" assert { type: "json" };
 // Design Router
-const serviceAccount = JSON.parse(
-  readFileSync("./googlefirebasePushnotification.json", "utf8")
-);
 import designRoute from "./resources/Design/designRouter.js";
 app.use(express.json({ limit: "50mb" }));
 app.use(express.urlencoded({ extended: true, limit: "50mb" }));
@@ -52,7 +48,7 @@ app.use(express.static(publicPath));
 app.use(
   fileUpload({
     useTempFiles: true,
-    tempFileDir: join(publicPath, 'temp'),
+    tempFileDir: join(publicPath, 'temp'), 
   })
 );
 
@@ -145,7 +141,7 @@ import orderRoute from "./resources/Orders/orderRoute.js";
 import DepartureRouter from "./resources/Departure/DepartureRoute.js";
 import InformationRoute from "./resources/Informations/InformationRoute.js";
 import Testimonial from "./resources/Testimonials/TestimonialRoute.js";
-import Transporter from "./resources/setting/Transporter/transporterRoutes.js";
+import Transporter  from "./resources/setting/Transporter/transporterRoutes.js";
 import StateRouter from "./resources/setting/state/state_routes.js";
 //
 import LanguageRoute from "./resources/setting/Language/language_routes.js";
@@ -165,7 +161,7 @@ import ContentRoute from "./resources/Content/ContentRoutes.js";
 import UserAddressRoute from "./resources/userAddress/useAddressRoute.js";
 import CurrencyRoute from "./resources/Currency/CurrencyRoute.js";
 // RD Routes 
-import RDRoute from './resources/RetailDistributor/RetailDistributerRoutes.js'
+import RDRoute from './resources/RetailDistributor/RetailDistributerRoutes.js' 
 //business_Type
 // import Business_TypeRoute from "./resources/setting/Business_Type/Business_routes.js";
 
@@ -209,7 +205,7 @@ import TaskRoute from "./resources/Task/TaskRoute.js";
 // visit RD and PD
 import VisitRDandPDRoute from "./resources/VisitRD&PD/VisitRD&PDRoute.js";
 // announcement 
-import AnnouncementRoute from './resources/Announcement/announcementRouter.js'
+import AnnouncementRoute from './resources/Announcement/announcementRouter.js' 
 
 //Stock
 import Stock from "./resources/Stock/StockRoute.js";
@@ -286,9 +282,9 @@ app.use("/api/v1", attendance);
 app.use("/api/v1", leave);
 
 // notification route 
-app.use("/api", notification)
+app.use("/api",notification)
 // order routes 
-app.use("/api", PdOrderRoute)
+app.use("/api",PdOrderRoute)
 //Inventory
 app.use("/api/inventory", InventoryRoute);
 // Sales
@@ -296,17 +292,17 @@ app.use("/api/sales", SalesRoute);
 //Task
 app.use("/api/task", TaskRoute);
 // RD Rotuts auth 
-app.use("/api", RDRoute)
+app.use("/api",RDRoute)
 // RD Order routes 
-app.use("/api", RDOrderRoute)
+app.use("/api",RDOrderRoute)
 // visit RD and PD
 app.use("/api", VisitRDandPDRoute);
 
 // Announcemnt 
 
-app.use('/api', AnnouncementRoute)
+app.use('/api',AnnouncementRoute)
 
-app.use('/api/transporter', Transporter)
+app.use('/api/transporter',Transporter)
 
 
 //config specialty
@@ -323,7 +319,7 @@ app.use("/api", Stock);
 // Email CMS
 // app.use("/api", RegisterEmail);
 //Reports
-app.use("/api/report", Report);
+app.use("/api/report",Report);
 //MobileApp
 app.use("/api/mobileapp", MobileAppRoute);
 export default app;

package.json

@@ -4,7 +4,7 @@
   "description": "atp",
   "main": "server.js",
   "type": "module",
-    "scripts": {
+  "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "nodemon server.js",
     "clean": "rm -rf dist",

resources/user/userController.js

@@ -620,10 +620,10 @@ export const forgotPassword = async (req, res, next) => {
     return res.status(404).json({ message: "User not found" });
   }
   // Get ResetPassword Token
-  // const resetToken = user.getResetPasswordToken(); //call function
+  const resetToken = user.getResetPasswordToken(); //call function
 
   //save database reset token
-  // await user.save({ validateBeforeSave: false });
+  await user.save({ validateBeforeSave: false });
 
   const passwords = password.randomPassword({
     length: 12,
@@ -653,10 +653,10 @@ export const forgotPassword = async (req, res, next) => {
       message: `Email sent to ${user.email} successfully`,
     });
   } catch (error) {
-    // user.resetPasswordToken = undefined;
-    // user.resetPasswordExpire = undefined;
+    user.resetPasswordToken = undefined;
+    user.resetPasswordExpire = undefined;
 
-    // await user.save({ validateBeforeSave: false });
+    await user.save({ validateBeforeSave: false });
 
     return res
       .status(500)
@@ -732,10 +732,10 @@ export const ResetPasswordAdmin = async (req, res) => {
   } catch (error) {
     console.error("Error resetting password:", error);
 
-    console.error(error);
     res.status(500).json({
-      message: error?.message || "Something went wrong!",
-      error: error?.message || "",
+      success: false,
+      message:
+        error.message || "Something went wrong while resetting the password.",
     });
   }
 };