gitadmin/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gitadmin:8f6e52813ded73b7b04bf3d8ee1cbc9724a26e65
Branches Tags
gitadmin:main
..
compare: gitadmin:e37f230deb4480dadb0da73fca105af0ccc7231a
Branches Tags
gitadmin:main

No commits in common. "8f6e52813ded73b7b04bf3d8ee1cbc9724a26e65" and "e37f230deb4480dadb0da73fca105af0ccc7231a" have entirely different histories.
8f6e52813d ... e37f230deb

4 changed files with 23 additions and 32 deletions
Show Stats Expand all files Collapse all files

9
Utils/sendPushNotification.js
View File

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

20
app.js
View File

@ -7,16 +7,12 @@ import bodyParser from "body-parser";
import fileUpload from "express-fileupload"; // important pkg for file upload import fileUpload from "express-fileupload"; // important pkg for file upload
import cors from "cors"; import cors from "cors";
import cookieParser from "cookie-parser"; import cookieParser from "cookie-parser";
import { readFileSync } from "fs";
// firebase admin push notification // firebase admin push notification
import admin from "firebase-admin"; import admin from "firebase-admin";
// import serviceAccount from "./googlefirebasePushnotification.json" with { type: "json" }; // 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 // Design Router
const serviceAccount = JSON.parse(
readFileSync("./googlefirebasePushnotification.json", "utf8")
);
import designRoute from "./resources/Design/designRouter.js"; import designRoute from "./resources/Design/designRouter.js";
app.use(express.json({ limit: "50mb" })); app.use(express.json({ limit: "50mb" }));
app.use(express.urlencoded({ extended: true, limit: "50mb" })); app.use(express.urlencoded({ extended: true, limit: "50mb" }));
@ -286,9 +282,9 @@ app.use("/api/v1", attendance);
app.use("/api/v1", leave); app.use("/api/v1", leave);
// notification route // notification route
app.use("/api", notification) app.use("/api",notification)
// order routes // order routes
app.use("/api", PdOrderRoute) app.use("/api",PdOrderRoute)
//Inventory //Inventory
app.use("/api/inventory", InventoryRoute); app.use("/api/inventory", InventoryRoute);
// Sales // Sales
@ -296,17 +292,17 @@ app.use("/api/sales", SalesRoute);
//Task //Task
app.use("/api/task", TaskRoute); app.use("/api/task", TaskRoute);
// RD Rotuts auth // RD Rotuts auth
app.use("/api", RDRoute) app.use("/api",RDRoute)
// RD Order routes // RD Order routes
app.use("/api", RDOrderRoute) app.use("/api",RDOrderRoute)
// visit RD and PD // visit RD and PD
app.use("/api", VisitRDandPDRoute); app.use("/api", VisitRDandPDRoute);
// Announcemnt // Announcemnt
app.use('/api', AnnouncementRoute) app.use('/api',AnnouncementRoute)
app.use('/api/transporter', Transporter) app.use('/api/transporter',Transporter)
//config specialty //config specialty
@ -323,7 +319,7 @@ app.use("/api", Stock);
// Email CMS // Email CMS
// app.use("/api", RegisterEmail); // app.use("/api", RegisterEmail);
//Reports //Reports
app.use("/api/report", Report); app.use("/api/report",Report);
//MobileApp //MobileApp
app.use("/api/mobileapp", MobileAppRoute); app.use("/api/mobileapp", MobileAppRoute);
export default app; export default app;

16
resources/user/userController.js
View File

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