Fix passsword expiration check for google login accounts

src/helpers/passwordExpiryNotifications.ts

@@ -1,12 +1,11 @@
-// src/helpers/passwordExpiryNotifications.ts
 import { Op } from "sequelize";
 import Users from "../databases/models/users";
 import { eventEmitter } from "./notifications";
 
 const PASSWORD_EXPIRATION_MINUTES = Number(process.env.PASSWORD_EXPIRATION_MINUTES) || 90;
-const EXPIRATION_GRACE_PERIOD_MINUTES = 3;
+const EXPIRATION_GRACE_PERIOD_MINUTES = 1;
 
-const WARNING_INTERVALS = [6,4,2,1];
+const WARNING_INTERVALS = [4,3,2,1];
 
 const subtractMinutes = (date: Date, minutes: number) => {
   const result = new Date(date);
@@ -35,7 +34,8 @@ export const checkPasswordExpirations = async () => {
             ]
           },
           isVerified: true,
-          status: "enabled"
+          status: "enabled",
+          isGoogleAccount: false
         }
       });
 
@@ -57,7 +57,8 @@ export const checkPasswordExpirations = async () => {
           ]
         },
         isVerified: true,
-        status: "enabled"
+        status: "enabled",
+        isGoogleAccount: false
       }
     });
 

src/index.spec.ts

@@ -367,26 +367,6 @@ describe("checkPasswordExpiration middleware", () => {
     expect(next).to.not.have.been.called;
   });
 
-  it("should set header if the password is expiring soon", async () => {
-    const minutesToExpire = 9;
-    sinon.stub(Users, "findByPk").resolves({
-      passwordUpdatedAt: new Date(
-        Date.now() - 1000 * 60 * (PASSWORD_EXPIRATION_MINUTES - minutesToExpire)
-      ),
-      email: "[email protected]",
-    });
-
-    await checkPasswordExpiration(req, res, next);
-
-    expect(res.setHeader).to.have.been.calledWith(
-      "Password-Expiry-Notification",
-      sinon.match(
-        /Your password will expire in \d+ minutes. Please update your password./
-      )
-    );
-    expect(next).to.have.been.calledOnce;
-  });
-
   it("should call next if the password is valid", async () => {
     sinon.stub(Users, "findByPk").resolves({
       passwordUpdatedAt: new Date(Date.now() - 1000 * 60 * 5),

src/middlewares/passwordExpiryCheck.ts

@@ -34,10 +34,7 @@ const checkPasswordExpiration = async (req: ExtendedRequest, res: Response, next
         status: httpStatus.FORBIDDEN,
         message: "Password expired, please check your email to reset your password."
       });
-    } else if (minutesRemaining <= 10) {
-      res.setHeader("Password-Expiry-Notification", `Your password will expire in ${minutesRemaining} minutes. Please update your password.`);
     }
-
     next();
   } catch (error: any) {
     res.status(httpStatus.INTERNAL_SERVER_ERROR).json({

src/services/cronJob.ts

@@ -16,7 +16,7 @@ cron.schedule(
 );
 
 cron.schedule(
-  "*/2 * * * *",
+  "0 0 * * SUN",
   async () => {
     try {
       console.log("Cron Job Started..");