Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

applied ESLint autofix

Blue Mousea0e7b6be1319
diff --git a/src/Util/Util.ts b/src/Util/Util.ts
index f9eca628f..656123790 100644
--- a/src/Util/Util.ts
+++ b/src/Util/Util.ts
@@ -12,58 +12,58 @@ export class Util {
}
getUser(): User {
- let user = new User()
+ const user = new User()
return user
}
getLetterTemplate(): LetterTemplate {
- let letterTemplate = LetterTemplate.ConfirmPasswordChange
+ const letterTemplate = LetterTemplate.ConfirmPasswordChange
return letterTemplate
}
getProject(): Project {
- let proj = new Project()
+ const proj = new Project()
return proj
}
getUserType(): UserType {
- let userType = UserType.CUSTOMER
+ const userType = UserType.CUSTOMER
return userType
}
getUserTypeArray(): Array<UserType> {
- let arrayOfUserType = new Array<UserType>()
+ const arrayOfUserType = new Array<UserType>()
arrayOfUserType.push(this.getUserType())
return arrayOfUserType
}
getProjectShare(): ProjectShare {
- let projectShare = new ProjectShare()
+ const projectShare = new ProjectShare()
return projectShare
}
getObjectArray(): Array<Object> {
- let arrayOfObjects = new Array<Object>()
+ const arrayOfObjects = new Array<Object>()
return arrayOfObjects
}
getStringArray(): Array<string> {
- let arrayOfSrtings = new Array<string>()
+ const arrayOfSrtings = new Array<string>()
return arrayOfSrtings
}
getObject(): Object {
- let object = new Object()
+ const object = new Object()
return object
}
getRecordStringUnknown(): Record<string, unknown> {
- let record: Record<string, unknown> = {}
+ const record: Record<string, unknown> = {}
return record
}
getPaginationOptionsInterface(): PaginationOptionsInterface {
- let paginationOptionsInterface: PaginationOptionsInterface = {
+ const paginationOptionsInterface: PaginationOptionsInterface = {
take: 1,
skip: 2,
}
@@ -71,7 +71,7 @@ export class Util {
}
getProjectDTO(): ProjectDTO {
- let projectDTO = new ProjectDTO()
+ const projectDTO = new ProjectDTO()
return projectDTO
}
}
diff --git a/src/action-tokens/action-token.entity.ts b/src/action-tokens/action-token.entity.ts
index 4d3ab7fe4..777b3523a 100644
--- a/src/action-tokens/action-token.entity.ts
+++ b/src/action-tokens/action-token.entity.ts
@@ -1,38 +1,38 @@
-import {
- Entity,
- PrimaryGeneratedColumn,
- ManyToOne,
- Timestamp,
- CreateDateColumn,
- Column,
-} from 'typeorm'
-import { User } from '../user/entities/user.entity'
-
-export enum ActionTokenType {
- EMAIL_VERIFICATION,
- PASSWORD_RESET,
- EMAIL_CHANGE,
- PROJECT_SHARE,
- ADDING_PROJECT_SUBSCRIBER,
-}
-
-@Entity()
-export class ActionToken {
- @PrimaryGeneratedColumn('uuid')
- id: string
-
- @ManyToOne(() => User, user => user.actionTokens, { onDelete: 'CASCADE' })
- user: User
-
- @CreateDateColumn()
- created: Timestamp
-
- @Column('varchar', { length: 254, default: null })
- newValue: string
-
- @Column({
- type: 'enum',
- enum: ActionTokenType,
- })
- action: ActionTokenType
-}
+import {
+ Entity,
+ PrimaryGeneratedColumn,
+ ManyToOne,
+ Timestamp,
+ CreateDateColumn,
+ Column,
+} from 'typeorm'
+import { User } from '../user/entities/user.entity'
+
+export enum ActionTokenType {
+ EMAIL_VERIFICATION,
+ PASSWORD_RESET,
+ EMAIL_CHANGE,
+ PROJECT_SHARE,
+ ADDING_PROJECT_SUBSCRIBER,
+}
+
+@Entity()
+export class ActionToken {
+ @PrimaryGeneratedColumn('uuid')
+ id: string
+
+ @ManyToOne(() => User, user => user.actionTokens, { onDelete: 'CASCADE' })
+ user: User
+
+ @CreateDateColumn()
+ created: Timestamp
+
+ @Column('varchar', { length: 254, default: null })
+ newValue: string
+
+ @Column({
+ type: 'enum',
+ enum: ActionTokenType,
+ })
+ action: ActionTokenType
+}
diff --git a/src/action-tokens/action-tokens.service.ts b/src/action-tokens/action-tokens.service.ts
index dd540c280..a8c37a18b 100644
--- a/src/action-tokens/action-tokens.service.ts
+++ b/src/action-tokens/action-tokens.service.ts
@@ -1,70 +1,70 @@
-import { Injectable } from '@nestjs/common'
-import { InjectRepository } from '@nestjs/typeorm'
-import { Repository } from 'typeorm'
-
-import { ActionToken, ActionTokenType } from './action-token.entity'
-import { User } from '../user/entities/user.entity'
-
-@Injectable()
-export class ActionTokensService {
- constructor(
- @InjectRepository(ActionToken)
- private actionTokensRepository: Repository<ActionToken>,
- ) {}
-
- async deleteMultiple(where: string): Promise<any> {
- return this.actionTokensRepository
- .createQueryBuilder()
- .delete()
- .where(where)
- .execute()
- }
-
- async createForUser(
- user: User,
- action: ActionTokenType,
- newValue: string = null,
- ): Promise<ActionToken> {
- return this.actionTokensRepository.save({ user, action, newValue })
- }
-
- async find(id: string): Promise<ActionToken> {
- return this.actionTokensRepository.findOneOrFail(id, {
- relations: ['user'],
- })
- }
-
- async delete(id: string): Promise<void> {
- await this.actionTokensRepository.delete(id)
- }
-
- public async createActionToken(
- userId: string,
- action: ActionTokenType,
- newValue?: string,
- ) {
- return await this.actionTokensRepository.save({
- user: { id: userId },
- action,
- newValue,
- })
- }
-
- public async findActionToken(token: string) {
- return await this.actionTokensRepository.findOne(token, {
- relations: ['user'],
- })
- }
-
- public async deleteActionToken(token: string) {
- await this.actionTokensRepository.delete(token)
- }
-
- async getActionToken(token: string) {
- return await this.actionTokensRepository.findOne({
- where: {
- id: token,
- },
- })
- }
-}
+import { Injectable } from '@nestjs/common'
+import { InjectRepository } from '@nestjs/typeorm'
+import { Repository } from 'typeorm'
+
+import { ActionToken, ActionTokenType } from './action-token.entity'
+import { User } from '../user/entities/user.entity'
+
+@Injectable()
+export class ActionTokensService {
+ constructor(
+ @InjectRepository(ActionToken)
+ private actionTokensRepository: Repository<ActionToken>,
+ ) {}
+
+ async deleteMultiple(where: string): Promise<any> {
+ return this.actionTokensRepository
+ .createQueryBuilder()
+ .delete()
+ .where(where)
+ .execute()
+ }
+
+ async createForUser(
+ user: User,
+ action: ActionTokenType,
+ newValue: string = null,
+ ): Promise<ActionToken> {
+ return this.actionTokensRepository.save({ user, action, newValue })
+ }
+
+ async find(id: string): Promise<ActionToken> {
+ return this.actionTokensRepository.findOneOrFail(id, {
+ relations: ['user'],
+ })
+ }
+
+ async delete(id: string): Promise<void> {
+ await this.actionTokensRepository.delete(id)
+ }
+
+ public async createActionToken(
+ userId: string,
+ action: ActionTokenType,
+ newValue?: string,
+ ) {
+ return await this.actionTokensRepository.save({
+ user: { id: userId },
+ action,
+ newValue,
+ })
+ }
+
+ public async findActionToken(token: string) {
+ return await this.actionTokensRepository.findOne(token, {
+ relations: ['user'],
+ })
+ }
+
+ public async deleteActionToken(token: string) {
+ await this.actionTokensRepository.delete(token)
+ }
+
+ async getActionToken(token: string) {
+ return await this.actionTokensRepository.findOne({
+ where: {
+ id: token,
+ },
+ })
+ }
+}
diff --git a/src/alert/alert.controller.ts b/src/alert/alert.controller.ts
index 5b8318f7e..5cdbfd137 100644
--- a/src/alert/alert.controller.ts
+++ b/src/alert/alert.controller.ts
@@ -1,5 +1,16 @@
import {
- Controller, Get, Put, Delete, UseGuards, Query, Param, Body, NotFoundException, Post, ForbiddenException, BadRequestException,
+ Controller,
+ Get,
+ Put,
+ Delete,
+ UseGuards,
+ Query,
+ Param,
+ Body,
+ NotFoundException,
+ Post,
+ ForbiddenException,
+ BadRequestException,
} from '@nestjs/common'
import { In } from 'typeorm'
import { ApiTags, ApiResponse } from '@nestjs/swagger'
@@ -32,7 +43,7 @@ export class AlertController {
private readonly projectService: ProjectService,
private readonly logger: AppLoggerService,
private readonly userService: UserService,
- ) { }
+ ) {}
@Get('/')
@UseGuards(SelfhostedGuard)
@@ -52,11 +63,15 @@ export class AlertController {
return []
}
- const pids = _map(projects, (project) => project.id)
+ const pids = _map(projects, project => project.id)
- const result = await this.alertService.paginate({ take, skip }, { project: In(pids) }, ['project'])
+ const result = await this.alertService.paginate(
+ { take, skip },
+ { project: In(pids) },
+ ['project'],
+ )
- result.results = _map(result.results, (alert) => ({
+ result.results = _map(result.results, alert => ({
..._omit(alert, ['project']),
pid: alert.project.id,
}))
@@ -75,9 +90,7 @@ export class AlertController {
) {
this.logger.log({ uid }, 'POST /alert')
- const user = await this.userService.findOneWithRelations(uid, [
- 'projects',
- ])
+ const user = await this.userService.findOneWithRelations(uid, ['projects'])
const maxAlerts = ACCOUNT_PLANS[user.planCode]?.maxAlerts
@@ -85,19 +98,27 @@ export class AlertController {
throw new ForbiddenException('Please, verify your email address first')
}
- const project = await this.projectService.findOneWhere({
- id: alertDTO.pid,
- }, {
- relations: ['alerts', 'admin'],
- })
+ const project = await this.projectService.findOneWhere(
+ {
+ id: alertDTO.pid,
+ },
+ {
+ relations: ['alerts', 'admin'],
+ },
+ )
if (_isEmpty(project)) {
throw new NotFoundException('Project not found')
}
- this.projectService.allowedToManage(project, uid, user.roles, 'You are not allowed to add alerts to this project')
+ this.projectService.allowedToManage(
+ project,
+ uid,
+ user.roles,
+ 'You are not allowed to add alerts to this project',
+ )
- const pids = _map(user.projects, (project) => project.id)
+ const pids = _map(user.projects, project => project.id)
const alertsCount = await this.alertService.count({ project: In(pids) })
if (user.planCode === PlanCode.none) {
@@ -133,7 +154,6 @@ export class AlertController {
}
}
-
@Put('/:id')
@UseGuards(SelfhostedGuard)
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@@ -154,14 +174,29 @@ export class AlertController {
const user = await this.userService.findOne(uid)
- this.projectService.allowedToManage(alert.project, uid, user.roles, 'You are not allowed to manage this alert')
+ this.projectService.allowedToManage(
+ alert.project,
+ uid,
+ user.roles,
+ 'You are not allowed to manage this alert',
+ )
alert = {
...alert,
- ..._pick(alertDTO, ['queryMetric', 'queryCondition', 'queryValue', 'queryTime', 'active', 'name']),
+ ..._pick(alertDTO, [
+ 'queryMetric',
+ 'queryCondition',
+ 'queryValue',
+ 'queryTime',
+ 'active',
+ 'name',
+ ]),
}
- await this.alertService.update(id, _omit(alert, ['project', 'lastTriggered']))
+ await this.alertService.update(
+ id,
+ _omit(alert, ['project', 'lastTriggered']),
+ )
return {
..._omit(alert, ['project']),
@@ -174,13 +209,10 @@ export class AlertController {
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Roles(UserType.ADMIN, UserType.CUSTOMER)
@ApiResponse({ status: 204, description: 'Empty body' })
- async deleteAlert(
- @Param('id') id: string,
- @CurrentUserId() uid: string,
- ) {
+ async deleteAlert(@Param('id') id: string, @CurrentUserId() uid: string) {
this.logger.log({ id, uid }, 'DELETE /alert/:id')
- let alert = await this.alertService.findOneWithRelations(id)
+ const alert = await this.alertService.findOneWithRelations(id)
if (_isEmpty(alert)) {
throw new NotFoundException()
@@ -188,7 +220,12 @@ export class AlertController {
const user = await this.userService.findOne(uid)
- this.projectService.allowedToManage(alert.project, uid, user.roles, 'You are not allowed to manage this alert')
+ this.projectService.allowedToManage(
+ alert.project,
+ uid,
+ user.roles,
+ 'You are not allowed to manage this alert',
+ )
await this.alertService.delete(id)
}
diff --git a/src/alert/alert.service.ts b/src/alert/alert.service.ts
index cd12afe4e..9795d2260 100644
--- a/src/alert/alert.service.ts
+++ b/src/alert/alert.service.ts
@@ -1,6 +1,4 @@
-import {
- Injectable,
-} from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
import { InjectRepository } from '@nestjs/typeorm'
import { Repository } from 'typeorm'
import { Alert } from './entity/alert.entity'
@@ -36,7 +34,9 @@ export class AlertService {
}
findOneWithRelations(id: string): Promise<Alert | null> {
- return this.alertsReporsitory.findOne(id, { relations: ['project', 'project.admin'] })
+ return this.alertsReporsitory.findOne(id, {
+ relations: ['project', 'project.admin'],
+ })
}
async count(options: object = {}): Promise<number> {
@@ -69,10 +69,7 @@ export class AlertService {
return this.alertsReporsitory.save(project)
}
- async update(
- id: string,
- alertDTO: AlertDTO | Alert,
- ): Promise<any> {
+ async update(id: string, alertDTO: AlertDTO | Alert): Promise<any> {
return this.alertsReporsitory.update(id, alertDTO)
}
diff --git a/src/alert/entity/alert.entity.ts b/src/alert/entity/alert.entity.ts
index 671740684..4cede0045 100644
--- a/src/alert/entity/alert.entity.ts
+++ b/src/alert/entity/alert.entity.ts
@@ -1,17 +1,8 @@
-import {
- Entity,
- Column,
- ManyToOne,
- PrimaryGeneratedColumn,
-} from 'typeorm'
+import { Entity, Column, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
import { ApiProperty } from '@nestjs/swagger'
import { Project } from 'src/project/entity/project.entity'
-import {
- QueryCondition,
- QueryMetric,
- QueryTime,
-} from 'src/alert/dto/alert.dto'
+import { QueryCondition, QueryMetric, QueryTime } from 'src/alert/dto/alert.dto'
@Entity()
export class Alert {
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.ts
index 47eea0de1..ce08a2035 100644
--- a/src/analytics/analytics.controller.ts
+++ b/src/analytics/analytics.controller.ts
@@ -253,14 +253,14 @@ export class AnalyticsController {
private readonly analyticsService: AnalyticsService,
private readonly logger: AppLoggerService,
private readonly taskManagerService: TaskManagerService,
- ) { }
+ ) {}
@Get('/')
@Auth([], true, true)
async getData(
@Query() data: AnalyticsGET_DTO,
@CurrentUserId() uid: string,
- isCaptcha: boolean = false,
+ isCaptcha = false,
): Promise<any> {
const {
pid,
@@ -285,20 +285,23 @@ export class AnalyticsController {
let groupFrom = from,
groupTo = to
- let queryCustoms =
- `SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`
+ let queryCustoms = `SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`
// TODO: Refactor
- let subQuery = `FROM ${isCaptcha ? 'captcha' : 'analytics'} WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
+ let subQuery = `FROM ${
+ isCaptcha ? 'captcha' : 'analytics'
+ } WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
let customEVFilterApplied = false
// @ts-ignore
if (filtersParams?.ev && !isCaptcha) {
customEVFilterApplied = true
- // @ts-ignore
- queryCustoms = `SELECT ev, count() FROM customEV WHERE ${filtersParams.ev_exclusive ? 'NOT' : ''} ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`
+ queryCustoms = `SELECT ev, count() FROM customEV WHERE ${
+ filtersParams.ev_exclusive ? 'NOT' : ''
+ } ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`
- // @ts-ignore
- subQuery = `FROM customEV WHERE ${filtersParams.ev_exclusive ? 'NOT' : ''} ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
+ subQuery = `FROM customEV WHERE ${
+ filtersParams.ev_exclusive ? 'NOT' : ''
+ } ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
}
const paramsData = {
@@ -426,7 +429,7 @@ export class AnalyticsController {
if (filters) {
try {
appliedFilters = JSON.parse(filters)
- } catch { }
+ } catch {}
}
if (isCaptcha) {
@@ -470,7 +473,8 @@ export class AnalyticsController {
}
this.analyticsService.validateTimebucket(timeBucket)
- const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(filters)
+ const [filtersQuery, filtersParams] =
+ this.analyticsService.getFiltersQuery(filters)
await this.analyticsService.checkProjectAccess(pid, uid)
let groupFrom = from,
@@ -588,7 +592,7 @@ export class AnalyticsController {
if (filters) {
try {
appliedFilters = JSON.parse(filters)
- } catch { }
+ } catch {}
}
return {
@@ -657,7 +661,9 @@ export class AnalyticsController {
const users = _toNumber(await redis.get(REDIS_USERS_COUNT_KEY))
const projects = _toNumber(await redis.get(REDIS_PROJECTS_COUNT_KEY))
const pageviews = _toNumber(await redis.get(REDIS_PAGEVIEWS_COUNT_KEY))
- const performance = _toNumber(await redis.get(REDIS_PERFORMANCE_COUNT_KEY))
+ const performance = _toNumber(
+ await redis.get(REDIS_PERFORMANCE_COUNT_KEY),
+ )
return {
users,
@@ -713,11 +719,15 @@ export class AnalyticsController {
return []
}
- const sids = _map(keys, (key) => key.split(':')[1])
+ const sids = _map(keys, key => key.split(':')[1])
- const query = `SELECT sid, dv, br, os, cc FROM analytics WHERE sid IN (${sids.map(el => `'${el}'`).join(',')})`
+ const query = `SELECT sid, dv, br, os, cc FROM analytics WHERE sid IN (${sids
+ .map(el => `'${el}'`)
+ .join(',')})`
const result = await clickhouse.query(query).toPromise()
- const processed = _map(_uniqBy(result, 'sid'), (el) => _pick(el, ['dv', 'br', 'os', 'cc']))
+ const processed = _map(_uniqBy(result, 'sid'), el =>
+ _pick(el, ['dv', 'br', 'os', 'cc']),
+ )
return processed
}
@@ -762,7 +772,9 @@ export class AnalyticsController {
const br = ua.browser.name
const os = ua.os.name
// trying to get country from timezome, otherwise using CloudFlare's IP based country code as a fallback
- const cc = ct.getCountryForTimezone(eventsDTO.tz)?.id || (headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry'])
+ const cc =
+ ct.getCountryForTimezone(eventsDTO.tz)?.id ||
+ (headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry'])
const dto = customLogDTO(
eventsDTO.pid,
@@ -894,15 +906,16 @@ export class AnalyticsController {
}
if (!cc) {
- cc = ct.getCountryForTimezone(logDTO.tz)?.id || (headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry'])
+ cc =
+ ct.getCountryForTimezone(logDTO.tz)?.id ||
+ (headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry'])
}
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const {
- dns, tls, conn, response, render, dom_load, page_load, ttfb,
- } = logDTO.perf
+ const { dns, tls, conn, response, render, dom_load, page_load, ttfb } =
+ logDTO.perf
perfDTO = performanceDTO(
logDTO.pid,
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.ts
index fa4ab83de..0ea9ba23e 100644
--- a/src/analytics/analytics.service.ts
+++ b/src/analytics/analytics.service.ts
@@ -27,7 +27,11 @@ import {
PreconditionFailedException,
} from '@nestjs/common'
-import { ACCOUNT_PLANS, DEFAULT_TIMEZONE, PlanCode } from '../user/entities/user.entity'
+import {
+ ACCOUNT_PLANS,
+ DEFAULT_TIMEZONE,
+ PlanCode,
+} from '../user/entities/user.entity'
import {
redis,
isValidPID,
@@ -56,12 +60,19 @@ export const getSessionDurationKey = (hash: string, pid: string) =>
`sd:${hash}:${pid}`
export const cols = [
- 'cc', 'pg', 'lc', 'br', 'os', 'dv', 'ref', 'so', 'me', 'ca',
+ 'cc',
+ 'pg',
+ 'lc',
+ 'br',
+ 'os',
+ 'dv',
+ 'ref',
+ 'so',
+ 'me',
+ 'ca',
]
-export const captchaColumns = [
- 'cc', 'br', 'os', 'dv',
-]
+export const captchaColumns = ['cc', 'br', 'os', 'dv']
export const perfCols = ['cc', 'pg', 'dv', 'br']
@@ -107,7 +118,7 @@ const customEVvalidate = /^[a-zA-Z](?:[\w\.]){0,62}$/
interface GetFiltersQuery extends Array<string | object> {
0: string
- 1: object
+ 1: any
}
export const isValidTimezone = (timezone: string): boolean => {
@@ -157,7 +168,7 @@ export const checkIfTBAllowed = (
@Injectable()
export class AnalyticsService {
- constructor(private readonly projectService: ProjectService) { }
+ constructor(private readonly projectService: ProjectService) {}
async checkProjectAccess(pid: string, uid: string | null): Promise<void> {
if (!isSelfhosted) {
@@ -471,7 +482,10 @@ export class AnalyticsService {
return result
}
- async getCaptchaSummary(pids: string[], period: 'w' | 'M' = 'w'): Promise<Object> {
+ async getCaptchaSummary(
+ pids: string[],
+ period: 'w' | 'M' = 'w',
+ ): Promise<Object> {
const result = {}
for (let i = 0; i < _size(pids); ++i) {
@@ -526,7 +540,7 @@ export class AnalyticsService {
to: string,
subQuery: string,
filtersQuery: string,
- paramsData: object,
+ paramsData: any,
timezone: string,
customEVFilterApplied: boolean,
): Promise<object | void> {
@@ -551,7 +565,7 @@ export class AnalyticsService {
}
// Average session duration calculation
- let avgSdur = 0
+ const avgSdur = 0
if (!customEVFilterApplied) {
const avgSdurQuery = `SELECT avg(sdur) ${subQuery} AND sdur IS NOT NULL`
let avgSdur = await clickhouse.query(avgSdurQuery, paramsData).toPromise()
@@ -594,12 +608,14 @@ export class AnalyticsService {
if (i > 0) {
query += ' UNION ALL '
}
-
- // @ts-ignore
- query += `select count() from customEV where ${paramsData.params.ev_exclusive ? 'NOT' : ''} ev = {ev:String} AND pid = {pid:FixedString(12)} and created between '${xM[i]
- }' and '${xM[1 + i]}' ${filtersQuery}`
+
+ query += `select count() from customEV where ${
+ paramsData.params.ev_exclusive ? 'NOT' : ''
+ } ev = {ev:String} AND pid = {pid:FixedString(12)} and created between '${
+ xM[i]
+ }' and '${xM[1 + i]}' ${filtersQuery}`
}
-
+
// @ts-ignore
const result: Array<chartCHResponse> = (
await clickhouse.query(query, paramsData).toPromise()
@@ -608,19 +624,19 @@ export class AnalyticsService {
.sort((a, b) => a.index - b.index)
const uniques = []
- let sdur = []
+ const sdur = []
for (let i = 0; i < _size(x); ++i) {
uniques[i] = result[i]['count()']
sdur[i] = 0
}
-
+
if (timezone !== DEFAULT_TIMEZONE && isValidTimezone(timezone)) {
x = _map(x, el =>
dayjs.utc(el).tz(timezone).format('YYYY-MM-DD HH:mm:ss'),
)
}
-
+
return Promise.resolve({
params,
chart: {
@@ -638,8 +654,9 @@ export class AnalyticsService {
query += ' UNION ALL '
}
- query += `select ${i} index, unique, count(), avg(sdur) from analytics where pid = {pid:FixedString(12)} and created between '${xM[i]
- }' and '${xM[1 + i]}' ${filtersQuery} group by unique`
+ query += `select ${i} index, unique, count(), avg(sdur) from analytics where pid = {pid:FixedString(12)} and created between '${
+ xM[i]
+ }' and '${xM[1 + i]}' ${filtersQuery} group by unique`
}
// @ts-ignore
@@ -782,8 +799,9 @@ export class AnalyticsService {
query += ' UNION ALL '
}
- query += `select ${i} index, count() from captcha where pid = {pid:FixedString(12)} and created between '${xM[i]
- }' and '${xM[1 + i]}' ${filtersQuery}`
+ query += `select ${i} index, count() from captcha where pid = {pid:FixedString(12)} and created between '${
+ xM[i]
+ }' and '${xM[1 + i]}' ${filtersQuery}`
}
// @ts-ignore
@@ -892,8 +910,9 @@ export class AnalyticsService {
query += ' UNION ALL '
}
- query += `select ${i} index, avg(dns), avg(tls), avg(conn), avg(response), avg(render), avg(domLoad), avg(ttfb) from performance where pid = {pid:FixedString(12)} and created between '${xM[i]
- }' and '${xM[1 + i]}' ${filtersQuery} group by pid`
+ query += `select ${i} index, avg(dns), avg(tls), avg(conn), avg(response), avg(render), avg(domLoad), avg(ttfb) from performance where pid = {pid:FixedString(12)} and created between '${
+ xM[i]
+ }' and '${xM[1 + i]}' ${filtersQuery} group by pid`
}
// @ts-ignore
diff --git a/src/analytics/dto/pageviews.dto.ts b/src/analytics/dto/pageviews.dto.ts
index f87e58eb1..c9e443ab1 100644
--- a/src/analytics/dto/pageviews.dto.ts
+++ b/src/analytics/dto/pageviews.dto.ts
@@ -73,13 +73,13 @@ export class PageviewsDTO {
description: 'Performance metrics',
})
perf?: {
- dns: number,
- tls: number,
- conn: number,
- response: number,
- render: number,
- dom_load: number,
- page_load: number,
- ttfb: number,
+ dns: number
+ tls: number
+ conn: number
+ response: number
+ render: number
+ dom_load: number
+ page_load: number
+ ttfb: number
}
}
diff --git a/src/captcha/captcha.controller.ts b/src/captcha/captcha.controller.ts
index e9dc765b3..4b127a3ba 100644
--- a/src/captcha/captcha.controller.ts
+++ b/src/captcha/captcha.controller.ts
@@ -1,6 +1,16 @@
import {
- Controller, Post, Body, UseGuards, ForbiddenException, InternalServerErrorException,
- Headers, Request, Req, Response, Res, HttpCode,
+ Controller,
+ Post,
+ Body,
+ UseGuards,
+ ForbiddenException,
+ InternalServerErrorException,
+ Headers,
+ Request,
+ Req,
+ Response,
+ Res,
+ HttpCode,
} from '@nestjs/common'
import * as dayjs from 'dayjs'
import * as utc from 'dayjs/plugin/utc'
@@ -25,20 +35,16 @@ export class CaptchaController {
constructor(
private readonly captchaService: CaptchaService,
private readonly logger: AppLoggerService,
- ) { }
+ ) {}
@Post('/generate')
@HttpCode(200)
@UseGuards(BotDetectionGuard)
@BotDetection()
- async generateCaptcha(
- @Body() generateDTO: GenerateDTO,
- ): Promise<any> {
+ async generateCaptcha(@Body() generateDTO: GenerateDTO): Promise<any> {
this.logger.log({ generateDTO }, 'POST /captcha/generate')
- const {
- theme = DEFAULT_THEME, pid,
- } = generateDTO
+ const { theme = DEFAULT_THEME, pid } = generateDTO
await this.captchaService.validatePIDForCAPTCHA(pid)
@@ -62,9 +68,7 @@ export class CaptchaController {
// @ts-ignore
const tokenCookie = request?.cookies?.[CAPTCHA_COOKIE_KEY]
- const {
- code, hash, pid,
- } = manualDTO
+ const { code, hash, pid } = manualDTO
await this.captchaService.validatePIDForCAPTCHA(pid)
@@ -82,7 +86,10 @@ export class CaptchaController {
}
}
- if (pid === DUMMY_PIDS.ALWAYS_FAIL || !this.captchaService.verifyCaptcha(code, hash)) {
+ if (
+ pid === DUMMY_PIDS.ALWAYS_FAIL ||
+ !this.captchaService.verifyCaptcha(code, hash)
+ ) {
throw new ForbiddenException('Incorrect captcha')
}
@@ -97,16 +104,29 @@ export class CaptchaController {
}
}
- const token = await this.captchaService.generateToken(pid, hash, timestamp, false)
+ const token = await this.captchaService.generateToken(
+ pid,
+ hash,
+ timestamp,
+ false,
+ )
- const {
- manuallyVerified, automaticallyVerified,
- } = this.captchaService.incrementManuallyVerified(decrypted)
+ const { manuallyVerified, automaticallyVerified } =
+ this.captchaService.incrementManuallyVerified(decrypted)
- const newTokenCookie = this.captchaService.getTokenCaptcha(manuallyVerified, automaticallyVerified)
+ const newTokenCookie = this.captchaService.getTokenCaptcha(
+ manuallyVerified,
+ automaticallyVerified,
+ )
this.captchaService.setTokenCookie(response, newTokenCookie)
- await this.captchaService.logCaptchaPass(pid, userAgent, headers, timestamp, true)
+ await this.captchaService.logCaptchaPass(
+ pid,
+ userAgent,
+ headers,
+ timestamp,
+ true,
+ )
return {
success: true,
@@ -147,7 +167,10 @@ export class CaptchaController {
// Either there was no cookie or the cookie was invalid
let newTokenCookie
- if (isDummyPID(pid) && (pid !== DUMMY_PIDS.AUTO_PASS || pid === DUMMY_PIDS.ALWAYS_FAIL)) {
+ if (
+ isDummyPID(pid) &&
+ (pid !== DUMMY_PIDS.AUTO_PASS || pid === DUMMY_PIDS.ALWAYS_FAIL)
+ ) {
throw new ForbiddenException('Captcha required')
}
@@ -156,7 +179,9 @@ export class CaptchaController {
newTokenCookie = this.captchaService.getTokenCaptcha()
} catch (e) {
console.error(e)
- throw new InternalServerErrorException('Could not generate a captcha cookie')
+ throw new InternalServerErrorException(
+ 'Could not generate a captcha cookie',
+ )
}
tokenCookie = newTokenCookie
@@ -171,7 +196,12 @@ export class CaptchaController {
let decrypted
const timestamp = dayjs.utc().unix()
- const token = await this.captchaService.generateToken(pid, null, timestamp, true)
+ const token = await this.captchaService.generateToken(
+ pid,
+ null,
+ timestamp,
+ true,
+ )
if (pid === DUMMY_PIDS.AUTO_PASS) {
return {
@@ -188,15 +218,23 @@ export class CaptchaController {
throw new InternalServerErrorException('Could not decrypt captcha cookie')
}
- const {
- manuallyVerified, automaticallyVerified,
- } = this.captchaService.incrementAutomaticallyVerified(decrypted)
+ const { manuallyVerified, automaticallyVerified } =
+ this.captchaService.incrementAutomaticallyVerified(decrypted)
- const newTokenCookie = this.captchaService.getTokenCaptcha(manuallyVerified, automaticallyVerified)
+ const newTokenCookie = this.captchaService.getTokenCaptcha(
+ manuallyVerified,
+ automaticallyVerified,
+ )
this.captchaService.setTokenCookie(response, newTokenCookie)
- await this.captchaService.logCaptchaPass(pid, userAgent, headers, timestamp, false)
+ await this.captchaService.logCaptchaPass(
+ pid,
+ userAgent,
+ headers,
+ timestamp,
+ false,
+ )
return {
success: true,
@@ -208,14 +246,10 @@ export class CaptchaController {
@Post('/validate')
@HttpCode(200)
- async validateToken(
- @Body() validateDTO: ValidateDTO,
- ): Promise<any> {
+ async validateToken(@Body() validateDTO: ValidateDTO): Promise<any> {
this.logger.log({ validateDTO }, 'POST /captcha/validate')
- const {
- token, secret,
- } = validateDTO
+ const { token, secret } = validateDTO
return {
success: true,
diff --git a/src/captcha/captcha.module.ts b/src/captcha/captcha.module.ts
index 86e96d136..5178ef136 100644
--- a/src/captcha/captcha.module.ts
+++ b/src/captcha/captcha.module.ts
@@ -6,10 +6,7 @@ import { CaptchaService } from './captcha.service'
import { ProjectModule } from '../project/project.module'
@Module({
- imports: [
- AppLoggerModule,
- ProjectModule,
- ],
+ imports: [AppLoggerModule, ProjectModule],
providers: [CaptchaService],
exports: [CaptchaService],
controllers: [CaptchaController],
diff --git a/src/captcha/captcha.service.ts b/src/captcha/captcha.service.ts
index 90e69497f..f1121c1bd 100644
--- a/src/captcha/captcha.service.ts
+++ b/src/captcha/captcha.service.ts
@@ -1,6 +1,4 @@
-import {
- Injectable, BadRequestException,
-} from '@nestjs/common'
+import { Injectable, BadRequestException } from '@nestjs/common'
import { hash } from 'blake3'
import * as svgCaptcha from 'svg-captcha'
import * as CryptoJS from 'crypto-js'
@@ -14,7 +12,11 @@ import * as utc from 'dayjs/plugin/utc'
import { AppLoggerService } from '../logger/logger.service'
import {
- isDevelopment, redis, REDIS_LOG_CAPTCHA_CACHE_KEY, isValidPID, getRedisCaptchaKey,
+ isDevelopment,
+ redis,
+ REDIS_LOG_CAPTCHA_CACHE_KEY,
+ isValidPID,
+ getRedisCaptchaKey,
} from '../common/constants'
import { getElValue } from '../analytics/analytics.controller'
import { ProjectService } from 'src/project/project.service'
@@ -22,7 +24,9 @@ import { GeneratedCaptcha } from './interfaces/generated-captcha'
import { TokenCaptcha } from './interfaces/token-captcha'
import {
- CAPTCHA_SALT, CAPTCHA_ENCRYPTION_KEY, CAPTCHA_COOKIE_KEY,
+ CAPTCHA_SALT,
+ CAPTCHA_ENCRYPTION_KEY,
+ CAPTCHA_COOKIE_KEY,
CAPTCHA_TOKEN_LIFETIME,
} from '../common/constants'
@@ -83,7 +87,7 @@ const captchaDTO = (
os: string,
cc: string,
isManual: boolean,
- timestamp: number
+ timestamp: number,
): Array<string | number> => {
return [
pid,
@@ -101,12 +105,12 @@ export class CaptchaService {
constructor(
private readonly logger: AppLoggerService,
private readonly projectService: ProjectService,
- ) { }
+ ) {}
// checks if captcha is enabled for pid
async _isCaptchaEnabledForPID(pid: string): Promise<boolean> {
const project = await this.projectService.getRedisProject(pid)
-
+
if (!project) {
return false
}
@@ -127,18 +131,23 @@ export class CaptchaService {
}
if (!(await this._isCaptchaEnabledForPID(pid))) {
- throw new BadRequestException(
- 'CAPTCHA is not enabled for this Project',
- )
+ throw new BadRequestException('CAPTCHA is not enabled for this Project')
}
}
- async logCaptchaPass(pid: string, userAgent: string, headers: any, timestamp: number, isManual: boolean): Promise<void> {
+ async logCaptchaPass(
+ pid: string,
+ userAgent: string,
+ headers: any,
+ timestamp: number,
+ isManual: boolean,
+ ): Promise<void> {
const ua = UAParser(userAgent)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
const os = ua.os.name
- const cc = headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry']
+ const cc =
+ headers['cf-ipcountry'] === 'XX' ? 'NULL' : headers['cf-ipcountry']
const dto = captchaDTO(pid, dv, br, os, cc, isManual, timestamp)
@@ -152,10 +161,18 @@ export class CaptchaService {
}
async generateDummyToken() {
- return encryptString('DUMMY_TOKEN00000111112222233333444445555566666777778888899999', DUMMY_SECRETS.ALWAYS_PASS)
+ return encryptString(
+ 'DUMMY_TOKEN00000111112222233333444445555566666777778888899999',
+ DUMMY_SECRETS.ALWAYS_PASS,
+ )
}
- async generateToken(pid: string, hash: string, timestamp: number, autoVerified: boolean): Promise<string> {
+ async generateToken(
+ pid: string,
+ hash: string,
+ timestamp: number,
+ autoVerified: boolean,
+ ): Promise<string> {
if (isDummyPID(pid)) {
return this.generateDummyToken()
}
@@ -174,7 +191,10 @@ export class CaptchaService {
}
const token = {
- hash, timestamp, autoVerified, pid,
+ hash,
+ timestamp,
+ autoVerified,
+ pid,
}
return encryptString(JSON.stringify(token), secretKey)
@@ -225,10 +245,13 @@ export class CaptchaService {
}
async generateCaptcha(theme: string): Promise<GeneratedCaptcha> {
- const themeParams = theme === 'light' ? {} : {
- background: '#1f2937',
- color: true,
- }
+ const themeParams =
+ theme === 'light'
+ ? {}
+ : {
+ background: '#1f2937',
+ color: true,
+ }
const captcha = svgCaptcha.create({
size: 6,
@@ -236,9 +259,7 @@ export class CaptchaService {
noise: 2,
...themeParams,
})
- const hash = this.hashCaptcha(
- _toLower(captcha.text),
- )
+ const hash = this.hashCaptcha(_toLower(captcha.text))
return {
data: captcha.data,
@@ -264,20 +285,28 @@ export class CaptchaService {
}
}
- private async canPassWithoutVerification(tokenCaptcha: TokenCaptcha): Promise<boolean> {
+ private async canPassWithoutVerification(
+ tokenCaptcha: TokenCaptcha,
+ ): Promise<boolean> {
const { manuallyVerified, automaticallyVerified } = tokenCaptcha
// Calculate the weighted average of the manual and automatic verifications
- const weightedAverage = (MANUAL_WEIGHT * manuallyVerified + AUTO_WEIGHT * automaticallyVerified) /
+ const weightedAverage =
+ (MANUAL_WEIGHT * manuallyVerified + AUTO_WEIGHT * automaticallyVerified) /
(MANUAL_WEIGHT + AUTO_WEIGHT)
// If the weighted average is above a certain threshold, the user can pass without verification
return weightedAverage >= THRESHOLD
}
- async decryptTokenCaptcha(jwtCookie: string | undefined): Promise<TokenCaptcha> {
+ async decryptTokenCaptcha(
+ jwtCookie: string | undefined,
+ ): Promise<TokenCaptcha> {
try {
- const decryptedtokenCaptcha = decryptString(jwtCookie, CAPTCHA_ENCRYPTION_KEY)
+ const decryptedtokenCaptcha = decryptString(
+ jwtCookie,
+ CAPTCHA_ENCRYPTION_KEY,
+ )
// @ts-ignore
return JSON.parse(decryptedtokenCaptcha)
@@ -286,19 +315,25 @@ export class CaptchaService {
}
}
- getTokenCaptcha(manuallyVerified: number = 0, automaticallyVerified: number = 0): string {
+ getTokenCaptcha(manuallyVerified = 0, automaticallyVerified = 0): string {
const tokenCaptcha: TokenCaptcha = {
manuallyVerified,
automaticallyVerified,
}
// @ts-ignore
- const encryptedTokenCaptcha: string = encryptString(JSON.stringify(tokenCaptcha), CAPTCHA_ENCRYPTION_KEY)
+ const encryptedTokenCaptcha: string = encryptString(
+ JSON.stringify(tokenCaptcha),
+ CAPTCHA_ENCRYPTION_KEY,
+ )
return encryptedTokenCaptcha
}
- async autoVerifiable(pid: string, tokenCookie: string | undefined): Promise<boolean> {
+ async autoVerifiable(
+ pid: string,
+ tokenCookie: string | undefined,
+ ): Promise<boolean> {
if (pid === DUMMY_PIDS.AUTO_PASS) {
return true
}
@@ -307,7 +342,9 @@ export class CaptchaService {
throw new Error('No JWT captcha cookie')
}
- const tokenCaptcha: TokenCaptcha = await this.decryptTokenCaptcha(tokenCookie)
+ const tokenCaptcha: TokenCaptcha = await this.decryptTokenCaptcha(
+ tokenCookie,
+ )
return this.canPassWithoutVerification(tokenCaptcha)
}
diff --git a/src/common/constants.ts b/src/common/constants.ts
index e539332ac..cdb6c499e 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -151,9 +151,7 @@ const SELFHOSTED_PASSWORD = process.env.PASSWORD
const UUIDV5_NAMESPACE = '912c64c1-73fd-42b6-859f-785f839a9f68'
const DEFAULT_SELFHOSTED_UUID = 'deadbeef-dead-beef-dead-beefdeadbeef'
-const SELFHOSTED_UUID = isSelfhosted
- ? getSelfhostedUUID()
- : ''
+const SELFHOSTED_UUID = isSelfhosted ? getSelfhostedUUID() : ''
const TWO_FACTOR_AUTHENTICATION_APP_NAME =
process.env.TWO_FACTOR_AUTHENTICATION_APP_NAME
diff --git a/src/common/utils.ts b/src/common/utils.ts
index a51b337ab..f78fa53f6 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -17,7 +17,11 @@ import * as utc from 'dayjs/plugin/utc'
import * as _map from 'lodash/map'
import {
- clickhouse, redis, DEFAULT_SELFHOSTED_UUID, SELFHOSTED_EMAIL, UUIDV5_NAMESPACE,
+ clickhouse,
+ redis,
+ DEFAULT_SELFHOSTED_UUID,
+ SELFHOSTED_EMAIL,
+ UUIDV5_NAMESPACE,
} from './constants'
import { Project } from '../project/entity/project.entity'
@@ -204,7 +208,8 @@ const generateRecoveryCode = () =>
const millisecondsToSeconds = (milliseconds: number) => milliseconds / 1000
-const generateRandomString = (length: number): string => randomstring.generate(length)
+const generateRandomString = (length: number): string =>
+ randomstring.generate(length)
const getSelfhostedUUID = (): string => {
try {
diff --git a/src/mailer/letter.ts b/src/mailer/letter.ts
index 11aa01c9a..343bfcf96 100644
--- a/src/mailer/letter.ts
+++ b/src/mailer/letter.ts
@@ -1,17 +1,17 @@
-export enum LetterTemplate {
- SignUp = 'customer_sign-up',
- ConfirmPasswordChange = 'password-change_confirmation',
- PasswordChanged = 'password-change_information',
- MailAddressChangeConfirmation = 'mailaddress-change_confirmation',
- MailAddressHadChanged = 'mailaddress-change_information',
- PasswordChangeRequest = 'password-change_request',
- GDPRDataExport = 'gdpr_data_export',
- ProjectReport = 'project-report',
- TierWarning = 'tier-warning',
- ProjectInvitation = 'customer_project-invitation',
- TwoFAOn = '2fa-turned-on',
- TwoFAOff = '2fa-turned-off',
- TrialExpired = 'trial-expired',
- TrialEndsTomorrow = 'trial-ends-tomorrow',
- ProjectSubscriberInvitation = 'project-subscriber-invitation',
-}
+export enum LetterTemplate {
+ SignUp = 'customer_sign-up',
+ ConfirmPasswordChange = 'password-change_confirmation',
+ PasswordChanged = 'password-change_information',
+ MailAddressChangeConfirmation = 'mailaddress-change_confirmation',
+ MailAddressHadChanged = 'mailaddress-change_information',
+ PasswordChangeRequest = 'password-change_request',
+ GDPRDataExport = 'gdpr_data_export',
+ ProjectReport = 'project-report',
+ TierWarning = 'tier-warning',
+ ProjectInvitation = 'customer_project-invitation',
+ TwoFAOn = '2fa-turned-on',
+ TwoFAOff = '2fa-turned-off',
+ TrialExpired = 'trial-expired',
+ TrialEndsTomorrow = 'trial-ends-tomorrow',
+ ProjectSubscriberInvitation = 'project-subscriber-invitation',
+}
diff --git a/src/mailer/mailer.service.spec.ts b/src/mailer/mailer.service.spec.ts
index 59e315408..d51e58818 100644
--- a/src/mailer/mailer.service.spec.ts
+++ b/src/mailer/mailer.service.spec.ts
@@ -6,7 +6,7 @@ import { MailerService } from './mailer.service'
describe('MailerService', () => {
let service: MailerService
- let util = new Util()
+ const util = new Util()
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [MailerService, AppLoggerService],
@@ -20,8 +20,8 @@ describe('MailerService', () => {
expect(service).toBeDefined()
})
it('should be sendEmail function not null', () => {
- let email = util.getString()
- let template = util.getLetterTemplate()
+ const email = util.getString()
+ const template = util.getLetterTemplate()
const spy = jest.spyOn(service, 'sendEmail')
const isSandingEmail = service.sendEmail(email, template)
expect(spy).toHaveBeenCalled()
diff --git a/src/mailer/mailer.service.ts b/src/mailer/mailer.service.ts
index f2dd273fb..e43388442 100644
--- a/src/mailer/mailer.service.ts
+++ b/src/mailer/mailer.service.ts
@@ -1,149 +1,149 @@
-import { Injectable } from '@nestjs/common'
-import * as postmark from 'postmark'
-import handlebars from 'handlebars'
-import { LetterTemplate } from './letter'
-import fs = require('fs')
-import path = require('path')
-import { AppLoggerService } from '../logger/logger.service'
-import { SEND_WARNING_AT_PERC } from '../common/constants'
-
-const TEMPLATES_PATH = path.join(__dirname, '..', 'common', 'templates')
-const metaInfoJson = {
- [LetterTemplate.SignUp]: {
- subject: {
- en: () => 'Please verify your account registration',
- },
- },
- [LetterTemplate.ConfirmPasswordChange]: {
- subject: {
- en: () => 'Please confirm the password change',
- },
- },
- [LetterTemplate.MailAddressChangeConfirmation]: {
- subject: {
- en: () => 'Please confirm the new e-mail address',
- },
- },
- [LetterTemplate.MailAddressHadChanged]: {
- subject: {
- en: () => 'A new e-mail-address has been saved',
- },
- },
- [LetterTemplate.PasswordChangeRequest]: {
- subject: {
- en: () => 'Changing your password',
- },
- },
- [LetterTemplate.PasswordChanged]: {
- subject: {
- en: () => 'Your password was successfully changed',
- },
- },
- [LetterTemplate.GDPRDataExport]: {
- subject: {
- en: () => 'Swetrix Account data export',
- },
- },
- [LetterTemplate.ProjectReport]: {
- subject: {
- en: (p: Params) =>
- `${p.type === 'w' ? 'Weekly' : 'Monthly'} Report: ${p.date}`,
- },
- },
- [LetterTemplate.TierWarning]: {
- subject: {
- en: () =>
- `You have used more than ${SEND_WARNING_AT_PERC}% of the available events per your tier for this month.`,
- },
- },
- [LetterTemplate.ProjectInvitation]: {
- subject: {
- en: () => 'You have been invited to join the project.',
- },
- },
- [LetterTemplate.TwoFAOn]: {
- subject: {
- en: () => '2FA has been enabled on your Swetrix account',
- },
- },
- [LetterTemplate.TwoFAOff]: {
- subject: {
- en: () => '2FA has been disabled on your Swetrix account',
- },
- },
- [LetterTemplate.TrialExpired]: {
- subject: {
- en: () => 'Your free Swetrix trial has ended',
- },
- },
- [LetterTemplate.TrialEndsTomorrow]: {
- subject: {
- en: () => 'Your free Swetrix trial ends tomorrow',
- },
- },
- [LetterTemplate.ProjectSubscriberInvitation]: {
- subject: {
- en: () => 'You have been invited to join the project.',
- },
- },
-}
-
-interface Params {
- [name: string]: any
-}
-
-handlebars.registerHelper('ifEquals', function (arg1, arg2, options) {
- return arg1 == arg2 ? options.fn(this) : options.inverse(this)
-})
-
-handlebars.registerHelper('greater', function (v1, v2, options) {
- if (v1 > v2) {
- return options.fn(this)
- }
- return options.inverse(this)
-})
-
-const mailClient = new postmark.ServerClient(process.env.SMTP_PASSWORD)
-
-@Injectable()
-export class MailerService {
- constructor(private readonly logger: AppLoggerService) {}
-
- async sendEmail(
- email: string,
- templateName: LetterTemplate,
- params: Params = null,
- messageStream: 'broadcast' | 'outbound' = 'outbound',
- ): Promise<void> {
- try {
- const templatePath = `${TEMPLATES_PATH}/en/${templateName}.html`
- const letter = fs.readFileSync(templatePath, { encoding: 'utf-8' })
- const subject = metaInfoJson[templateName].subject.en(params)
- const template = handlebars.compile(letter)
- const htmlToSend = template(params)
-
- const message = {
- From: process.env.FROM_EMAIL,
- To: email,
- Subject: subject,
- HtmlBody: htmlToSend,
- MessageStream: messageStream,
- }
-
- if (process.env.SMTP_MOCK) {
- this.logger.log(
- {
- ...message,
- params,
- },
- 'sendEmail',
- true,
- )
- } else {
- await mailClient.sendEmail(message)
- }
- } catch (error) {
- console.error(`[ERROR][MAILER] ${error}`)
- }
- }
-}
+import { Injectable } from '@nestjs/common'
+import * as postmark from 'postmark'
+import handlebars from 'handlebars'
+import { LetterTemplate } from './letter'
+import fs = require('fs')
+import path = require('path')
+import { AppLoggerService } from '../logger/logger.service'
+import { SEND_WARNING_AT_PERC } from '../common/constants'
+
+const TEMPLATES_PATH = path.join(__dirname, '..', 'common', 'templates')
+const metaInfoJson = {
+ [LetterTemplate.SignUp]: {
+ subject: {
+ en: () => 'Please verify your account registration',
+ },
+ },
+ [LetterTemplate.ConfirmPasswordChange]: {
+ subject: {
+ en: () => 'Please confirm the password change',
+ },
+ },
+ [LetterTemplate.MailAddressChangeConfirmation]: {
+ subject: {
+ en: () => 'Please confirm the new e-mail address',
+ },
+ },
+ [LetterTemplate.MailAddressHadChanged]: {
+ subject: {
+ en: () => 'A new e-mail-address has been saved',
+ },
+ },
+ [LetterTemplate.PasswordChangeRequest]: {
+ subject: {
+ en: () => 'Changing your password',
+ },
+ },
+ [LetterTemplate.PasswordChanged]: {
+ subject: {
+ en: () => 'Your password was successfully changed',
+ },
+ },
+ [LetterTemplate.GDPRDataExport]: {
+ subject: {
+ en: () => 'Swetrix Account data export',
+ },
+ },
+ [LetterTemplate.ProjectReport]: {
+ subject: {
+ en: (p: Params) =>
+ `${p.type === 'w' ? 'Weekly' : 'Monthly'} Report: ${p.date}`,
+ },
+ },
+ [LetterTemplate.TierWarning]: {
+ subject: {
+ en: () =>
+ `You have used more than ${SEND_WARNING_AT_PERC}% of the available events per your tier for this month.`,
+ },
+ },
+ [LetterTemplate.ProjectInvitation]: {
+ subject: {
+ en: () => 'You have been invited to join the project.',
+ },
+ },
+ [LetterTemplate.TwoFAOn]: {
+ subject: {
+ en: () => '2FA has been enabled on your Swetrix account',
+ },
+ },
+ [LetterTemplate.TwoFAOff]: {
+ subject: {
+ en: () => '2FA has been disabled on your Swetrix account',
+ },
+ },
+ [LetterTemplate.TrialExpired]: {
+ subject: {
+ en: () => 'Your free Swetrix trial has ended',
+ },
+ },
+ [LetterTemplate.TrialEndsTomorrow]: {
+ subject: {
+ en: () => 'Your free Swetrix trial ends tomorrow',
+ },
+ },
+ [LetterTemplate.ProjectSubscriberInvitation]: {
+ subject: {
+ en: () => 'You have been invited to join the project.',
+ },
+ },
+}
+
+interface Params {
+ [name: string]: any
+}
+
+handlebars.registerHelper('ifEquals', function (arg1, arg2, options) {
+ return arg1 == arg2 ? options.fn(this) : options.inverse(this)
+})
+
+handlebars.registerHelper('greater', function (v1, v2, options) {
+ if (v1 > v2) {
+ return options.fn(this)
+ }
+ return options.inverse(this)
+})
+
+const mailClient = new postmark.ServerClient(process.env.SMTP_PASSWORD)
+
+@Injectable()
+export class MailerService {
+ constructor(private readonly logger: AppLoggerService) {}
+
+ async sendEmail(
+ email: string,
+ templateName: LetterTemplate,
+ params: Params = null,
+ messageStream: 'broadcast' | 'outbound' = 'outbound',
+ ): Promise<void> {
+ try {
+ const templatePath = `${TEMPLATES_PATH}/en/${templateName}.html`
+ const letter = fs.readFileSync(templatePath, { encoding: 'utf-8' })
+ const subject = metaInfoJson[templateName].subject.en(params)
+ const template = handlebars.compile(letter)
+ const htmlToSend = template(params)
+
+ const message = {
+ From: process.env.FROM_EMAIL,
+ To: email,
+ Subject: subject,
+ HtmlBody: htmlToSend,
+ MessageStream: messageStream,
+ }
+
+ if (process.env.SMTP_MOCK) {
+ this.logger.log(
+ {
+ ...message,
+ params,
+ },
+ 'sendEmail',
+ true,
+ )
+ } else {
+ await mailClient.sendEmail(message)
+ }
+ } catch (error) {
+ console.error(`[ERROR][MAILER] ${error}`)
+ }
+ }
+}
diff --git a/src/marketplace/cdn/cdn.service.ts b/src/marketplace/cdn/cdn.service.ts
index 7dbfe5707..2c25f47af 100644
--- a/src/marketplace/cdn/cdn.service.ts
+++ b/src/marketplace/cdn/cdn.service.ts
@@ -36,7 +36,9 @@ export class CdnService {
return data
} catch (error) {
console.error(error)
- throw new InternalServerErrorException('Failed to upload extension to the CDN.')
+ throw new InternalServerErrorException(
+ 'Failed to upload extension to the CDN.',
+ )
}
}
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index 0cea7ef24..2b949f628 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -84,18 +84,29 @@ export class ExtensionsController {
this.logger.debug({ queries })
if (!userId) {
- throw new ForbiddenException('You must be logged in to access this route.')
+ throw new ForbiddenException(
+ 'You must be logged in to access this route.',
+ )
}
- const [extensionsToUser, count] = await this.extensionsService.findAndCountExtensionToUser({
+ const [extensionsToUser, count] =
+ await this.extensionsService.findAndCountExtensionToUser(
+ {
where: {
userId,
},
skip: queries.offset || 0,
take: queries.limit > 100 ? 25 : queries.limit || 25,
- }, ['extension', 'extension.owner', 'extension.category', 'extension.users'])
+ },
+ [
+ 'extension',
+ 'extension.owner',
+ 'extension.category',
+ 'extension.users',
+ ],
+ )
- let extensions = _map(extensionsToUser, (extensionToUser) => {
+ let extensions = _map(extensionsToUser, extensionToUser => {
return extensionToUser.extension
})
@@ -159,7 +170,9 @@ export class ExtensionsController {
@Auth([UserType.ADMIN])
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Get('admin')
- async getAllExtensionsAdmin(@Query() queries: GetAllExtensionsQueries): Promise<{
+ async getAllExtensionsAdmin(
+ @Query() queries: GetAllExtensionsQueries,
+ ): Promise<{
extensions: Extension[]
count: number
}> {
@@ -232,16 +245,21 @@ export class ExtensionsController {
count: number
}> {
if (!userId) {
- throw new ForbiddenException('You must be logged in to access this route.')
+ throw new ForbiddenException(
+ 'You must be logged in to access this route.',
+ )
}
- let [extensions, count] = await this.extensionsService.findAndCount({
- skip: queries.offset || 0,
- take: queries.limit > 100 ? 100 : queries.limit || 10,
+ let [extensions, count] = await this.extensionsService.findAndCount(
+ {
+ skip: queries.offset || 0,
+ take: queries.limit > 100 ? 100 : queries.limit || 10,
where: {
owner: userId,
},
- }, ['owner', 'users', 'category'], )
+ },
+ ['owner', 'users', 'category'],
+ )
extensions = _map(extensions, extension => {
extension.usersQuantity = _size(extension.users)
@@ -326,7 +344,9 @@ export class ExtensionsController {
@Roles(UserType.ADMIN)
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Get('admin/search')
- async searchExtensionAdmin(@Query() queries: SearchExtensionQueries): Promise<{
+ async searchExtensionAdmin(
+ @Query() queries: SearchExtensionQueries,
+ ): Promise<{
extensions: Extension[]
count: number
}> {
@@ -452,7 +472,9 @@ export class ExtensionsController {
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Roles(UserType.ADMIN)
@Patch(':extensionId/approve')
- async approveExtension(@Param() params: UpdateExtensionParams): Promise<Extension> {
+ async approveExtension(
+ @Param() params: UpdateExtensionParams,
+ ): Promise<Extension> {
const { extensionId } = params
const extension = await this.extensionsService.findOne({
@@ -477,7 +499,9 @@ export class ExtensionsController {
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Roles(UserType.ADMIN)
@Patch(':extensionId/reject')
- async rejectExtension(@Param() params: UpdateExtensionParams): Promise<Extension> {
+ async rejectExtension(
+ @Param() params: UpdateExtensionParams,
+ ): Promise<Extension> {
const { extensionId } = params
const extension = await this.extensionsService.findOne({
@@ -520,7 +544,9 @@ export class ExtensionsController {
): Promise<any> {
this.logger.debug({ params, body })
if (!userId) {
- throw new ForbiddenException('You must be logged in to access this route.')
+ throw new ForbiddenException(
+ 'You must be logged in to access this route.',
+ )
}
const extension = await this.extensionsService.findOne({
@@ -586,7 +612,9 @@ export class ExtensionsController {
): Promise<void> {
this.logger.debug({ params, body })
if (!userId) {
- throw new ForbiddenException('You must be logged in to access this route.')
+ throw new ForbiddenException(
+ 'You must be logged in to access this route.',
+ )
}
const extension = await this.extensionsService.findOne({
diff --git a/src/project/dto/project.dto.ts b/src/project/dto/project.dto.ts
index 27f740365..38f36e056 100644
--- a/src/project/dto/project.dto.ts
+++ b/src/project/dto/project.dto.ts
@@ -49,7 +49,8 @@ export class ProjectDTO {
@ApiProperty({
required: false,
- description: 'When true, created a new Captcha Project without Analytics Projects.'
+ description:
+ 'When true, created a new Captcha Project without Analytics Projects.',
})
isCaptcha: boolean
}
diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.ts
index ca867cb39..6838d71b1 100644
--- a/src/project/entity/project.entity.ts
+++ b/src/project/entity/project.entity.ts
@@ -49,7 +49,7 @@ export class Project {
default: false,
})
public: boolean
-
+
// Swetrix CAPTCHA related stuff
@ApiProperty()
@Column('boolean', { default: true })
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 801fc756f..3f92900cd 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -26,7 +26,11 @@ import * as _includes from 'lodash/includes'
import * as _omit from 'lodash/omit'
import * as _filter from 'lodash/filter'
-import { ProjectService, processProjectUser, deleteProjectRedis } from './project.service'
+import {
+ ProjectService,
+ processProjectUser,
+ deleteProjectRedis,
+} from './project.service'
import { UserType, ACCOUNT_PLANS, PlanCode } from '../user/entities/user.entity'
import { ActionTokenType } from '../action-tokens/action-token.entity'
import { ActionTokensService } from '../action-tokens/action-tokens.service'
@@ -93,7 +97,7 @@ export class ProjectController {
private readonly logger: AppLoggerService,
private readonly actionTokensService: ActionTokensService,
private readonly mailerService: MailerService,
- ) { }
+ ) {}
@Get('/')
@ApiQuery({ name: 'take', required: false })
@@ -361,13 +365,27 @@ export class ProjectController {
}
if (projectDTO.isCaptcha) {
- if (_size(_filter(user.projects, (project: Project) => project.isCaptchaProject) >= (maxProjects || PROJECTS_MAXIMUM))) {
+ if (
+ _size(
+ _filter(
+ user.projects,
+ (project: Project) => project.isCaptchaProject,
+ ) >= (maxProjects || PROJECTS_MAXIMUM),
+ )
+ ) {
throw new ForbiddenException(
`You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,
)
}
} else {
- if (_size(_filter(user.projects, (project: Project) => project.isAnalyticsProject) >= (maxProjects || PROJECTS_MAXIMUM))) {
+ if (
+ _size(
+ _filter(
+ user.projects,
+ (project: Project) => project.isAnalyticsProject,
+ ) >= (maxProjects || PROJECTS_MAXIMUM),
+ )
+ ) {
throw new ForbiddenException(
`You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,
)
@@ -387,7 +405,9 @@ export class ProjectController {
project.isCaptchaProject = true
project.isAnalyticsProject = false
project.isCaptchaEnabled = true
- project.captchaSecretKey = generateRandomString(CAPTCHA_SECRET_KEY_LENGTH)
+ project.captchaSecretKey = generateRandomString(
+ CAPTCHA_SECRET_KEY_LENGTH,
+ )
}
const newProject = await this.projectService.create(project)
@@ -568,7 +588,10 @@ export class ProjectController {
project.public = projectDTO.public
if (project.isAnalyticsProject && projectDTO.isCaptcha) {
- const captchaProjects = _filter(user.projects, (project: Project) => project.isCaptchaProject)
+ const captchaProjects = _filter(
+ user.projects,
+ (project: Project) => project.isCaptchaProject,
+ )
const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects
console.log('asd')
@@ -913,7 +936,9 @@ export class ProjectController {
ActionTokenType.PROJECT_SHARE,
share.id,
)
- const url = `${isDevelopment ? headers.origin : PRODUCTION_ORIGIN}/share/${actionToken.id}`
+ const url = `${
+ isDevelopment ? headers.origin : PRODUCTION_ORIGIN
+ }/share/${actionToken.id}`
await this.mailerService.sendEmail(
invitee.email,
LetterTemplate.ProjectInvitation,
diff --git a/src/project/project.service.spec.ts b/src/project/project.service.spec.ts
index 89a23fdeb..da195caa8 100644
--- a/src/project/project.service.spec.ts
+++ b/src/project/project.service.spec.ts
@@ -7,7 +7,7 @@ import { Util } from '../Util/Util'
describe('ProjectService', () => {
let service: ProjectService
- let util = new Util()
+ const util = new Util()
const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)
const PROJECTSHARE_REPOSITORY_TOKEN = getRepositoryToken(ProjectShare)
beforeEach(async () => {
@@ -40,7 +40,7 @@ describe('ProjectService', () => {
expect(service.allowedToView).toBeDefined()
})
it("should be defined checkIfIDUnique and don't return null", () => {
- let projectId = util.getString()
+ const projectId = util.getString()
const spy = jest.spyOn(service, 'checkIfIDUnique')
const isCheckIfIDUnique = service.checkIfIDUnique(projectId)
expect(spy).toHaveBeenCalled()
@@ -78,26 +78,26 @@ describe('ProjectService', () => {
expect(service.find).toBeDefined()
})
it('should be defined findOne ', () => {
- let params = util.getObject()
- let id = util.getString()
+ const params = util.getObject()
+ const id = util.getString()
expect(service.findOne(id, params)).not.toBeNull()
expect(service.findOne).toBeDefined()
})
it("should be defined findOneShare and don't return null", () => {
- let params = util.getObject()
- let id = util.getString()
+ const params = util.getObject()
+ const id = util.getString()
expect(service.findOneShare(id, params)).not.toBeNull()
expect(service.findOneShare).toBeDefined()
})
it("should be defined findOneWhere and don't return null", () => {
- let where = util.getRecordStringUnknown()
+ const where = util.getRecordStringUnknown()
expect(service.findOneWhere(where)).not.toBeNull()
expect(service.findOneWhere).toBeDefined()
})
it("should be defined findOneWithRelations and don't return null", () => {
- let id = util.getString()
+ const id = util.getString()
expect(service.findOneWithRelations(id)).not.toBeNull()
expect(service.findOneWithRelations).toBeDefined()
@@ -111,13 +111,13 @@ describe('ProjectService', () => {
})
it("should be defined formatFromClickhouse and don't return null", () => {
- let project = util.getObject()
+ const project = util.getObject()
expect(service.formatFromClickhouse(project)).not.toBeNull()
expect(service.formatFromClickhouse).toBeDefined()
})
it("should be defined getRedisCount and don't return null", () => {
- let uid = util.getString()
+ const uid = util.getString()
expect(service.getRedisCount(uid)).not.toBeNull()
expect(service.getRedisCount).toBeDefined()
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 020aea7fa..026f38642 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -42,9 +42,7 @@ import {
getRedisProjectKey,
redisProjectCacheTimeout,
} from '../common/constants'
-import {
- getProjectsClickhouse,
-} from '../common/utils'
+import { getProjectsClickhouse } from '../common/utils'
import { ProjectSubscriber } from './entity'
import { ActionTokensService } from 'src/action-tokens/action-tokens.service'
import { ActionTokenType } from 'src/action-tokens/action-token.entity'
@@ -134,7 +132,15 @@ export class ProjectService {
// https://stackoverflow.com/questions/59645009/how-to-return-only-some-columns-of-a-relations-with-typeorm
project = await this.findOne(pid, {
relations: ['admin'],
- select: ['origins', 'active', 'admin', 'public', 'ipBlacklist', 'captchaSecretKey', 'isCaptchaEnabled'],
+ select: [
+ 'origins',
+ 'active',
+ 'admin',
+ 'public',
+ 'ipBlacklist',
+ 'captchaSecretKey',
+ 'isCaptchaEnabled',
+ ],
})
}
if (_isEmpty(project))
@@ -220,10 +226,7 @@ export class ProjectService {
return this.projectsRepository.save(project)
}
- async update(
- id: string,
- projectDTO: ProjectDTO | Project,
- ): Promise<any> {
+ async update(id: string, projectDTO: ProjectDTO | Project): Promise<any> {
return this.projectsRepository.update(id, projectDTO)
}
@@ -315,7 +318,7 @@ export class ProjectService {
project: Project,
uid: string,
roles: Array<UserType> = [],
- message: string = 'You are not allowed to manage this project'
+ message = 'You are not allowed to manage this project',
): void {
if (
uid === project.admin?.id ||
@@ -490,8 +493,8 @@ export class ProjectService {
await this.clearProjectsRedisCache(user.id)
}
-
- async getProject(projectId: string, userId: string) {
+
+ async getProject(projectId: string, userId: string) {
return await this.projectsRepository.findOne({
where: {
id: projectId,
@@ -506,18 +509,11 @@ export class ProjectService {
}
async addSubscriber(data: AddSubscriberType) {
const subscriber = await this.projectSubscriberRepository.save({ ...data })
- await this.sendSubscriberInvite(
- data, subscriber.id,
- )
+ await this.sendSubscriberInvite(data, subscriber.id)
return subscriber
}
- async sendSubscriberInvite(
- data: AddSubscriberType,
- subscriberId: string,
- ) {
- const {
- userId, projectId, projectName, email, origin
- } = data
+ async sendSubscriberInvite(data: AddSubscriberType, subscriberId: string) {
+ const { userId, projectId, projectName, email, origin } = data
const actionToken = await this.actionTokens.createActionToken(
userId,
ActionTokenType.ADDING_PROJECT_SUBSCRIBER,
@@ -528,7 +524,8 @@ export class ProjectService {
email,
LetterTemplate.ProjectSubscriberInvitation,
{
- url, projectName,
+ url,
+ projectName,
},
)
}
diff --git a/src/project/types/add-subscriber.type.ts b/src/project/types/add-subscriber.type.ts
index 0276e73d3..f29c10fe1 100644
--- a/src/project/types/add-subscriber.type.ts
+++ b/src/project/types/add-subscriber.type.ts
@@ -1,6 +1,11 @@
-import { AddSubscriberBodyDto, AddSubscriberParamsDto, AddSubscriberMetaParamsDTO } from '../dto'
+import {
+ AddSubscriberBodyDto,
+ AddSubscriberParamsDto,
+ AddSubscriberMetaParamsDTO,
+} from '../dto'
-export type AddSubscriberType = { userId: string } & AddSubscriberParamsDto & AddSubscriberMetaParamsDTO &
+export type AddSubscriberType = { userId: string } & AddSubscriberParamsDto &
+ AddSubscriberMetaParamsDTO &
AddSubscriberBodyDto & {
origin: string
}
diff --git a/src/task-manager/task-manager.service.spec.ts b/src/task-manager/task-manager.service.spec.ts
index 8e9971be7..7cf25bd82 100644
--- a/src/task-manager/task-manager.service.spec.ts
+++ b/src/task-manager/task-manager.service.spec.ts
@@ -15,7 +15,7 @@ import { TaskManagerService } from './task-manager.service'
describe('TaskManagerService', () => {
let service: TaskManagerService
- let util = new Util()
+ const util = new Util()
const USER_REPOSITORY_TOKEN = getRepositoryToken(User)
const ACRIONTOKENS_REPOSITORY_TOKEN = getRepositoryToken(ActionToken)
const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)
diff --git a/src/task-manager/task-manager.service.ts b/src/task-manager/task-manager.service.ts
index 2eec9666e..7ed07c146 100644
--- a/src/task-manager/task-manager.service.ts
+++ b/src/task-manager/task-manager.service.ts
@@ -117,7 +117,9 @@ export class TaskManagerService {
try {
await clickhouse.query(query).toPromise()
} catch (e) {
- console.error(`[CRON WORKER] Error whilst saving CAPTCHA log data: ${e}`)
+ console.error(
+ `[CRON WORKER] Error whilst saving CAPTCHA log data: ${e}`,
+ )
}
}
diff --git a/src/twoFactorAuth/twoFactorAuth,service.spec.ts b/src/twoFactorAuth/twoFactorAuth,service.spec.ts
index fe6f844c9..6d2a598da 100644
--- a/src/twoFactorAuth/twoFactorAuth,service.spec.ts
+++ b/src/twoFactorAuth/twoFactorAuth,service.spec.ts
@@ -7,7 +7,7 @@ import { TwoFactorAuthService } from './twoFactorAuth.service'
describe('TwoFactorAuthController', () => {
let service: TwoFactorAuthService
- let util = new Util()
+ const util = new Util()
const USER_REPOSITORY_TOKEN = getRepositoryToken(User)
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
@@ -29,7 +29,7 @@ describe('TwoFactorAuthController', () => {
expect(service).toBeDefined()
})
it("should be defined generateTwoFactorAuthenticationSecret and don't return null", () => {
- let user = util.getUser()
+ const user = util.getUser()
expect(
service.generateTwoFactorAuthenticationSecret(user),
).rejects.not.toBeNull()
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
index 1ef5b67f4..3144dd51a 100644
--- a/src/user/user.controller.ts
+++ b/src/user/user.controller.ts
@@ -390,7 +390,9 @@ export class UserController {
ActionTokenType.EMAIL_VERIFICATION,
user.email,
)
- const url = `${isDevelopment ? request.headers.origin : PRODUCTION_ORIGIN}/verify/${token.id}`
+ const url = `${
+ isDevelopment ? request.headers.origin : PRODUCTION_ORIGIN
+ }/verify/${token.id}`
await this.userService.update(id, { emailRequests: 1 + user.emailRequests })
await this.mailerService.sendEmail(user.email, LetterTemplate.SignUp, {
@@ -492,7 +494,9 @@ export class UserController {
ActionTokenType.EMAIL_CHANGE,
userDTO.email,
)
- const url = `${isDevelopment ? request.headers.origin : PRODUCTION_ORIGIN}/change-email/${token.id}`
+ const url = `${
+ isDevelopment ? request.headers.origin : PRODUCTION_ORIGIN
+ }/change-email/${token.id}`
await this.mailerService.sendEmail(
user.email,
LetterTemplate.MailAddressChangeConfirmation,
diff --git a/src/user/user.service.spec.ts b/src/user/user.service.spec.ts
index ecbdb5508..140f6b34f 100644
--- a/src/user/user.service.spec.ts
+++ b/src/user/user.service.spec.ts
@@ -6,7 +6,7 @@ import { UserService } from './user.service'
describe('UserService', () => {
let service: UserService
- let util = new Util()
+ const util = new Util()
const USER_REPOSITORY_TOKEN = getRepositoryToken(User)
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
@@ -55,12 +55,12 @@ describe('UserService', () => {
expect(service.findWhereWithRelations).toBeDefined()
})
it("should be defined omitSensitiveData and don't return null", () => {
- let user = util.getUser()
+ const user = util.getUser()
expect(service.omitSensitiveData(user)).not.toBeNull()
expect(service.omitSensitiveData).toBeDefined()
})
it("should be defined paginate and don't return null", () => {
- let options = util.getPaginationOptionsInterface()
+ const options = util.getPaginationOptionsInterface()
expect(service.paginate(options)).rejects.not.toBeNull()
expect(service.paginate).toBeDefined()
})
@@ -68,20 +68,20 @@ describe('UserService', () => {
expect(service.search).toBeDefined()
})
it("should be defined update and don't return null", () => {
- let id = util.getString()
- let update = util.getRecordStringUnknown()
+ const id = util.getString()
+ const update = util.getRecordStringUnknown()
expect(service.update(id, update)).rejects.not.toBeNull()
expect(service.update).toBeDefined()
})
it("should be defined updateByEmail and don't return null", () => {
- let email = util.getString()
- let update = util.getRecordStringUnknown()
+ const email = util.getString()
+ const update = util.getRecordStringUnknown()
expect(service.updateByEmail(email, update)).rejects.not.toBeNull()
expect(service.updateByEmail).toBeDefined()
})
it("should be defined updateBySubID and don't return null", () => {
- let subId = util.getString()
- let update = util.getRecordStringUnknown()
+ const subId = util.getString()
+ const update = util.getRecordStringUnknown()
expect(service.updateBySubID(subId, update)).rejects.not.toBeNull()
expect(service.updateBySubID).toBeDefined()
})
diff --git a/src/user/user.service.ts b/src/user/user.service.ts
index 1c1772902..92375ed1e 100644
--- a/src/user/user.service.ts
+++ b/src/user/user.service.ts
@@ -1,210 +1,213 @@
-import { Injectable, BadRequestException } from '@nestjs/common'
-import { InjectRepository } from '@nestjs/typeorm'
-import { Repository } from 'typeorm'
-import * as dayjs from 'dayjs'
-import * as _isEmpty from 'lodash/isEmpty'
-import * as _size from 'lodash/size'
-import * as _omit from 'lodash/omit'
-
-import { Pagination, PaginationOptionsInterface } from '../common/pagination'
-import { User, ACCOUNT_PLANS, TRIAL_DURATION } from './entities/user.entity'
-import { UserProfileDTO } from './dto/user.dto'
-import { RefreshToken } from './entities/refresh-token.entity'
-
-@Injectable()
-export class UserService {
- constructor(
- @InjectRepository(User)
- private usersRepository: Repository<User>,
- @InjectRepository(RefreshToken)
- private readonly refreshTokenRepository: Repository<RefreshToken>,
- ) {}
-
- async create(userDTO: UserProfileDTO | User): Promise<User> {
- return await this.usersRepository.save(userDTO)
- }
-
- async paginate(
- options: PaginationOptionsInterface,
- ): Promise<Pagination<User>> {
- const [results, total] = await this.usersRepository.findAndCount({
- take: options.take || 10,
- skip: options.skip || 0,
- })
-
- return new Pagination<User>({
- results,
- total,
- })
- }
-
- async update(id: string, update: Record<string, unknown>): Promise<any> {
- return this.usersRepository.update({ id }, update)
- }
-
- async updateByEmail(
- email: string,
- update: Record<string, unknown>,
- ): Promise<any> {
- return this.usersRepository.update({ email }, update)
- }
-
- async updateBySubID(
- subID: string,
- update: Record<string, unknown>,
- ): Promise<any> {
- return this.usersRepository.update({ subID }, update)
- }
-
- async delete(id: string): Promise<any> {
- return this.usersRepository.delete(id)
- }
-
- async count(): Promise<number> {
- return await this.usersRepository.count()
- }
-
- omitSensitiveData(user: User): User {
- return _omit(user, [
- 'password',
- 'twoFactorRecoveryCode',
- 'twoFactorAuthenticationSecret',
- ])
- }
-
- findOneWhere(
- where: Record<string, unknown>,
- relations: string[] = [],
- ): Promise<User> {
- return this.usersRepository.findOne({ where, relations })
- }
-
- findOne(id: string, params: object = {}): Promise<User> {
- return this.usersRepository.findOne({
- where: { id },
- ...params,
- })
- }
-
- findOneWithRelations(id: string, relations: string[]): Promise<User> {
- return this.usersRepository.findOne(id, { relations })
- }
-
- findWhereWithRelations(
- where: Record<string, unknown>,
- relations: string[],
- ): Promise<User[]> {
- return this.usersRepository.find({
- where,
- relations,
- })
- }
-
- find(params: object): Promise<User[]> {
- return this.usersRepository.find(params)
- }
-
- findWhere(where: Record<string, unknown>): Promise<User[]> {
- return this.usersRepository.find({ where })
- }
-
- validatePassword(pass: string): void {
- const err = []
- if (_isEmpty(pass)) {
- err.push('Password cannot be empty')
- }
-
- if (_size(pass) > 50) {
- err.push('Maximum password length is 50 letters')
- }
-
- if (_size(pass) < 8) {
- err.push('at least 8 characters')
- }
-
- // if(!/[a-z]/.test(pass))
- // err.push('should contain at least one lower case')
- // if(!/[A-Z]/.test(pass))
- // err.push('should contain at least one upper case')
- // if(!(/[!@#$%^&*(),.?":{}|<>]/g.test(pass)))
- // err.push('should contain at least one symbol')
-
- if (!_isEmpty(err)) {
- throw new BadRequestException(err)
- }
- }
-
- processUser(user: User): object {
- // @ts-ignore
- const maxEventsCount = ACCOUNT_PLANS[user?.planCode]?.monthlyUsageLimit || 0
- const userData = {
- // @ts-ignore
- ...user,
- password: undefined,
- twoFactorRecoveryCode: undefined,
- twoFactorAuthenticationSecret: undefined,
- maxEventsCount,
- }
-
- return userData
- }
-
- search(query: string): Promise<User[]> {
- return this.usersRepository
- .createQueryBuilder('user')
- .select()
- .where('email like :query', { query: `%${query}%` })
- .limit(5)
- .getMany()
- }
-
- public async findUser(email: string) {
- return await this.usersRepository.findOne({ email })
- }
-
- public async createUser(user: Pick<User, 'email' | 'password'>) {
- return await this.usersRepository.save({
- ...user,
- trialEndDate: dayjs.utc().add(TRIAL_DURATION, 'day').format('YYYY-MM-DD HH:mm:ss'),
- })
- }
-
- public async findUserById(id: string) {
- return await this.usersRepository.findOne({ id })
- }
-
- public async updateUser(id: string, user: Partial<Omit<User, 'id'>>) {
- return await this.usersRepository.update({ id }, user)
- }
-
- public async saveRefreshToken(userId: string, refreshToken: string) {
- return await this.refreshTokenRepository.save({
- userId,
- refreshToken,
- })
- }
-
- public async findRefreshToken(userId: string, refreshToken: string) {
- return await this.refreshTokenRepository.findOne({
- where: {
- userId,
- refreshToken,
- },
- })
- }
-
- public async deleteRefreshToken(userId: string, refreshToken: string) {
- await this.refreshTokenRepository.delete({
- userId,
- refreshToken,
- })
- }
-
- public async findUserByApiKey(apiKey: string) {
- return await this.usersRepository.findOne({ where: { apiKey } })
- }
-
- async getUser(id: string) {
- return await this.usersRepository.findOne({ id })
- }
-}
+import { Injectable, BadRequestException } from '@nestjs/common'
+import { InjectRepository } from '@nestjs/typeorm'
+import { Repository } from 'typeorm'
+import * as dayjs from 'dayjs'
+import * as _isEmpty from 'lodash/isEmpty'
+import * as _size from 'lodash/size'
+import * as _omit from 'lodash/omit'
+
+import { Pagination, PaginationOptionsInterface } from '../common/pagination'
+import { User, ACCOUNT_PLANS, TRIAL_DURATION } from './entities/user.entity'
+import { UserProfileDTO } from './dto/user.dto'
+import { RefreshToken } from './entities/refresh-token.entity'
+
+@Injectable()
+export class UserService {
+ constructor(
+ @InjectRepository(User)
+ private usersRepository: Repository<User>,
+ @InjectRepository(RefreshToken)
+ private readonly refreshTokenRepository: Repository<RefreshToken>,
+ ) {}
+
+ async create(userDTO: UserProfileDTO | User): Promise<User> {
+ return await this.usersRepository.save(userDTO)
+ }
+
+ async paginate(
+ options: PaginationOptionsInterface,
+ ): Promise<Pagination<User>> {
+ const [results, total] = await this.usersRepository.findAndCount({
+ take: options.take || 10,
+ skip: options.skip || 0,
+ })
+
+ return new Pagination<User>({
+ results,
+ total,
+ })
+ }
+
+ async update(id: string, update: Record<string, unknown>): Promise<any> {
+ return this.usersRepository.update({ id }, update)
+ }
+
+ async updateByEmail(
+ email: string,
+ update: Record<string, unknown>,
+ ): Promise<any> {
+ return this.usersRepository.update({ email }, update)
+ }
+
+ async updateBySubID(
+ subID: string,
+ update: Record<string, unknown>,
+ ): Promise<any> {
+ return this.usersRepository.update({ subID }, update)
+ }
+
+ async delete(id: string): Promise<any> {
+ return this.usersRepository.delete(id)
+ }
+
+ async count(): Promise<number> {
+ return await this.usersRepository.count()
+ }
+
+ omitSensitiveData(user: User): User {
+ return _omit(user, [
+ 'password',
+ 'twoFactorRecoveryCode',
+ 'twoFactorAuthenticationSecret',
+ ])
+ }
+
+ findOneWhere(
+ where: Record<string, unknown>,
+ relations: string[] = [],
+ ): Promise<User> {
+ return this.usersRepository.findOne({ where, relations })
+ }
+
+ findOne(id: string, params: object = {}): Promise<User> {
+ return this.usersRepository.findOne({
+ where: { id },
+ ...params,
+ })
+ }
+
+ findOneWithRelations(id: string, relations: string[]): Promise<User> {
+ return this.usersRepository.findOne(id, { relations })
+ }
+
+ findWhereWithRelations(
+ where: Record<string, unknown>,
+ relations: string[],
+ ): Promise<User[]> {
+ return this.usersRepository.find({
+ where,
+ relations,
+ })
+ }
+
+ find(params: object): Promise<User[]> {
+ return this.usersRepository.find(params)
+ }
+
+ findWhere(where: Record<string, unknown>): Promise<User[]> {
+ return this.usersRepository.find({ where })
+ }
+
+ validatePassword(pass: string): void {
+ const err = []
+ if (_isEmpty(pass)) {
+ err.push('Password cannot be empty')
+ }
+
+ if (_size(pass) > 50) {
+ err.push('Maximum password length is 50 letters')
+ }
+
+ if (_size(pass) < 8) {
+ err.push('at least 8 characters')
+ }
+
+ // if(!/[a-z]/.test(pass))
+ // err.push('should contain at least one lower case')
+ // if(!/[A-Z]/.test(pass))
+ // err.push('should contain at least one upper case')
+ // if(!(/[!@#$%^&*(),.?":{}|<>]/g.test(pass)))
+ // err.push('should contain at least one symbol')
+
+ if (!_isEmpty(err)) {
+ throw new BadRequestException(err)
+ }
+ }
+
+ processUser(user: User): object {
+ // @ts-ignore
+ const maxEventsCount = ACCOUNT_PLANS[user?.planCode]?.monthlyUsageLimit || 0
+ const userData = {
+ // @ts-ignore
+ ...user,
+ password: undefined,
+ twoFactorRecoveryCode: undefined,
+ twoFactorAuthenticationSecret: undefined,
+ maxEventsCount,
+ }
+
+ return userData
+ }
+
+ search(query: string): Promise<User[]> {
+ return this.usersRepository
+ .createQueryBuilder('user')
+ .select()
+ .where('email like :query', { query: `%${query}%` })
+ .limit(5)
+ .getMany()
+ }
+
+ public async findUser(email: string) {
+ return await this.usersRepository.findOne({ email })
+ }
+
+ public async createUser(user: Pick<User, 'email' | 'password'>) {
+ return await this.usersRepository.save({
+ ...user,
+ trialEndDate: dayjs
+ .utc()
+ .add(TRIAL_DURATION, 'day')
+ .format('YYYY-MM-DD HH:mm:ss'),
+ })
+ }
+
+ public async findUserById(id: string) {
+ return await this.usersRepository.findOne({ id })
+ }
+
+ public async updateUser(id: string, user: Partial<Omit<User, 'id'>>) {
+ return await this.usersRepository.update({ id }, user)
+ }
+
+ public async saveRefreshToken(userId: string, refreshToken: string) {
+ return await this.refreshTokenRepository.save({
+ userId,
+ refreshToken,
+ })
+ }
+
+ public async findRefreshToken(userId: string, refreshToken: string) {
+ return await this.refreshTokenRepository.findOne({
+ where: {
+ userId,
+ refreshToken,
+ },
+ })
+ }
+
+ public async deleteRefreshToken(userId: string, refreshToken: string) {
+ await this.refreshTokenRepository.delete({
+ userId,
+ refreshToken,
+ })
+ }
+
+ public async findUserByApiKey(apiKey: string) {
+ return await this.usersRepository.findOne({ where: { apiKey } })
+ }
+
+ async getUser(id: string) {
+ return await this.usersRepository.findOne({ id })
+ }
+}
diff --git a/src/webhook/webhook.service.spec.ts b/src/webhook/webhook.service.spec.ts
index 93ca33c41..30dfd96d6 100644
--- a/src/webhook/webhook.service.spec.ts
+++ b/src/webhook/webhook.service.spec.ts
@@ -9,7 +9,7 @@ import { WebhookService } from './webhook.service'
describe('WebhookService', () => {
let service: WebhookService
- let util = new Util()
+ const util = new Util()
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({