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!

added new rows to the GDPR export template

Blue Mouse6693cd7ed0ca
diff --git a/src/common/templates/en/gdpr_data_export.html b/src/common/templates/en/gdpr_data_export.html
index 2d6342d39..b72b0fbc1 100644
--- a/src/common/templates/en/gdpr_data_export.html
+++ b/src/common/templates/en/gdpr_data_export.html
@@ -83,11 +83,15 @@
<b>Email confirmed:</b>&nbsp;{{#if user.isActive}} Yes {{else}} No {{/if}}<br />
<b>Verification emails sent:</b>&nbsp;{{user.emailRequests}}<br />
<b>Summary report frequency:</b>&nbsp;{{user.reportFrequency}}<br />
+ <b>Is 2FA Enabled:</b>&nbsp;{{#if user.isTwoFactorAuthenticationEnabled}} Yes {{else}} No {{/if}}<br />
<b>Account created at:</b>&nbsp;{{user.created}}<br />
<b>Account updated at:</b>&nbsp;{{user.updated}}<br />
<b>Last report generation time:</b>&nbsp;{{user.exportedAt}}<br />
<b>Last tier warning email sent on:</b>&nbsp;{{user.evWarningSentOn}}<br />
<b>Timezone:</b>&nbsp;{{user.timezone}}<br />
+ <b>API Key:</b>&nbsp;{{#if user.apiKey}}{{user.apiKey}}{{else}}-{{/if}}<br />
+ <b>Billing frequency:</b>&nbsp;{{#if user.billingFrequency}}{{user.billingFrequency}}{{else}}-{{/if}}<br />
+ <b>Next billing date:</b>&nbsp;{{#if user.nextBillDate}}{{user.nextBillDate}}{{else}}-{{/if}}<br />
<b>Paddle: Subscription ID:</b>&nbsp;{{user.subID}}<br />
<b>Paddle: Update subscription URL:</b>&nbsp;{{user.subUpdateURL}}<br />
<b>Paddle: Cancel subscription URL:</b>&nbsp;{{user.subCancelURL}}
@@ -100,6 +104,7 @@
<b>Active:</b>&nbsp;{{#if active}} Yes {{else}} No {{/if}}<br />
<b>Public:</b>&nbsp;{{#if public}} Yes {{else}} No {{/if}}<br />
<b>Allowed origins:</b>&nbsp;{{#if origins}}{{origins}}{{else}}*{{/if}}<br />
+ <b>Blacklisted IPs:</b>&nbsp;{{#if ipBlacklist}}{{ipBlacklist}}{{else}}-{{/if}}<br />
<b>Created at:</b>&nbsp;{{created}}<br /><br />
{{else}}
There are no projects associated with this account.
diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.ts
index 2cebaafd0..6d88f4a57 100644
--- a/src/project/entity/project.entity.ts
+++ b/src/project/entity/project.entity.ts
@@ -5,6 +5,7 @@ import { User } from '../../user/entities/user.entity'
import { ProjectShare } from './project-share.entity'
// In case of modifying some properties here, make sure to also edit them in common/constants.ts -> selfhosted -> clickhouse
+// and to add them to the GDPR data export email template
@Entity()
export class Project {
@ApiProperty()
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
index 82074d4d6..3f1af6fd3 100644
--- a/src/user/user.controller.ts
+++ b/src/user/user.controller.ts
@@ -390,6 +390,7 @@ export class UserController {
...project,
created: dayjs(project.created).format('YYYY/MM/DD HH:mm:ss'),
origins: _join(project.origins, ', '),
+ ipBlacklist: _join(project.ipBlacklist, ', '),
}))
}