Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Fix merge guest user into logged in user (#907)
Luke Vella7c54268b5824
diff --git a/apps/web/src/utils/auth.ts b/apps/web/src/utils/auth.tsindex 5b009c33e..23ed3ae08 100644--- a/apps/web/src/utils/auth.ts+++ b/apps/web/src/utils/auth.ts@@ -18,185 +18,189 @@ import CredentialsProvider from "next-auth/providers/credentials";import EmailProvider from "next-auth/providers/email";import { LegacyTokenProvider } from "@/utils/auth/legacy-token-provider";+import { mergeGuestsIntoUser } from "@/utils/auth/merge-user";import { emailClient } from "@/utils/emails";-const authOptions = {- adapter: PrismaAdapter(prisma),- secret: process.env.SECRET_PASSWORD,- session: {- strategy: "jwt",- },- providers: [- LegacyTokenProvider,- // When a user registers, we don't want to go through the email verification process- // so this providers allows us exchange the registration token for a session token- CredentialsProvider({- id: "registration-token",- name: "Registration Token",- credentials: {- token: {- label: "Token",- type: "text",+const getAuthOptions = (...args: GetServerSessionParams) =>+ ({+ adapter: PrismaAdapter(prisma),+ secret: process.env.SECRET_PASSWORD,+ session: {+ strategy: "jwt",+ },+ providers: [+ LegacyTokenProvider,+ // When a user registers, we don't want to go through the email verification process+ // so this providers allows us exchange the registration token for a session token+ CredentialsProvider({+ id: "registration-token",+ name: "Registration Token",+ credentials: {+ token: {+ label: "Token",+ type: "text",+ },},- },- async authorize(credentials) {- if (credentials?.token) {- const payload = await decryptToken<RegistrationTokenPayload>(- credentials.token,- );- if (payload) {- const user = await prisma.user.findUnique({- where: {- email: payload.email,- },- select: {- id: true,- email: true,- name: true,- locale: true,- timeFormat: true,- timeZone: true,- },- });+ async authorize(credentials) {+ if (credentials?.token) {+ const payload = await decryptToken<RegistrationTokenPayload>(+ credentials.token,+ );+ if (payload) {+ const user = await prisma.user.findUnique({+ where: {+ email: payload.email,+ },+ select: {+ id: true,+ email: true,+ name: true,+ locale: true,+ timeFormat: true,+ timeZone: true,+ },+ });- if (user) {- return user;+ if (user) {+ return user;+ }}}- }- return null;- },- }),- CredentialsProvider({- id: "guest",- name: "Guest",- credentials: {},- async authorize() {- return {- id: `user-${randomid()}`,- email: null,- };- },- }),- EmailProvider({- server: "",- from: process.env.NOREPLY_EMAIL,- generateVerificationToken() {- return generateOtp();- },- async sendVerificationRequest({ identifier: email, token, url }) {- const user = await prisma.user.findUnique({- where: {- email,- },- select: {- name: true,- },- });-- if (user) {- await emailClient.sendTemplate("LoginEmail", {- to: email,- subject: `${token} is your 6-digit code`,- props: {- name: user.name,- magicLink: url,- code: token,+ return null;+ },+ }),+ CredentialsProvider({+ id: "guest",+ name: "Guest",+ credentials: {},+ async authorize() {+ return {+ id: `user-${randomid()}`,+ email: null,+ };+ },+ }),+ EmailProvider({+ server: "",+ from: process.env.NOREPLY_EMAIL,+ generateVerificationToken() {+ return generateOtp();+ },+ async sendVerificationRequest({ identifier: email, token, url }) {+ const user = await prisma.user.findUnique({+ where: {+ email,+ },+ select: {+ name: true,},});- }- },- }),- ],- pages: {- signIn: "/login",- signOut: "/logout",- error: "/auth/error",- },- callbacks: {- async redirect({ url, baseUrl }) {- // Allows relative callback URLs- if (url.startsWith("/")) return `${baseUrl}${url}`;- // Allows callback URLs on the same origin- else if (new URL(url).origin === baseUrl) return url;- return baseUrl;++ if (user) {+ await emailClient.sendTemplate("LoginEmail", {+ to: email,+ subject: `${token} is your 6-digit code`,+ props: {+ name: user.name,+ magicLink: url,+ code: token,+ },+ });+ }+ },+ }),+ ],+ pages: {+ signIn: "/login",+ signOut: "/logout",+ error: "/auth/error",},- async signIn({ user }) {- if (user.email) {- const userExists =- (await prisma.user.count({- where: {- email: user.email,- },- })) > 0;- if (userExists) {- if (isEmailBlocked(user.email)) {- return false;+ callbacks: {+ async signIn({ user, email }) {+ if (email?.verificationRequest) {+ if (user.email) {+ const userExists =+ (await prisma.user.count({+ where: {+ email: user.email,+ },+ })) > 0;++ if (userExists) {+ if (isEmailBlocked(user.email)) {+ return false;+ }+ return true;+ } else {+ return false;+ }}- return true;} else {- return false;+ const session = await getServerSession(...args);+ if (session && session.user.email === null) {+ await mergeGuestsIntoUser(user.id, [session.user.id]);+ }}- }- return true;- },- async jwt({ token, user, trigger, session }) {- if (trigger === "update" && session) {- if (token.email) {- // For registered users we want to save the preferences to the database- try {- await prisma.user.update({- where: {- id: token.sub,- },- data: {- locale: session.locale,- timeFormat: session.timeFormat,- timeZone: session.timeZone,- weekStart: session.weekStart,- name: session.name,- },- });- } catch (e) {- console.error("Failed to update user preferences", session);+ return true;+ },+ async jwt({ token, user, trigger, session }) {+ if (trigger === "update" && session) {+ if (token.email) {+ // For registered users we want to save the preferences to the database+ try {+ await prisma.user.update({+ where: {+ id: token.sub,+ },+ data: {+ locale: session.locale,+ timeFormat: session.timeFormat,+ timeZone: session.timeZone,+ weekStart: session.weekStart,+ name: session.name,+ },+ });+ } catch (e) {+ console.error("Failed to update user preferences", session);+ }}+ token = { ...token, ...session };}- token = { ...token, ...session };- }- if (trigger === "signIn" && user) {- token.locale = user.locale;- token.timeFormat = user.timeFormat;- token.timeZone = user.timeZone;- token.weekStart = user.weekStart;- }+ if (trigger === "signIn" && user) {+ token.locale = user.locale;+ token.timeFormat = user.timeFormat;+ token.timeZone = user.timeZone;+ token.weekStart = user.weekStart;+ }- return token;- },- async session({ session, token }) {- session.user.id = token.sub as string;- session.user.name = token.name;- session.user.timeFormat = token.timeFormat;- session.user.timeZone = token.timeZone;- session.user.locale = token.locale;- session.user.weekStart = token.weekStart;- return session;+ return token;+ },+ async session({ session, token }) {+ session.user.id = token.sub as string;+ session.user.name = token.name;+ session.user.timeFormat = token.timeFormat;+ session.user.timeZone = token.timeZone;+ session.user.locale = token.locale;+ session.user.weekStart = token.weekStart;+ return session;+ },},- },-} satisfies NextAuthOptions;--export async function getServerSession(- ...args:- | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]- | [NextApiRequest, NextApiResponse]- | []-) {- return getServerSessionWithOptions(...args, authOptions);+ } satisfies NextAuthOptions);++type GetServerSessionParams =+ | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]+ | [NextApiRequest, NextApiResponse]+ | [];++export function getServerSession(...args: GetServerSessionParams) {+ return getServerSessionWithOptions(...args, getAuthOptions(...args));}export async function AuthApiRoute(req: NextApiRequest, res: NextApiResponse) {+ const authOptions = getAuthOptions(req, res);return NextAuth(req, res, authOptions);}diff --git a/apps/web/src/utils/auth/merge-user.ts b/apps/web/src/utils/auth/merge-user.tsnew file mode 100644index 000000000..cf560fd43--- /dev/null+++ b/apps/web/src/utils/auth/merge-user.ts@@ -0,0 +1,39 @@+import { prisma } from "@rallly/database";++export const mergeGuestsIntoUser = async (+ userId: string,+ guestIds: string[],+) => {+ await prisma.poll.updateMany({+ where: {+ userId: {+ in: guestIds,+ },+ },+ data: {+ userId: userId,+ },+ });++ await prisma.participant.updateMany({+ where: {+ userId: {+ in: guestIds,+ },+ },+ data: {+ userId: userId,+ },+ });++ await prisma.comment.updateMany({+ where: {+ userId: {+ in: guestIds,+ },+ },+ data: {+ userId: userId,+ },+ });+};diff --git a/packages/backend/trpc/routers/auth.ts b/packages/backend/trpc/routers/auth.tsindex cf25aa555..bb33c6efa 100644--- a/packages/backend/trpc/routers/auth.ts+++ b/packages/backend/trpc/routers/auth.ts@@ -6,44 +6,6 @@ import { generateOtp } from "../../utils/nanoid";import { publicProcedure, router } from "../trpc";import { RegistrationTokenPayload } from "../types";-// assigns participants and comments created by guests to a user-// we could have multiple guests because a login might be triggered from one device-// and opened in another one.-const mergeGuestsIntoUser = async (userId: string, guestIds: string[]) => {- await prisma.poll.updateMany({- where: {- userId: {- in: guestIds,- },- },- data: {- userId: userId,- },- });-- await prisma.participant.updateMany({- where: {- userId: {- in: guestIds,- },- },- data: {- userId: userId,- },- });-- await prisma.comment.updateMany({- where: {- userId: {- in: guestIds,- },- },- data: {- userId: userId,- },- });-};-export const auth = router({// @deprecatedrequestRegistration: publicProcedure@@ -107,7 +69,7 @@ export const auth = router({locale: z.string().optional(),}),)- .mutation(async ({ input, ctx }) => {+ .mutation(async ({ input }) => {const payload = await decryptToken<RegistrationTokenPayload>(input.token);if (!payload) {@@ -129,10 +91,6 @@ export const auth = router({},});- if (ctx.user.isGuest) {- await mergeGuestsIntoUser(user.id, [ctx.user.id]);- }-return { ok: true, user };}),getUserPermission: publicProcedure