From 03e695a7a5d7c1ba18cf7dd73a84a4e4abf8b8ad Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Tue, 10 Sep 2024 15:02:12 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Make=20more=20readable=20(#1340)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/utils/auth.ts | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/apps/web/src/utils/auth.ts b/apps/web/src/utils/auth.ts index 3f268664f..aad41a650 100644 --- a/apps/web/src/utils/auth.ts +++ b/apps/web/src/utils/auth.ts @@ -289,26 +289,22 @@ const getAuthOptions = (...args: GetServerSessionParams) => }, }); - if (!user) { - session.user.id = token.sub as string; - session.user.email = token.email; - session.user.locale = token.locale; - session.user.timeFormat = token.timeFormat; - session.user.timeZone = token.timeZone; - session.user.locale = token.locale; - session.user.weekStart = token.weekStart; - } else { + if (user) { session.user.id = user.id; session.user.name = user.name; session.user.email = user.email; - session.user.locale = user.locale; - session.user.timeFormat = user.timeFormat; - session.user.timeZone = user.timeZone; - session.user.locale = user.locale; - session.user.weekStart = user.weekStart; session.user.image = user.image; + } else { + session.user.id = token.sub || `user-${randomid()}`; } + const source = user ?? token; + + session.user.locale = source.locale; + session.user.timeFormat = source.timeFormat; + session.user.timeZone = source.timeZone; + session.user.weekStart = source.weekStart; + return session; }, },