From 8f6e52813ded73b7b04bf3d8ee1cbc9724a26e65 Mon Sep 17 00:00:00 2001 From: pawan-dot <71133473+pawan-dot@users.noreply.github.com> Date: Thu, 8 May 2025 13:12:38 +0530 Subject: [PATCH] password forgot api change --- Utils/sendPushNotification.js | 9 +++++++-- app.js | 28 ++++++++++++++++------------ package.json | 2 +- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Utils/sendPushNotification.js b/Utils/sendPushNotification.js index d456fe8..f5ab934 100644 --- a/Utils/sendPushNotification.js +++ b/Utils/sendPushNotification.js @@ -1,7 +1,12 @@ 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" }; -export const sendPushNotification = async (userToken,title, message) => { +// import serviceAccount from "../googlefirebasePushnotification.json" assert { type: "json" }; +const serviceAccount = JSON.parse( + readFileSync("./googlefirebasePushnotification.json", "utf8") +); +export const sendPushNotification = async (userToken, title, message) => { // const admin = require("firebase-admin"); // const serviceAccount = require("./path/to/your-firebase-adminsdk.json"); diff --git a/app.js b/app.js index 2074ece..2573744 100644 --- a/app.js +++ b/app.js @@ -7,12 +7,16 @@ 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" })); @@ -48,7 +52,7 @@ app.use(express.static(publicPath)); app.use( fileUpload({ useTempFiles: true, - tempFileDir: join(publicPath, 'temp'), + tempFileDir: join(publicPath, 'temp'), }) ); @@ -141,7 +145,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"; @@ -161,7 +165,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"; @@ -205,7 +209,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"; @@ -282,9 +286,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 @@ -292,17 +296,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 @@ -319,7 +323,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; diff --git a/package.json b/package.json index 8c85d1d..469ac24 100644 --- a/package.json +++ b/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",