📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
updated gdpr template
Blue Mouse2c42bb76b653
diff --git a/src/common/templates/en/gdpr_data_export.html b/src/common/templates/en/gdpr_data_export.htmlindex b72b0fbc1..6ed6f8f57 100644--- a/src/common/templates/en/gdpr_data_export.html+++ b/src/common/templates/en/gdpr_data_export.html@@ -79,6 +79,7 @@<div style="height: 5px; line-height: 5px; font-size: 3px;"> </div><h3 style="margin-bottom: 5px;">Account Information:</h3>+ <b>Account ID:</b> {{user.id}}<br /><b>Email address:</b> {{user.email}}<br /><b>Email confirmed:</b> {{#if user.isActive}} Yes {{else}} No {{/if}}<br /><b>Verification emails sent:</b> {{user.emailRequests}}<br />@@ -94,7 +95,11 @@<b>Next billing date:</b> {{#if user.nextBillDate}}{{user.nextBillDate}}{{else}}-{{/if}}<br /><b>Paddle: Subscription ID:</b> {{user.subID}}<br /><b>Paddle: Update subscription URL:</b> {{user.subUpdateURL}}<br />- <b>Paddle: Cancel subscription URL:</b> {{user.subCancelURL}}+ <b>Paddle: Cancel subscription URL:</b> {{user.subCancelURL}}<br />+ <b>Is Telegram Chat ID confirmed:</b> {{#if user.isTelegramChatIdConfirmed}} Yes {{else}} No {{/if}}<br />+ <b>Telegram Chat ID</b> {{user.telegramChatId}}<br />+ <b>Theme</b> {{user.theme}}<br />+ <b>Nickname</b> {{user.nickname}}<br /><div style="height: 10px; line-height: 10px; font-size: 8px;"> </div><h3 style="margin-bottom: 5px;">Projects Information:</h3>@@ -105,7 +110,24 @@<b>Public:</b> {{#if public}} Yes {{else}} No {{/if}}<br /><b>Allowed origins:</b> {{#if origins}}{{origins}}{{else}}*{{/if}}<br /><b>Blacklisted IPs:</b> {{#if ipBlacklist}}{{ipBlacklist}}{{else}}-{{/if}}<br />- <b>Created at:</b> {{created}}<br /><br />+ <b>Created at:</b> {{created}}<br />+ <b>Automated alerts:</b> + {{#each alerts}}+ <br />+ <b>Alert ID:</b> {{id}}<br />+ <b>Alert name:</b> {{name}}<br />+ <b>Alert active:</b> {{#if active}} Yes {{else}} No {{/if}}<br />+ <b>Alert last triggered:</b> {{lastTriggered}}<br />+ <b>Alert query metric:</b> {{queryMetric}}<br />+ <b>Alert query condition:</b> {{queryCondition}}<br />+ <b>Alert query value:</b> {{queryValue}}<br />+ <b>Alert query time:</b> {{queryTime}}<br />+ <b>Alert created at:</b> {{created}}<br />+ {{else}}+ None.+ <br />+ {{/each}}+ <br />{{else}}There are no projects associated with this account.{{/each}}diff --git a/src/user/user.controller.ts b/src/user/user.controller.tsindex b5ac085f9..e7fe293ed 100644--- a/src/user/user.controller.ts+++ b/src/user/user.controller.ts@@ -542,7 +542,7 @@ export class UserController {this.logger.log({ user_id }, 'GET /user/export')const user = await this.userService.findOneWhere({ id: user_id })const where = Object({ admin: user_id })- const projects = await this.projectService.findWhere(where)+ const projects = await this.projectService.findWhere(where, ['alerts'])if (!_isNull(user.exportedAt) &&@@ -570,6 +570,8 @@ export class UserController {subID: user.subID || '-',subUpdateURL: user.subUpdateURL || '-',subCancelURL: user.subCancelURL || '-',+ telegramChatId: user.telegramChatId || '-',+ nickname: user.nickname || '-',},projects: _map(projects, project => ({...project,