Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🎨 Make more readable (#1340)

Luke Vella03e695a7a5d7
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;
},
},