fix push subscription check erroring when unregistered

tetrahedral-tech · Jan 23, 2024 · 8d422d4 · 8d422d4
1 parent ab3885b
commit 8d422d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/push.server.js b/src/lib/push.server.js
@@ -15,7 +15,7 @@ export const sendNotification = async (data, user) => {
 	setVapidDetails();
 	// eslint-disable-next-line no-param-reassign
 	if (typeof user === 'string') user = await User.findById(user);
-	if (!user.pushSubscription) return;
+	if (!user?.pushSubscription) return;
 
 	const { pushSubscription } = user;
 	return webpush.sendNotification(

diff --git a/src/routes/dashboard/notifications/+page.server.js b/src/routes/dashboard/notifications/+page.server.js
@@ -47,7 +47,7 @@ export const actions = {
 		const data = jwt.verify(token, JWT_SECRET);
 		const user = await User.findOne({ _id: data._id });
 
-		if (!user.pushSubscription) throw error(400, 'Unregistered');
+		if (!user?.pushSubscription) throw error(400, 'Unregistered');
 		const { pushSubscription } = user;
 
 		await webpush