From cf59dd07612ab00b40dbf49ca4d11608122cc173 Mon Sep 17 00:00:00 2001 From: adjoly Date: Tue, 14 Oct 2025 13:48:01 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20now?= =?UTF-8?q?=20redirecting=20on=20/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/gLogCallback.js | 4 +--- src/api/auth/gRegisterCallback.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/api/auth/gLogCallback.js b/src/api/auth/gLogCallback.js index 975b7d6..c596cd4 100644 --- a/src/api/auth/gLogCallback.js +++ b/src/api/auth/gLogCallback.js @@ -45,9 +45,7 @@ export async function gLogCallback(request, reply, fastify) { path: '/', secure: env !== 'development', sameSite: 'lax', - }) - .code(200) - .send({ msg: "Login successful" }); + }).redirect('/'); } catch (error) { fastify.log.error(error); reply.code(500).send({ error: 'Internal server error' }); diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js index f79542f..bfa8a11 100644 --- a/src/api/auth/gRegisterCallback.js +++ b/src/api/auth/gRegisterCallback.js @@ -54,9 +54,7 @@ export async function gRegisterCallback(request, reply, fastify) { path: '/', secure: env !== 'development', sameSite: 'lax', - }) - .code(200) - .send({ msg: "Register successful" }); + }).redirect('/'); } catch (error) { fastify.log.error(error); reply.code(500).send({ error: 'Internal server error' }); From 67cae236e1812fa87804c07d49c61c9e0f41faf6 Mon Sep 17 00:00:00 2001 From: adjoly Date: Tue, 14 Oct 2025 13:49:23 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20get?= =?UTF-8?q?ting=20from=20env=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/gLogCallback.js | 2 +- src/api/auth/gRegisterCallback.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/auth/gLogCallback.js b/src/api/auth/gLogCallback.js index c596cd4..a8c2f20 100644 --- a/src/api/auth/gLogCallback.js +++ b/src/api/auth/gLogCallback.js @@ -45,7 +45,7 @@ export async function gLogCallback(request, reply, fastify) { path: '/', secure: env !== 'development', sameSite: 'lax', - }).redirect('/'); + }).redirect(process.env.CALLBACK_REDIR); } catch (error) { fastify.log.error(error); reply.code(500).send({ error: 'Internal server error' }); diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js index bfa8a11..7ef5afc 100644 --- a/src/api/auth/gRegisterCallback.js +++ b/src/api/auth/gRegisterCallback.js @@ -54,7 +54,7 @@ export async function gRegisterCallback(request, reply, fastify) { path: '/', secure: env !== 'development', sameSite: 'lax', - }).redirect('/'); + }).redirect(process.env.CALLBACK_REDIR); } catch (error) { fastify.log.error(error); reply.code(500).send({ error: 'Internal server error' }); From 036798ab56f649b70ba9e5f524ae64a3164d0065 Mon Sep 17 00:00:00 2001 From: adjoly Date: Tue, 14 Oct 2025 13:54:20 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc:=20add?= =?UTF-8?q?ed=20redir=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 8ecbc62..ed35459 100644 --- a/.env.example +++ b/.env.example @@ -12,6 +12,8 @@ GRAPH_PORT=3000 ELK_PORT=5601 GOOGLE_CALLBACK_URL=https://localhost:8443/api/v1 +# the url to which the user will be redirected when it logs with google +CALLBACK_REDIR=http://localhost:3000 GOOGLE_CLIENT_SECRET=susAF GOOGLE_CLIENT_ID=Really @@ -24,3 +26,4 @@ SMTP_FROM= SMTP_AUTH_USERNAME= SMTP_AUTH_PASSWORD= EMAIL_TO= +