Merge pull request #310 from OpenSignLabs/staging

fix: resolve issue of signer can change position of other signer's widget if allow modification true

apps/OpenSignServer/Utils.js

@@ -105,29 +105,20 @@ export const updateMailCount = async (extUserId, plan, monthchange) => {
   try {
     const contractUser = await query.first({ useMasterKey: true });
     if (contractUser) {
-      const _extRes = JSON.parse(JSON.stringify(contractUser));
-      let updateDate = new Date();
-      if (_extRes?.LastEmailCountReset?.iso) {
-        updateDate = new Date(_extRes?.LastEmailCountReset?.iso);
-        const newDate = new Date();
-        // Update the month while keeping the same day and year
-        updateDate.setMonth(newDate.getMonth());
-        updateDate.setFullYear(newDate.getFullYear());
-      }
       contractUser.increment('EmailCount', 1);
       if (plan === 'freeplan') {
         if (monthchange) {
-          contractUser.set('LastEmailCountReset', updateDate);
+          contractUser.set('LastEmailCountReset', new Date());
           contractUser.set('MonthlyFreeEmails', 1);
         } else {
           if (contractUser?.get('MonthlyFreeEmails')) {
             contractUser.increment('MonthlyFreeEmails', 1);
             if (contractUser?.get('LastEmailCountReset')) {
-              contractUser.set('LastEmailCountReset', updateDate);
+              contractUser.set('LastEmailCountReset', new Date());
             }
           } else {
             contractUser.set('MonthlyFreeEmails', 1);
-            contractUser.set('LastEmailCountReset', updateDate);
+            contractUser.set('LastEmailCountReset', new Date());
           }
         }
       }

apps/OpenSignServer/index.js

@@ -148,8 +148,6 @@ export const config = {
     : {}),
   filesAdapter: fsAdapter,
   auth: { google: { enabled: true }, sso: SSOAuth },
-  // for fix Adapter prototype don't match expected prototype
-  push: { queueOptions: { disablePushWorker: true } },
 };
 // Client-keys like the javascript key or the .NET key are not necessary with parse-server
 // If you wish you require them, you can set them as options in the initialization above: