Skip to content

fix user email update issue #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikaKK merged 4 commits into from
Aug 1, 2025
Merged

fix user email update issue #1629

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18a590d
fix user email update issue
ErikaKK Jul 31, 2025
9d52f47
add user email update condition
ErikaKK Jul 31, 2025
d44ea7d
update logic
ErikaKK Jul 31, 2025
d607a47
update redirect
ErikaKK Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions src/server/api/routers/admin/users/update-email.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,21 @@ import { User } from "~/server/db/schema"
export const updateEmail = adminProcedure
.input(z.object({ userId: z.string(), oldEmail: z.string().email(), newEmail: z.string().email() }))
.mutation(async ({ ctx, input }) => {
// TODO: check if old email is the same as the user's email in db

// TODO: wrap in a transaction
const [user] = await ctx.db.update(User).set({ email: input.newEmail }).where(eq(User.id, input.userId)).returning()
const user_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.oldEmail),
})
if (!user_data) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with email: ${input.oldEmail} does not exist` })
}
const user_email_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.newEmail),
})
if (user_email_data) {
throw new TRPCError({ code: "FORBIDDEN", message: `User with email: ${input.newEmail} already exist` })
}
const user = await ctx.db.query.User.findFirst({
where: eq(User.id, input.userId),
})
if (!user) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.userId} does not exist` })
}
Expand All @@ -25,10 +36,12 @@ export const updateEmail = adminProcedure
message: `Clerk user with id: ${input.userId} does not have a primary email address???`,
})

if (clerkUser.primaryEmailAddress?.emailAddress !== input.oldEmail)
// Clerk will always return the lowercased email from its API
if (clerkUser.primaryEmailAddress?.emailAddress !== input.oldEmail.toLowerCase())
throw new TRPCError({ code: "BAD_REQUEST", message: "Old email does not match" })
try {
await updateDbUserEmail(clerkUser.id, clerkUser.primaryEmailAddressId, input.newEmail)
await updateClerkUserEmail(clerkUser.id, clerkUser.primaryEmailAddressId, input.newEmail)
await ctx.db.update(User).set({ email: input.newEmail }).where(eq(User.id, input.userId))
} catch (err) {
console.error(err)
throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message: "Failed to update email" })
Expand All @@ -37,13 +50,12 @@ export const updateEmail = adminProcedure
return user
})

const updateDbUserEmail = async (userId: string, oldEmailAddressId: string, newEmailAddress: string) => {
const res = await clerkClient().emailAddresses.createEmailAddress({
const updateClerkUserEmail = async (userId: string, oldEmailAddressId: string, newEmailAddress: string) => {
await clerkClient().emailAddresses.createEmailAddress({
userId,
emailAddress: newEmailAddress,
verified: true,
primary: true,
})
await db.update(User).set({ email: res.emailAddress }).where(eq(User.id, userId))
await clerkClient().emailAddresses.deleteEmailAddress(oldEmailAddressId) // cleanup
await clerkClient().emailAddresses.deleteEmailAddress(oldEmailAddressId)
}