From 7796b0e7b77aef3f9d476838b94c2a43e056c87e Mon Sep 17 00:00:00 2001
From: Tagaishi <Tagaishi@hotmail.ch>
Date: Wed, 24 Apr 2024 16:58:37 +0200
Subject: [PATCH] fix: restore callback after merge conflict mistake

---
 src/components/layout/header/AvatarMenu.tsx | 4 +++-
 src/env.js                                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/layout/header/AvatarMenu.tsx b/src/components/layout/header/AvatarMenu.tsx
index 1b3b7fb19ae..9686518bcdd 100644
--- a/src/components/layout/header/AvatarMenu.tsx
+++ b/src/components/layout/header/AvatarMenu.tsx
@@ -16,6 +16,7 @@ import Link from 'next/link';
 import { forwardRef } from 'react';
 import { useColorScheme } from '~/hooks/use-colorscheme';
 
+import { env } from '~/env';
 import { useBoardLink } from '../Templates/BoardLayout';
 
 export const AvatarMenu = () => {
@@ -66,7 +67,8 @@ export const AvatarMenu = () => {
             color="red"
             onClick={() =>
               signOut({
-                redirect: false,
+                callbackUrl: env.NEXT_PUBLIC_LOGOUT_REDIRECT_URL ?? "/",
+                redirect: env.NEXT_PUBLIC_LOGOUT_REDIRECT_URL != undefined,
               }).then(() => window.location.reload())
             }
           >
diff --git a/src/env.js b/src/env.js
index 160ba0320c2..eb75bd0640d 100644
--- a/src/env.js
+++ b/src/env.js
@@ -102,7 +102,7 @@ const env = createEnv({
           AUTH_OIDC_OWNER_GROUP: z.string().default('admin'),
           AUTH_OIDC_AUTO_LOGIN: zodParsedBoolean(),
           AUTH_OIDC_SCOPE_OVERWRITE: z.string().default('openid email profile groups'),
-          AUTH_OIDC_TIMEOUT: numberSchema.default(3500),
+          AUTH_OIDC_TIMEOUT: numberSchema.default("3500"),
         }
       : {}),
   },