NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(xo-server/token): use builtin unserialize

Browse Source
This commit is contained in:
Julien Fontanet 2023-10-23 15:34:46 +02:00
parent 225a67ae3b
commit b53d613a64
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/xo-server/src/models/token.mjs
View File

@ -2,4 +2,11 @@ import Collection from '../collection/redis.mjs'
// =================================================================== // ===================================================================
export class Tokens extends Collection {} export class Tokens extends Collection {
_unserialize(token) {
if (token.created_at !== undefined) {
token.created_at = +token.created_at
}
token.expiration = +token.expiration
}
}

11
packages/xo-server/src/xo-mixins/authentication.mjs
View File

@ -15,13 +15,6 @@ const log = createLogger('xo:authentification')
const noSuchAuthenticationToken = id => noSuchObject(id, 'authenticationToken') const noSuchAuthenticationToken = id => noSuchObject(id, 'authenticationToken')
const unserialize = token => {
if (token.created_at !== undefined) {
token.created_at = +token.created_at
}
token.expiration = +token.expiration
}
export default class { export default class {
constructor(app) { constructor(app) {
app.config.watch('authentication', config => { app.config.watch('authentication', config => {
@ -234,8 +227,6 @@ export default class {
async _getAuthenticationToken(id, properties) { async _getAuthenticationToken(id, properties) {
const token = await this._tokens.first(properties ?? id) const token = await this._tokens.first(properties ?? id)
if (token !== undefined) { if (token !== undefined) {
unserialize(token)
if (token.expiration > Date.now()) { if (token.expiration > Date.now()) {
return token return token
} }
@ -261,8 +252,6 @@ export default class {
const tokensDb = this._tokens const tokensDb = this._tokens
const toRemove = [] const toRemove = []
for (const token of await tokensDb.get({ user_id: userId })) { for (const token of await tokensDb.get({ user_id: userId })) {
unserialize(token)
const { expiration } = token const { expiration } = token
if (expiration < now) { if (expiration < now) {
toRemove.push(token.id) toRemove.push(token.id)