Compare commits

..

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

4 changed files with 23 additions and 32 deletions

View File

@ -1,11 +1,6 @@
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")
);
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");

6
app.js
View File

@ -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" }));

View File

@ -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.",
});
}
};