Skip to content

fix: Handle undefined signupSources gracefully #1274

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
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

fix: Handle undefined signupSources gracefully #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/auth/auth.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class AuthService implements IAuthService {
adsDisabled: user.adsDisabled,
interestedInHidingAds: user.interestedInHidingAds,
lastUsedFramework: user.lastUsedFramework,
signupSources: user.signupSources,
signupSources: user.signupSources ?? [],
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/NewsletterSignup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function NewsletterSignup({
const queryClient = useQueryClient()
const { notify } = useToast()
const { openLoginModal } = useLoginModal()
const isSubscribed = user?.signupSources.includes('newsletter') ?? false
const isSubscribed = user?.signupSources?.includes('newsletter') ?? false

const { mutate, isPending } = useMutation({
mutationFn: () => addUserSignupSource({ data: { source: 'newsletter' } }),
Expand Down
8 changes: 5 additions & 3 deletions src/utils/users.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,17 @@ export async function addUserSignupSource({
throw new Error('User not found')
}

if (existingUser.signupSources.includes(data.source)) {
const existingSignupSources = existingUser.signupSources ?? []

if (existingSignupSources.includes(data.source)) {
return {
success: true,
alreadyTagged: true,
signupSources: existingUser.signupSources,
signupSources: existingSignupSources,
}
}

const signupSources = [...existingUser.signupSources, data.source]
const signupSources = [...existingSignupSources, data.source]

await db
.update(users)
Expand Down
Loading