Removed days after user gets first pw, set starting pw request count to 0, sending user id on info request

modules/api/api.js

@@ -44,7 +44,7 @@ const usersDbBackupPath = 'data/dbs/backup'
 const maxVeteranPwGetCount = 10
 const addPWPerDay = 1 // every x day a user can give a pw
 const maxPWCount = 6 // maximum pw give opportunities a user can have at once
-const daysAfterUserGetsPWs = 2 // days after user gets pw-s
+// const daysAfterUserGetsPWs = 2 // days after user gets pw-s
 
 // stuff gotten from server.js
 let userDB
@@ -140,7 +140,7 @@ function GetApp () {
       avaiblePWS: user.avaiblePWRequests,
       requestedPWS: user.pwRequestCount,
       maxPWCount: maxPWCount,
-      daysAfterUserGetsPWs: daysAfterUserGetsPWs,
+      // daysAfterUserGetsPWs: daysAfterUserGetsPWs,
       addPWPerDay: addPWPerDay
     })
   })
@@ -169,7 +169,7 @@ function GetApp () {
     const pw = uuidv4()
     const insertRes = dbtools.Insert(userDB, 'users', {
       pw: pw,
-      avaiblePWRequests: 2,
+      avaiblePWRequests: 0,
       created: utils.GetDateString()
     })
 
@@ -178,6 +178,7 @@ function GetApp () {
     res.json({
       result: 'success',
       pw: pw,
+      requestedPWS: requestingUser.pwRequestCount + 1,
       remaining: requestingUser.avaiblePWRequests - 1
     })
   })
@@ -567,8 +568,11 @@ function GetApp () {
   })
 
   app.get('/infos', function (req, res) {
+    const user = req.session.user
+
     let result = {
-      result: 'success'
+      result: 'success',
+      uid: user.id
     }
     if (req.query.subjinfo) {
       result.subjinfo = getSimplreRes()
@@ -633,10 +637,10 @@ function GetApp () {
       }
 
       const dayDiff = getDayDiff(u.created)
-      if (dayDiff < daysAfterUserGetsPWs) {
-        logger.Log(`User #${u.id} is not registered long enough to get password ( ${dayDiff} days, ${daysAfterUserGetsPWs} needed)`, logger.GetColor('cyan'))
-        return
-      }
+      // if (dayDiff < daysAfterUserGetsPWs) {
+      //   logger.Log(`User #${u.id} is not registered long enough to get password ( ${dayDiff} days, ${daysAfterUserGetsPWs} needed)`, logger.GetColor('cyan'))
+      //   return
+      // }
 
       if (dayDiff % addPWPerDay === 0) {
         logger.Log(`Incrementing avaible PW-s for user #${u.id}: ${u.avaiblePWRequests} -> ${u.avaiblePWRequests + 1}`, logger.GetColor('cyan'))