liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: deps update + 2FA setup + verify

Browse Source
This commit is contained in:
NGPixel
2020-08-22 19:37:49 -04:00
parent 29afc61abf
commit f72530bf84
58 changed files with 2136 additions and 2452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/models/userKeys.js
View File

@@ -1,8 +1,8 @@
/* global WIKI */
const Model = require('objection').Model
const moment = require('moment')
const nanoid = require('nanoid').nanoid
const { DateTime } = require('luxon')
const { nanoid } = require('nanoid')
/**
* Users model
@@ -41,25 +41,27 @@ module.exports = class UserKey extends Model {
async $beforeInsert(context) {
await super.$beforeInsert(context)
this.createdAt = moment.utc().toISOString()
this.createdAt = DateTime.utc().toISO()
}
static async generateToken ({ userId, kind }, context) {
const token = nanoid()
const token = await nanoid()
await WIKI.models.userKeys.query().insert({
kind,
token,
validUntil: moment.utc().add(1, 'days').toISOString(),
validUntil: DateTime.utc().plus({ days: 1 }).toISO(),
userId
})
return token
}
static async validateToken ({ kind, token }, context) {
static async validateToken ({ kind, token, skipDelete }, context) {
const res = await WIKI.models.userKeys.query().findOne({ kind, token }).withGraphJoined('user')
if (res) {
await WIKI.models.userKeys.query().deleteById(res.id)
if (moment.utc().isAfter(moment.utc(res.validUntil))) {
if (skipDelete !== true) {
await WIKI.models.userKeys.query().deleteById(res.id)
}
if (DateTime.utc() > DateTime.fromISO(res.validUntil)) {
throw new WIKI.Error.AuthValidationTokenInvalid()
}
return res.user
@@ -67,4 +69,8 @@ module.exports = class UserKey extends Model {
throw new WIKI.Error.AuthValidationTokenInvalid()
}
}
static async destroyToken ({ token }) {
return WIKI.models.userKeys.query().findOne({ token }).delete()
}
}