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!

remove some selfhosted artefacts

Blue Mouse6bb06ce20f92
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index b15749f9a..752ad5640 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -33,11 +33,6 @@ import {
} from 'src/user/entities/user.entity'
import { UserService } from 'src/user/user.service'
import { ProjectService } from 'src/project/project.service'
-import {
- saveRefreshTokenClickhouse,
- findRefreshTokenClickhouse,
- deleteRefreshTokenClickhouse,
-} from 'src/common/utils'
import {
REDIS_SSO_UUID,
redis,
diff --git a/src/common/utils.ts b/src/common/utils.ts
index fde87bfed..e7ba78fcd 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -1,30 +1,14 @@
-import { NotFoundException, HttpException } from '@nestjs/common'
+import { HttpException } from '@nestjs/common'
import { hash } from 'blake3'
-import { v5 as uuidv5 } from 'uuid'
import * as randomstring from 'randomstring'
import * as _sample from 'lodash/sample'
-import * as _join from 'lodash/join'
-import * as _filter from 'lodash/filter'
-import * as _values from 'lodash/values'
-import * as _reduce from 'lodash/reduce'
-import * as _keys from 'lodash/keys'
import * as _toNumber from 'lodash/toNumber'
-import * as _isEmpty from 'lodash/isEmpty'
-import * as _head from 'lodash/head'
import * as _round from 'lodash/round'
-import * as dayjs from 'dayjs'
-import * as utc from 'dayjs/plugin/utc'
-import * as _map from 'lodash/map'
import {
- clickhouse,
redis,
- UUIDV5_NAMESPACE,
isDevelopment,
} from './constants'
-import { Project } from '../project/entity/project.entity'
-
-dayjs.extend(utc)
const marketingTips = {
en: [
@@ -51,14 +35,6 @@ const marketingTips = {
const RATE_LIMIT_REQUESTS_AMOUNT = 3
const RATE_LIMIT_TIMEOUT = 86400 // 24 hours
-const allowedToUpdateKeys = [
- 'name',
- 'origins',
- 'ipBlacklist',
- 'active',
- 'public',
-]
-
const getRateLimitHash = (ipOrApiKey: string, salt = '') =>
`rl:${hash(`${ipOrApiKey}${salt}`).toString('hex')}`
@@ -101,48 +77,6 @@ export const checkRateLimitForApiKey = async (
return true
}
-const getProjectsClickhouse = async (id = null) => {
- if (!id) {
- const query = 'SELECT * FROM project;'
- return clickhouse.query(query).toPromise()
- }
-
- const paramsData = {
- params: {
- id,
- },
- }
-
- const query = `SELECT * FROM project WHERE id = {id:FixedString(12)};`
- const project = await clickhouse.query(query, paramsData).toPromise()
-
- if (_isEmpty(project)) {
- throw new NotFoundException(`Project ${id} was not found in the database`)
- }
-
- return _head(project)
-}
-
-const updateProjectClickhouse = async (project: object) => {
- const filtered = _reduce(
- _filter(_keys(project), key => allowedToUpdateKeys.includes(key)),
- (obj, key) => {
- obj[key] = project[key]
- return obj
- },
- {},
- )
- const columns = _keys(filtered)
- const values = _values(filtered)
- // @ts-ignore
- const query = `ALTER table project UPDATE ${_join(
- _map(columns, (col, id) => `${col}='${values[id]}'`),
- ', ',
- // @ts-ignore
- )} WHERE id='${project.id}'`
- return clickhouse.query(query).toPromise()
-}
-
/**
* Checking the % change in one number relative to the other
* @param oldVal The initial value
@@ -165,68 +99,6 @@ const calculateRelativePercentage = (
return _round((1 - newVal / oldVal) * -100, round)
}
-const deleteProjectClickhouse = async id => {
- const query = `ALTER table project DELETE WHERE id='${id}'`
- return clickhouse.query(query).toPromise()
-}
-
-const createProjectClickhouse = async (project: Project) => {
- const paramsData = {
- params: {
- ...project,
- },
- }
- const query = `INSERT INTO project (*) VALUES ({id:FixedString(12)},{name:String},'', '',1,0,'${dayjs
- .utc()
- .format('YYYY-MM-DD HH:mm:ss')}')`
- return clickhouse.query(query, paramsData).toPromise()
-}
-
-const saveRefreshTokenClickhouse = async (
- userId: string,
- refreshToken: string,
-) => {
- const paramsData = {
- params: {
- userId,
- refreshToken,
- },
- }
- const query =
- 'INSERT INTO refresh_token (*) VALUES ({userId:String},{refreshToken:String})'
-
- return clickhouse.query(query, paramsData).toPromise()
-}
-
-const findRefreshTokenClickhouse = async (
- userId: string,
- refreshToken: string,
-) => {
- const paramsData = {
- params: {
- userId,
- refreshToken,
- },
- }
- const query =
- 'SELECT * FROM refresh_token WHERE userId = {userId:String} AND refreshToken = {refreshToken:String}'
- return clickhouse.query(query, paramsData).toPromise()
-}
-
-const deleteRefreshTokenClickhouse = async (
- userId: string,
- refreshToken: string,
-) => {
- const paramsData = {
- params: {
- userId,
- refreshToken,
- },
- }
- const query = `ALTER table refresh_token DELETE WHERE userId = {userId:String} AND refreshToken = {refreshToken:String}`
- return clickhouse.query(query, paramsData).toPromise()
-}
-
const generateRecoveryCode = () =>
randomstring.generate({
length: 30,
@@ -242,15 +114,8 @@ const generateRandomString = (length: number): string =>
export {
getRandomTip,
checkRateLimit,
- createProjectClickhouse,
- getProjectsClickhouse,
- updateProjectClickhouse,
- deleteProjectClickhouse,
generateRecoveryCode,
calculateRelativePercentage,
millisecondsToSeconds,
generateRandomString,
- saveRefreshTokenClickhouse,
- findRefreshTokenClickhouse,
- deleteRefreshTokenClickhouse,
}
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 86bb1a3ab..77a4c596b 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -62,10 +62,6 @@ import {
PRODUCTION_ORIGIN,
} from '../common/constants'
import {
- getProjectsClickhouse,
- createProjectClickhouse,
- updateProjectClickhouse,
- deleteProjectClickhouse,
generateRandomString,
} from '../common/utils'
import {
diff --git a/src/project/project.service.spec.ts b/src/project/project.service.spec.ts
index da195caa8..2db3808bf 100644
--- a/src/project/project.service.spec.ts
+++ b/src/project/project.service.spec.ts
@@ -48,9 +48,6 @@ describe('ProjectService', () => {
spy.mockRestore()
expect(service.checkIfIDUnique).toBeDefined()
})
- it('should be defined checkIfIDUniqueClickhouse ', () => {
- expect(service.checkIfIDUniqueClickhouse).toBeDefined()
- })
it('should be defined count ', () => {
expect(service.count()).rejects.not.toBeNull()
expect(service.count).toBeDefined()
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 7a479bd18..42645c94e 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -48,7 +48,6 @@ import {
isDevelopment,
PRODUCTION_ORIGIN,
} from '../common/constants'
-import { getProjectsClickhouse } from '../common/utils'
import { ProjectSubscriber } from './entity'
import { AddSubscriberType } from './types'
import { GetSubscribersQueriesDto, UpdateSubscriberBodyDto } from './dto'
@@ -340,12 +339,6 @@ export class ProjectService {
}
}
- checkIfIDUniqueClickhouse(projects: Array<object>, projectID: string): void {
- if (_find(projects, ({ id }) => id === projectID)) {
- throw new BadRequestException('Selected project ID is already in use')
- }
- }
-
async removeDataFromClickhouse(
pid: string,
from: string,
@@ -372,42 +365,6 @@ export class ProjectService {
])
}
- formatToClickhouse(project: any): object {
- const updProject = { ...project }
- updProject.active = Number(updProject.active)
- updProject.public = Number(updProject.public)
-
- if (!_isNull(updProject.origins)) {
- updProject.origins = _isString(updProject.origins)
- ? updProject.origins
- : _join(updProject.origins, ',')
- }
-
- if (!_isNull(updProject.ipBlacklist)) {
- updProject.ipBlacklist = _isString(updProject.ipBlacklist)
- ? updProject.ipBlacklist
- : _join(updProject.ipBlacklist, ',')
- }
-
- return updProject
- }
-
- formatFromClickhouse(project: any): Project {
- const updProject = { ...project }
- updProject.active = Boolean(updProject.active)
- updProject.public = Boolean(updProject.public)
-
- updProject.origins = _isNull(updProject.origins)
- ? []
- : _split(updProject.origins, ',')
-
- updProject.ipBlacklist = _isNull(updProject.ipBlacklist)
- ? []
- : _split(updProject.ipBlacklist, ',')
-
- return updProject
- }
-
validateProject(projectDTO: ProjectDTO) {
if (!isValidPID(projectDTO.id))
throw new UnprocessableEntityException(