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!

removing non-confirmed shares after 48 hours

Blue Mouse030c3f133c8d
diff --git a/src/action-tokens/action-tokens.service.ts b/src/action-tokens/action-tokens.service.ts
index 2bd815a75..cba33cbcb 100644
--- a/src/action-tokens/action-tokens.service.ts
+++ b/src/action-tokens/action-tokens.service.ts
@@ -12,6 +12,13 @@ export class ActionTokensService {
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 })
}
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 26527bce4..2bdb718b6 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -98,6 +98,13 @@ export class ProjectService {
.execute()
}
+ async deleteMultipleShare(where): Promise<any> {
+ return this.projectShareRepository.createQueryBuilder()
+ .delete()
+ .where(where)
+ .execute()
+ }
+
async createShare(share: ProjectShare): Promise<ProjectShare> {
return this.projectShareRepository.save(share)
}
diff --git a/src/task-manager/task-manager.module.ts b/src/task-manager/task-manager.module.ts
index 6432c4d8a..e5b54b383 100644
--- a/src/task-manager/task-manager.module.ts
+++ b/src/task-manager/task-manager.module.ts
@@ -4,12 +4,14 @@ import { MailerModule } from '../mailer/mailer.module'
import { UserModule } from '../user/user.module'
import { ProjectModule } from '../project/project.module'
import { AnalyticsModule } from '../analytics/analytics.module'
+import { ActionTokensModule } from 'src/action-tokens/action-tokens.module'
@Module({
imports: [
ProjectModule,
MailerModule,
UserModule,
+ ActionTokensModule,
forwardRef(() => AnalyticsModule),
],
providers: [TaskManagerService],
diff --git a/src/task-manager/task-manager.service.ts b/src/task-manager/task-manager.service.ts
index eacdcbdec..9487a03ee 100644
--- a/src/task-manager/task-manager.service.ts
+++ b/src/task-manager/task-manager.service.ts
@@ -13,12 +13,14 @@ import * as _map from 'lodash/map'
import { MailerService } from '../mailer/mailer.service'
import { UserService } from '../user/user.service'
import { ProjectService } from '../project/project.service'
+import { ActionTokensService } from 'src/action-tokens/action-tokens.service'
+import { ActionTokenType } from 'src/action-tokens/action-token.entity'
import { LetterTemplate } from '../mailer/letter'
import { AnalyticsService } from '../analytics/analytics.service'
import { ReportFrequency, ACCOUNT_PLANS } from '../user/entities/user.entity'
import {
clickhouse, redis, REDIS_LOG_DATA_CACHE_KEY, REDIS_LOG_CUSTOM_CACHE_KEY, isSelfhosted, REDIS_SESSION_SALT_KEY,
- REDIS_USERS_COUNT_KEY, REDIS_PROJECTS_COUNT_KEY, REDIS_PAGEVIEWS_COUNT_KEY, SEND_WARNING_AT_PERC,
+ REDIS_USERS_COUNT_KEY, REDIS_PROJECTS_COUNT_KEY, REDIS_PAGEVIEWS_COUNT_KEY, SEND_WARNING_AT_PERC, PROJECT_INVITE_EXPIRE,
} from '../common/constants'
import { getRandomTip } from '../common/utils'
@@ -31,6 +33,7 @@ export class TaskManagerService {
private readonly userService: UserService,
private readonly analyticsService: AnalyticsService,
private readonly projectService: ProjectService,
+ private readonly actionTokensService: ActionTokensService,
) { }
@Cron(CronExpression.EVERY_MINUTE)
@@ -101,6 +104,13 @@ export class TaskManagerService {
}
}
+ @Cron(CronExpression.EVERY_2_HOURS)
+ async deleteOldShareInvitations(): Promise<void> {
+ const minDate = dayjs.utc().subtract(PROJECT_INVITE_EXPIRE, 'h').format('YYYY-MM-DD HH:mm:ss')
+ await this.actionTokensService.deleteMultiple(`action="${ActionTokenType.PROJECT_SHARE}" AND created<"${minDate}"`)
+ await this.projectService.deleteMultipleShare(`confirmed=0 AND created<"${minDate}"`)
+ }
+
@Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT)
async generateSessionSalt(): Promise<void> {
const salt = await bcrypt.genSalt(10)