-import { createClient, RedisClientOptions, RedisModules, RedisScripts } from 'redis'
+import { createClient, RedisClientOptions, RedisModules } from 'redis'
import { exists } from '@server/helpers/custom-validators/misc'
import { sha256 } from '@shared/extra-utils'
import { logger } from '../helpers/logger'
CONTACT_FORM_LIFETIME,
RESUMABLE_UPLOAD_SESSION_LIFETIME,
TRACKER_RATE_LIMITS,
+ TWO_FACTOR_AUTH_REQUEST_TOKEN_LIFETIME,
USER_EMAIL_VERIFY_LIFETIME,
USER_PASSWORD_CREATE_LIFETIME,
USER_PASSWORD_RESET_LIFETIME,
WEBSERVER
} from '../initializers/constants'
-// Only used for typings
-// TODO: remove when https://github.com/microsoft/TypeScript/issues/37181 is fixed
-const redisClientWrapperForType = () => createClient<{}, RedisScripts>()
-
class Redis {
private static instance: Redis
private initialized = false
private connected = false
- private client: ReturnType<typeof redisClientWrapperForType>
+ private client: ReturnType<typeof createClient>
private prefix: string
private constructor () {
this.initialized = true
this.client = createClient(Redis.getRedisClientOptions())
+ this.client.on('error', err => logger.error('Redis Client Error', { err }))
logger.info('Connecting to redis...')
return this.removeValue(this.generateResetPasswordKey(userId))
}
- async getResetPasswordLink (userId: number) {
+ async getResetPasswordVerificationString (userId: number) {
return this.getValue(this.generateResetPasswordKey(userId))
}
+ /* ************ Two factor auth request ************ */
+
+ async setTwoFactorRequest (userId: number, otpSecret: string) {
+ const requestToken = await generateRandomString(32)
+
+ await this.setValue(this.generateTwoFactorRequestKey(userId, requestToken), otpSecret, TWO_FACTOR_AUTH_REQUEST_TOKEN_LIFETIME)
+
+ return requestToken
+ }
+
+ async getTwoFactorRequestToken (userId: number, requestToken: string) {
+ return this.getValue(this.generateTwoFactorRequestKey(userId, requestToken))
+ }
+
/* ************ Email verification ************ */
async setVerifyEmailVerificationString (userId: number) {
return 'reset-password-' + userId
}
+ private generateTwoFactorRequestKey (userId: number, token: string) {
+ return 'two-factor-request-' + userId + '-' + token
+ }
+
private generateVerifyEmailKey (userId: number) {
return 'verify-email-' + userId
}
return JSON.parse(value)
}
- private setObject (key: string, value: { [ id: string ]: number | string }) {
- return this.setValue(key, JSON.stringify(value))
+ private setObject (key: string, value: { [ id: string ]: number | string }, expirationMilliseconds?: number) {
+ return this.setValue(key, JSON.stringify(value), expirationMilliseconds)
}
private async setValue (key: string, value: string, expirationMilliseconds?: number) {