albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
MrFry 2020-04-14 11:20:34 +02:00
parent cfe55b600b
commit cda0d31827
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/api/api.js
View file

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

2
modules/qmining/qmining-page

@ -1 +1 @@
Subproject commit 705dd718662ecce92db884ef72bfa9d44fdf91bf Subproject commit 98ec8c4a89af4e986ea608946d27ed25760858f9