From bb847974a498b6778e382c267f683533f4562f21 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Tue, 27 Aug 2024 19:24:01 +0100
Subject: [PATCH] Fix sentry config

---
 packages/website/.env                | 3 ---
 packages/website/src/hooks.client.ts | 3 ++-
 packages/website/src/hooks.server.ts | 5 +++--
 packages/website/src/lib/config.js   | 8 ++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 packages/website/src/lib/config.js

diff --git a/packages/website/.env b/packages/website/.env
index f849835d..e41d3381 100644
--- a/packages/website/.env
+++ b/packages/website/.env
@@ -1,6 +1,3 @@
 # This is committed to git
 # DO NOT STORE SECRETS IN THIS FILE
 # use .env.local for secrets
-
-SENTRY_DSN = "https://d006c73cc53783930a1521a68ae1c312@o4507835405369344.ingest.de.sentry.io/4507835410481232"
-SENTRY_REPORT_URL = "https://o4507835405369344.ingest.de.sentry.io/api/4507835410481232/security/?sentry_key=d006c73cc53783930a1521a68ae1c312"
diff --git a/packages/website/src/hooks.client.ts b/packages/website/src/hooks.client.ts
index a3a91b56..8824fd28 100644
--- a/packages/website/src/hooks.client.ts
+++ b/packages/website/src/hooks.client.ts
@@ -1,7 +1,8 @@
+import { SENTRY_DSN } from '$lib/config';
 import { init as initSentry, handleErrorWithSentry, makeBrowserOfflineTransport, makeFetchTransport, replayIntegration } from '@sentry/sveltekit';
 
 initSentry({
-    dsn: import.meta.env.SENTRY_DSN,
+    dsn: SENTRY_DSN,
     environment: import.meta.env.MODE,
     tracesSampleRate: 1.0,
 
diff --git a/packages/website/src/hooks.server.ts b/packages/website/src/hooks.server.ts
index 64fbe371..5dc1cb98 100644
--- a/packages/website/src/hooks.server.ts
+++ b/packages/website/src/hooks.server.ts
@@ -2,9 +2,10 @@ import { sequence } from '@sveltejs/kit/hooks';
 import {init as initSentry, handleErrorWithSentry, sentryHandle} from '@sentry/sveltekit';
 import type { Handle } from "@sveltejs/kit";
 import { randomBytes } from 'crypto';
+import { SENTRY_DSN, SENTRY_REPORT_URL } from './lib/config';
 
 initSentry({
-    dsn: import.meta.env.SENTRY_DSN,
+    dsn: SENTRY_DSN,
     environment: import.meta.env.MODE,
     tracesSampleRate: 1
 })
@@ -21,7 +22,7 @@ const securityHeaders = {
     'Cross-Origin-Opener-Policy': 'same-origin',
     'Cross-Origin-Resource-Policy': 'same-origin',
 
-    'Report-To': '{"group":"csp-endpoint","max_age":10886400,"endpoints":[{"url":"' + import.meta.env.SENTRY_REPORT_URL + '"}],"include_subdomains":true}',
+    'Report-To': '{"group":"csp-endpoint","max_age":10886400,"endpoints":[{"url":"' + SENTRY_REPORT_URL + '"}],"include_subdomains":true}',
 }
 
 export const handle: Handle = async (input) => {
diff --git a/packages/website/src/lib/config.js b/packages/website/src/lib/config.js
new file mode 100644
index 00000000..64d8bc1a
--- /dev/null
+++ b/packages/website/src/lib/config.js
@@ -0,0 +1,8 @@
+
+// Sentry config
+export const SENTRY_HOST = "o4507835405369344.ingest.de.sentry.io"
+export const SENTRY_PROJECT_ID = "4507835410481232"
+export const SENTRY_KEY = "d006c73cc53783930a1521a68ae1c312"
+export const SENTRY_TUNNEL_ALLOWED_IDS = [SENTRY_PROJECT_ID]
+export const SENTRY_DSN = "https://" + SENTRY_KEY + "@" + SENTRY_HOST + "/" + SENTRY_PROJECT_ID
+export const SENTRY_REPORT_URL = "https://" + SENTRY_HOST + "/api/" + SENTRY_PROJECT_ID + "/security/?sentry_key=" + SENTRY_KEY