From 87bc2fd3e33cc292e2dcb183508e3cb7479b2dae Mon Sep 17 00:00:00 2001 From: Shamzic Date: Tue, 17 Dec 2024 15:44:44 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20fusion=20du=20authToken=20(partag=C3=A9?= =?UTF-8?q?=20entre=20le=20front=20et=20le=20back)=20&=20configure=20le=20?= =?UTF-8?q?projet=20sentry=20front=20sur=20le=20build=20de=20vite.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 5 +++-- backend/config/index.ts | 2 +- vite.config.ts | 15 +++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 3b7d480b7f..bfc1b08923 100644 --- a/.env.example +++ b/.env.example @@ -35,11 +35,12 @@ VITE_STATS_VERSION= MONGODB_URL= SENTRY_BACKEND_DSN= -SENTRY_BACKEND_AUTH_TOKEN= SENTRY_BACKEND_PROJECT= + SENTRY_FRONTEND_DSN= -SENTRY_FRONTEND_AUTH_TOKEN= SENTRY_FRONTEND_PROJECT= + +SENTRY_AUTH_TOKEN= SENTRY_CRON_DSN= SESSION_SECRET= diff --git a/backend/config/index.ts b/backend/config/index.ts index 43c23a331b..f4d8f961d4 100644 --- a/backend/config/index.ts +++ b/backend/config/index.ts @@ -114,7 +114,7 @@ const config: Configuration = { process.env.MONGODB_URL || "mongodb://127.0.0.1:27017/dev-aides-jeunes", sentry: { dsn: process.env.SENTRY_BACKEND_DSN, - authToken: process.env.SENTRY_BACKEND_AUTH_TOKEN, + authToken: process.env.SENTRY_AUTH_TOKEN, project: process.env.SENTRY_BACKEND_PROJECT, environment: process.env.NODE_ENV, integrations: [nodeProfilingIntegration()], diff --git a/vite.config.ts b/vite.config.ts index fa8e1a3815..fdaca9d717 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -30,14 +30,14 @@ const { smsService, } = config -function createSentryPlugin() { - if (!sentry.authToken || !sentry.project) { +function createSentryPlugin(authToken, project) { + if (!authToken || !project) { return null } return sentryVitePlugin({ org: "betagouv", - project: sentry.project, - authToken: sentry.authToken, + project, + authToken, url: "https://sentry.incubateur.net/", sourcemaps: { assets: `./dist/assets/${buildId}/js/*.{js,map}`, @@ -58,7 +58,7 @@ export default defineConfig(async ({ mode }) => { VITE_BASE_URL: baseURL, VITE_CONTEXT: process.env.NODE_ENV, VITE_SENTRY_FRONTEND_DSN: process.env?.SENTRY_FRONTEND_DSN, - VITE_SENTRY_FRONTEND_AUTH_TOKEN: process.env?.SENTRY_FRONTEND_AUTH_TOKEN, + VITE_SENTRY_FRONTEND_PROJECT: process.env?.SENTRY_FRONTEND_PROJECT, VITE_PR_URL: `${process.env.REPOSITORY_URL}/pull/${process.env.REVIEW_ID}`, VITE_REPOSITORY_URL: github.repository_url, VITE_BENEFIT_URL: `${github.repository_url}/blob/main/data/benefits`, @@ -126,7 +126,10 @@ export default defineConfig(async ({ mode }) => { targets: ["defaults"], }), visualizer(), - createSentryPlugin(), + createSentryPlugin( + sentry.authToken, + viteEnvironment.VITE_SENTRY_FRONTEND_PROJECT + ), sitemapGenerator(), ], resolve: {