* Added Much better session Management, key updating and deleting
* Force reload of JS if app numbers dont match * Added cool tag display on side of note * Cleaned up a bunch of code and tweaked little things to be better
This commit is contained in:
1 parent
d2624628d8
commit
071aaf22cd
18 files changed
+333
-270
No files matched your search
@@ -143,6 +143,7 @@ User.getCounts = (userId) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
let countTotals = {}
|
||||
const userHash = cs.hash(String(userId)).toString('base64')
|
||||
|
||||
db.promise().query(
|
||||
`SELECT
|
||||
@@ -169,8 +170,6 @@ User.getCounts = (userId) => {
|
||||
.then( (rows, fields) => {
|
||||
|
||||
Object.assign(countTotals, rows[0][0]) //combine results
|
||||
|
||||
const userHash = cs.hash(String(userId)).toString('base64')
|
||||
|
||||
return db.promise().query(
|
||||
`SELECT count(id) as activeSessions FROM user_active_session WHERE user_hash = ?`, [userHash]
|
||||
@@ -199,6 +198,8 @@ User.getCounts = (userId) => {
|
||||
countTotals[key] = count ? count : 0
|
||||
})
|
||||
|
||||
countTotals['currentVersion'] = '3.0.0'
|
||||
|
||||
resolve(countTotals)
|
||||
})
|
||||
|
||||
@@ -206,8 +207,9 @@ User.getCounts = (userId) => {
|
||||
}
|
||||
|
||||
//Log out user by deleting login token for that active session
|
||||
User.logout = (tokenId) => {
|
||||
return db.promise().query('DELETE FROM user_active_session WHERE (id = ?)', [tokenId])
|
||||
User.logout = (sessionId) => {
|
||||
console.log('Terminate Session -> ', sessionId)
|
||||
return db.promise().query('DELETE FROM user_active_session WHERE (session_id = ?)', [sessionId])
|
||||
}
|
||||
|
||||
User.generateMasterKey = (userId, password) => {
|
||||
|
||||
Reference in new issue
Block a user