Skip to content

chore(auth): upgrade better-auth 1.3.12 → 1.6.11 #4766

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

Open
waleedlatif1 wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

chore(auth): upgrade better-auth 1.3.12 → 1.6.11 #4766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
455355d
chore(auth): upgrade better-auth 1.3.12 → 1.6.11
waleedlatif1 May 28, 2026
6d360b4
chore(auth): address Greptile review — broaden change-email type + mi…
waleedlatif1 May 28, 2026
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
22 changes: 11 additions & 11 deletions apps/sim/app/api/auth/forget-password/route.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { createMockRequest } from '@sim/testing'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'

const { mockForgetPassword, mockLogger } = vi.hoisted(() => {
const { mockRequestPasswordReset, mockLogger } = vi.hoisted(() => {
const logger = {
info: vi.fn(),
warn: vi.fn(),
Expand All @@ -17,7 +17,7 @@ const { mockForgetPassword, mockLogger } = vi.hoisted(() => {
child: vi.fn(),
}
return {
mockForgetPassword: vi.fn(),
mockRequestPasswordReset: vi.fn(),
mockLogger: logger,
}
})
Expand All @@ -28,7 +28,7 @@ vi.mock('@/lib/core/utils/urls', () => ({
vi.mock('@/lib/auth', () => ({
auth: {
api: {
forgetPassword: mockForgetPassword,
requestPasswordReset: mockRequestPasswordReset,
},
},
}))
Expand All @@ -43,7 +43,7 @@ import { POST } from '@/app/api/auth/forget-password/route'
describe('Forget Password API Route', () => {
beforeEach(() => {
vi.clearAllMocks()
mockForgetPassword.mockResolvedValue(undefined)
mockRequestPasswordReset.mockResolvedValue(undefined)
})

afterEach(() => {
Expand All @@ -62,7 +62,7 @@ describe('Forget Password API Route', () => {
expect(response.status).toBe(200)
expect(data.success).toBe(true)

expect(mockForgetPassword).toHaveBeenCalledWith({
expect(mockRequestPasswordReset).toHaveBeenCalledWith({
body: {
email: 'test@example.com',
redirectTo: 'https://app.example.com/reset',
Expand All @@ -83,7 +83,7 @@ describe('Forget Password API Route', () => {
expect(response.status).toBe(400)
expect(data.message).toBe('Redirect URL must be a valid same-origin URL')

expect(mockForgetPassword).not.toHaveBeenCalled()
expect(mockRequestPasswordReset).not.toHaveBeenCalled()
})

it('should send password reset email without redirectTo', async () => {
Expand All @@ -97,7 +97,7 @@ describe('Forget Password API Route', () => {
expect(response.status).toBe(200)
expect(data.success).toBe(true)

expect(mockForgetPassword).toHaveBeenCalledWith({
expect(mockRequestPasswordReset).toHaveBeenCalledWith({
body: {
email: 'test@example.com',
redirectTo: undefined,
Expand All @@ -115,7 +115,7 @@ describe('Forget Password API Route', () => {
expect(response.status).toBe(400)
expect(data.message).toBe('Email is required')

expect(mockForgetPassword).not.toHaveBeenCalled()
expect(mockRequestPasswordReset).not.toHaveBeenCalled()
})

it('should handle empty email', async () => {
Expand All @@ -129,13 +129,13 @@ describe('Forget Password API Route', () => {
expect(response.status).toBe(400)
expect(data.message).toBe('Please provide a valid email address')

expect(mockForgetPassword).not.toHaveBeenCalled()
expect(mockRequestPasswordReset).not.toHaveBeenCalled()
})

it('should handle auth service error with message', async () => {
const errorMessage = 'User not found'

mockForgetPassword.mockRejectedValue(new Error(errorMessage))
mockRequestPasswordReset.mockRejectedValue(new Error(errorMessage))

const req = createMockRequest('POST', {
email: 'nonexistent@example.com',
Expand All @@ -153,7 +153,7 @@ describe('Forget Password API Route', () => {
})

it('should handle unknown error', async () => {
mockForgetPassword.mockRejectedValue('Unknown error')
mockRequestPasswordReset.mockRejectedValue('Unknown error')

const req = createMockRequest('POST', {
email: 'test@example.com',
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/api/auth/forget-password/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {

const { email, redirectTo } = parsed.data.body

await auth.api.forgetPassword({
await auth.api.requestPasswordReset({
body: {
email,
redirectTo,
Expand Down
4 changes: 3 additions & 1 deletion apps/sim/components/emails/auth/otp-verification-email.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getBrandConfig } from '@/ee/whitelabeling'
interface OTPVerificationEmailProps {
otp: string
email?: string
type?: 'sign-in' | 'email-verification' | 'forget-password' | 'chat-access'
type?: 'sign-in' | 'email-verification' | 'change-email' | 'forget-password' | 'chat-access'
chatTitle?: string
}

Expand All @@ -16,6 +16,8 @@ const getSubjectByType = (type: string, brandName: string, chatTitle?: string) =
return `Sign in to ${brandName}`
case 'email-verification':
return `Verify your email for ${brandName}`
case 'change-email':
return `Verify your new email for ${brandName}`
case 'forget-password':
return `Reset your ${brandName} password`
case 'chat-access':
Expand Down
6 changes: 5 additions & 1 deletion apps/sim/components/emails/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ interface WorkspaceInvitation {
export async function renderOTPEmail(
otp: string,
email: string,
type: 'sign-in' | 'email-verification' | 'forget-password' = 'email-verification',
type:
| 'sign-in'
| 'email-verification'
| 'change-email'
| 'forget-password' = 'email-verification',
chatTitle?: string
): Promise<string> {
return await render(OTPVerificationEmail({ otp, email, type, chatTitle }))
Expand Down
3 changes: 3 additions & 0 deletions apps/sim/components/emails/subjects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { getBrandConfig } from '@/ee/whitelabeling'
export type EmailSubjectType =
| 'sign-in'
| 'email-verification'
| 'change-email'
| 'forget-password'
| 'reset-password'
| 'invitation'
Expand Down Expand Up @@ -34,6 +35,8 @@ export function getEmailSubject(type: EmailSubjectType): string {
return `Sign in to ${brandName}`
case 'email-verification':
return `Verify your email for ${brandName}`
case 'change-email':
return `Verify your new email for ${brandName}`
case 'forget-password':
return `Reset your ${brandName} password`
case 'reset-password':
Expand Down
Loading
Loading