CONTACT_FORM_LIFETIME,
USER_EMAIL_VERIFY_LIFETIME,
USER_PASSWORD_RESET_LIFETIME,
+ USER_PASSWORD_CREATE_LIFETIME,
VIDEO_VIEW_LIFETIME,
WEBSERVER
-} from '../initializers'
+} from '../initializers/constants'
import { CONFIG } from '../initializers/config'
type CachedRoute = {
- body: string,
+ body: string
contentType?: string
statusCode?: string
}
private client: RedisClient
private prefix: string
- private constructor () {}
+ private constructor () {
+ }
init () {
// Already initialized
if (this.initialized === true) return
this.initialized = true
- this.client = createClient(Redis.getRedisClient())
+ this.client = createClient(Redis.getRedisClientOptions())
this.client.on('error', err => {
logger.error('Error in Redis client.', { err })
this.prefix = 'redis-' + WEBSERVER.HOST + '-'
}
- static getRedisClient () {
+ static getRedisClientOptions () {
return Object.assign({},
(CONFIG.REDIS.AUTH && CONFIG.REDIS.AUTH != null) ? { password: CONFIG.REDIS.AUTH } : {},
(CONFIG.REDIS.DB) ? { db: CONFIG.REDIS.DB } : {},
- (CONFIG.REDIS.HOSTNAME && CONFIG.REDIS.PORT) ?
- { host: CONFIG.REDIS.HOSTNAME, port: CONFIG.REDIS.PORT } :
- { path: CONFIG.REDIS.SOCKET }
+ (CONFIG.REDIS.HOSTNAME && CONFIG.REDIS.PORT)
+ ? { host: CONFIG.REDIS.HOSTNAME, port: CONFIG.REDIS.PORT }
+ : { path: CONFIG.REDIS.SOCKET }
)
}
- /************* Forgot password *************/
+ getClient () {
+ return this.client
+ }
+
+ getPrefix () {
+ return this.prefix
+ }
+
+ /* ************ Forgot password ************ */
async setResetPasswordVerificationString (userId: number) {
const generatedString = await generateRandomString(32)
return generatedString
}
+ async setCreatePasswordVerificationString (userId: number) {
+ const generatedString = await generateRandomString(32)
+
+ await this.setValue(this.generateResetPasswordKey(userId), generatedString, USER_PASSWORD_CREATE_LIFETIME)
+
+ return generatedString
+ }
+
async getResetPasswordLink (userId: number) {
return this.getValue(this.generateResetPasswordKey(userId))
}
- /************* Email verification *************/
+ /* ************ Email verification ************ */
async setVerifyEmailVerificationString (userId: number) {
const generatedString = await generateRandomString(32)
return this.getValue(this.generateVerifyEmailKey(userId))
}
- /************* Contact form per IP *************/
+ /* ************ Contact form per IP ************ */
async setContactFormIp (ip: string) {
return this.setValue(this.generateContactFormKey(ip), '1', CONTACT_FORM_LIFETIME)
return this.exists(this.generateContactFormKey(ip))
}
- /************* Views per IP *************/
+ /* ************ Views per IP ************ */
setIPVideoView (ip: string, videoUUID: string) {
return this.setValue(this.generateViewKey(ip, videoUUID), '1', VIDEO_VIEW_LIFETIME)
return this.exists(this.generateViewKey(ip, videoUUID))
}
- /************* API cache *************/
+ /* ************ API cache ************ */
async getCachedRoute (req: express.Request) {
const cached = await this.getObject(this.generateCachedRouteKey(req))
}
setCachedRoute (req: express.Request, body: any, lifetime: number, contentType?: string, statusCode?: number) {
- const cached: CachedRoute = Object.assign({}, {
- body: body.toString()
- },
- (contentType) ? { contentType } : null,
- (statusCode) ? { statusCode: statusCode.toString() } : null
+ const cached: CachedRoute = Object.assign(
+ {},
+ { body: body.toString() },
+ (contentType) ? { contentType } : null,
+ (statusCode) ? { statusCode: statusCode.toString() } : null
)
return this.setObject(this.generateCachedRouteKey(req), cached, lifetime)
}
- /************* Video views *************/
+ /* ************ Video views ************ */
addVideoView (videoId: number) {
const keyIncr = this.generateVideoViewKey(videoId)
])
}
- /************* Keys generation *************/
+ /* ************ Keys generation ************ */
generateCachedRouteKey (req: express.Request) {
return req.method + '-' + req.originalUrl
return 'contact-form-' + ip
}
- /************* Redis helpers *************/
+ /* ************ Redis helpers ************ */
private getValue (key: string) {
return new Promise<string>((res, rej) => {
})
}
- private setObject (key: string, obj: { [ id: string ]: string }, expirationMilliseconds: number) {
+ private setObject (key: string, obj: { [id: string]: string }, expirationMilliseconds: number) {
return new Promise<void>((res, rej) => {
this.client.hmset(this.prefix + key, obj, (err, ok) => {
if (err) return rej(err)
}
private getObject (key: string) {
- return new Promise<{ [ id: string ]: string }>((res, rej) => {
+ return new Promise<{ [id: string]: string }>((res, rej) => {
this.client.hgetall(this.prefix + key, (err, value) => {
if (err) return rej(err)