Merge branch 'development' into staging

Author: itsskofficial

src/client/.env.selfhost.template

@@ -20,6 +20,12 @@ APP_BASE_URL=http://localhost:3000
 # This MUST match the `SELF_HOST_AUTH_SECRET` in the server's .env.selfhost file.
 SELF_HOST_AUTH_TOKEN=<use_the_same_strong_secret_as_in_the_root_env>
 
+# --- Database (for Server Actions) ---
+# This is the internal URI for the MongoDB service within Docker.
+# It MUST include the credentials defined in the root .env file.
+MONGO_URI=mongodb://<user_from_root_env>:<pass_from_root_env>@mongodb:27017/
+MONGO_DB_NAME=sentient_selfhost_db
+
 # Auth0 variables are not used in selfhost mode, but are kept here
 # to avoid breaking any code that might reference them before a check.
 # The build process requires them to be present in some form.
@@ -38,4 +44,7 @@ NEXT_PUBLIC_POSTHOG_KEY=
 NEXT_PUBLIC_POSTHOG_HOST=
 # --- PWA Push Notifications (Optional) ---
 # Generate VAPID keys using `npx web-push generate-vapid-keys` and add the public key here.
-# This MUST match the public key derived from VAPID_PRIVATE_KEY in the server's .env.
+# The private key is also needed here for Next.js Server Actions.
+NEXT_PUBLIC_VAPID_PUBLIC_KEY=
+VAPID_PRIVATE_KEY=
+VAPID_ADMIN_EMAIL=mailto:your-email@example.com

src/client/.env.template

@@ -14,11 +14,18 @@ AUTH0_CLIENT_SECRET=
 AUTH0_AUDIENCE=
 AUTH0_SCOPE='openid profile email offline_access read:profile write:profile read:tasks write:tasks read:notifications read:config write:config admin:user_metadata read:contacts write:contacts'
 
+# --- Database (for Server Actions) ---
+# The full connection string for your MongoDB Atlas cluster.
+MONGO_URI=
+MONGO_DB_NAME=
+
 # --- Analytics (Optional) ---
 # If you want to enable product analytics, provide your PostHog project key.
 NEXT_PUBLIC_POSTHOG_KEY=
 # If using a self-hosted PostHog instance, provide the host URL. Otherwise, leave it empty to default to PostHog's US cloud.
 NEXT_PUBLIC_POSTHOG_HOST=
 # --- PWA Push Notifications (Optional) ---
-# Generate VAPID keys using `npx web-push generate-vapid-keys` and add the public key here.
+# Generate VAPID keys using `npx web-push generate-vapid-keys`.
 NEXT_PUBLIC_VAPID_PUBLIC_KEY=
+VAPID_PRIVATE_KEY=
+VAPID_ADMIN_EMAIL=mailto:your-email@example.com

src/client/.gitignore

@@ -37,9 +37,5 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-# PWA files
-/public/sw.js
-/public/workbox-*.js
-
 # End of https://www.toptal.com/developers/gitignore/api/nextjs
 certificates

src/client/app/actions.js

@@ -0,0 +1,170 @@
+"use server"
+
+import { auth0 } from "@lib/auth0"
+import { MongoClient } from "mongodb"
+import webpush from "web-push"
+
+// --- DB Connection ---
+const MONGO_URI = process.env.MONGO_URI
+const MONGO_DB_NAME = process.env.MONGO_DB_NAME
+
+let cachedClient = null
+let cachedDb = null
+
+async function connectToDatabase() {
+	if (cachedClient && cachedDb) {
+		return { client: cachedClient, db: cachedDb }
+	}
+
+	if (!MONGO_URI) {
+		throw new Error(
+			"MONGO_URI is not defined in the environment variables."
+		)
+	}
+
+	const client = new MongoClient(MONGO_URI)
+	await client.connect()
+	const db = client.db(MONGO_DB_NAME)
+
+	cachedClient = client
+	cachedDb = db
+
+	return { client, db }
+}
+
+// --- WebPush Setup ---
+if (
+	process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY &&
+	process.env.VAPID_PRIVATE_KEY &&
+	process.env.VAPID_ADMIN_EMAIL
+) {
+	webpush.setVapidDetails(
+		process.env.VAPID_ADMIN_EMAIL,
+		process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY,
+		process.env.VAPID_PRIVATE_KEY
+	)
+} else {
+	console.warn(
+		"VAPID details not fully configured. Push notifications may not work."
+	)
+}
+
+// --- Server Actions ---
+
+export async function subscribeUser(subscription) {
+	const session = await auth0.getSession()
+	if (!session?.user) {
+		throw new Error("Not authenticated")
+	}
+	const userId = session.user.sub
+
+	try {
+		const { db } = await connectToDatabase()
+		const userProfiles = db.collection("user_profiles")
+
+		await userProfiles.updateOne(
+			{ user_id: userId },
+			{ $set: { "userData.pwa_subscription": subscription } },
+			{ upsert: true }
+		)
+
+		console.log(`[Actions] Subscription saved for user: ${userId}`)
+		return { success: true }
+	} catch (error) {
+		console.error("[Actions] Error saving subscription:", error)
+		return {
+			success: false,
+			error: "Failed to save subscription to database."
+		}
+	}
+}
+
+export async function unsubscribeUser() {
+	const session = await auth0.getSession()
+	if (!session?.user) {
+		throw new Error("Not authenticated")
+	}
+	const userId = session.user.sub
+
+	try {
+		const { db } = await connectToDatabase()
+		const userProfiles = db.collection("user_profiles")
+
+		await userProfiles.updateOne(
+			{ user_id: userId },
+			{ $unset: { "userData.pwa_subscription": "" } }
+		)
+
+		console.log(`[Actions] Subscription removed for user: ${userId}`)
+		return { success: true }
+	} catch (error) {
+		console.error("[Actions] Error removing subscription:", error)
+		return {
+			success: false,
+			error: "Failed to remove subscription from database."
+		}
+	}
+}
+
+export async function sendNotificationToCurrentUser(payload) {
+	const session = await auth0.getSession()
+	if (!session?.user) {
+		throw new Error("Not authenticated")
+	}
+	const userId = session.user.sub
+
+	if (
+		!process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY ||
+		!process.env.VAPID_PRIVATE_KEY
+	) {
+		console.error(
+			"[Actions] VAPID keys not configured. Cannot send push notification."
+		)
+		return {
+			success: false,
+			error: "VAPID keys not configured on the server."
+		}
+	}
+
+	try {
+		const { db } = await connectToDatabase()
+		const userProfile = await db
+			.collection("user_profiles")
+			.findOne(
+				{ user_id: userId },
+				{ projection: { "userData.pwa_subscription": 1 } }
+			)
+
+		const subscription = userProfile?.userData?.pwa_subscription
+
+		if (!subscription) {
+			console.log(
+				`[Actions] No push subscription found for user ${userId}.`
+			)
+			return { success: false, error: "No subscription found for user." }
+		}
+
+		await webpush.sendNotification(subscription, JSON.stringify(payload))
+
+		console.log(
+			`[Actions] Push notification sent successfully to user ${userId}.`
+		)
+		return { success: true }
+	} catch (error) {
+		console.error(
+			`[Actions] Error sending push notification to user ${userId}:`,
+			error
+		)
+
+		// If the subscription is expired or invalid, the push service returns an error (e.g., 410 Gone).
+		// We should handle this by removing the invalid subscription from the database.
+		if (error.statusCode === 410 || error.statusCode === 404) {
+			console.log(
+				`[Actions] Subscription for user ${userId} is invalid. Removing from DB.`
+			)
+			await unsubscribeUser()
+		}
+
+		return { success: false, error: "Failed to send push notification." }
+	}
+}

src/client/components/LayoutWrapper.js

@@ -10,18 +10,22 @@ import GlobalSearch from "./GlobalSearch"
 import { useGlobalShortcuts } from "@hooks/useGlobalShortcuts"
 import { cn } from "@utils/cn"
 import toast from "react-hot-toast"
+import { subscribeUser } from "@app/actions"
 
 // Helper function to convert VAPID key
 function urlBase64ToUint8Array(base64String) {
-	const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-	const base64 = (base64String + padding).replace(/-/g, "+").replace(/_/g, "/");
-	const rawData = window.atob(base64);
-	const outputArray = new Uint8Array(rawData.length);
+	const padding = "=".repeat((4 - (base64String.length % 4)) % 4)
+	const base64 = (base64String + padding)
+		.replace(/-/g, "+")
+		.replace(/_/g, "/")
+	const rawData = atob(base64)
+	const outputArray = new Uint8Array(rawData.length)
 	for (let i = 0; i < rawData.length; ++i) {
-		outputArray[i] = rawData.charCodeAt(i);
+		outputArray[i] = rawData.charCodeAt(i)
 	}
-	return outputArray;
+	return outputArray
 }
+
 export default function LayoutWrapper({ children }) {
 	const [isNotificationsOpen, setNotificationsOpen] = useState(false)
 	const [isSearchOpen, setSearchOpen] = useState(false)
@@ -189,11 +193,9 @@ export default function LayoutWrapper({ children }) {
 	// PWA Update Handler
 
 	useEffect(() => {
-		// This effect runs only on the client side, after the component mounts.
-		if (
-			"serviceWorker" in navigator &&
-			process.env.NODE_ENV !== "development"
-		) {
+		// This effect runs only on the client side to register the service worker.
+		// It's enabled for all environments to allow testing in development.
+		if ("serviceWorker" in navigator) {
 			// The 'load' event ensures that SW registration doesn't delay page rendering.
 			window.addEventListener("load", function () {
 				navigator.serviceWorker.register("/sw.js").then(
@@ -265,73 +267,51 @@ export default function LayoutWrapper({ children }) {
 		}
 	}, [])
 
-	useEffect(() => {
-		// This effect runs only on the client side, after the component mounts.
-		if (
-			"serviceWorker" in navigator &&
-			process.env.NODE_ENV === "production"
-		) {
-			// The 'load' event ensures that SW registration doesn't delay page rendering.
-			window.addEventListener("load", function () {
-				navigator.serviceWorker.register("/sw.js").then(
-					function (registration) {
-						console.log(
-							"ServiceWorker registration successful with scope: ",
-							registration.scope
-						)
-					},
-					function (err) {
-						console.log("ServiceWorker registration failed: ", err)
-					}
-				)
-			})
-		}
-	}, [])
-
 	const subscribeToPushNotifications = useCallback(async () => {
-		if (!("serviceWorker" in navigator) || !("PushManager" in window)) return;
+		if (!("serviceWorker" in navigator) || !("PushManager" in window)) {
+			console.log("Push notifications not supported by this browser.")
+			return
+		}
 		if (!process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY) {
-			console.warn("VAPID public key not configured. Skipping push subscription.");
-			return;
+			console.warn(
+				"VAPID public key not configured. Skipping push subscription."
+			)
+			return
 		}
-		console.log("VAPID Public Key is configured. Proceeding with push subscription.");
 
 		try {
-			const registration = await navigator.serviceWorker.ready;
-			console.log("Service Worker is ready:", registration);
-
-			let subscription = await registration.pushManager.getSubscription();
-			console.log("Existing subscription:", subscription);
+			const registration = await navigator.serviceWorker.ready
+			let subscription = await registration.pushManager.getSubscription()
 
 			if (subscription === null) {
-				console.log("No existing subscription found. Requesting permission...");
-				const permission = await window.Notification.requestPermission();
-				console.log("Notification permission status:", permission);
+				const permission = await window.Notification.requestPermission()
+				if (permission !== "granted") {
+					console.log("Notification permission not granted.")
+					return
+				}
 
-				if (permission !== "granted") return;
+				console.log("Permission granted. Subscribing...")
+				const applicationServerKey = urlBase64ToUint8Array(
+					process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY
+				)
 
-				console.log("Permission granted. Subscribing to push manager...");
 				subscription = await registration.pushManager.subscribe({
 					userVisibleOnly: true,
-					applicationServerKey: urlBase64ToUint8Array(process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY),
-				});
-				console.log("New subscription created:", subscription);
-
-				const response = await fetch("/api/notifications/subscribe", {
-					method: "POST",
-					headers: { "Content-Type": "application/json" },
-					body: JSON.stringify(subscription),
-				});
-
-				if (!response.ok) {
-					throw new Error("Failed to send subscription to server.");
-				}
-				console.log("Subscription successfully sent to server.");
+					applicationServerKey
+				})
+
+				console.log("New subscription created:", subscription)
+				const serializedSub = JSON.parse(JSON.stringify(subscription))
+				await subscribeUser(serializedSub)
+				toast.success("Subscribed to push notifications!")
+			} else {
+				console.log("User is already subscribed.")
 			}
 		} catch (error) {
-			console.error("Error during push notification subscription:", error);
+			console.error("Error during push notification subscription:", error)
+			toast.error("Failed to subscribe to push notifications.")
 		}
-	}, []);
+	}, [])
 
 	useEffect(() => {
 		if (showNav && userDetails?.sub) subscribeToPushNotifications()
@@ -406,4 +386,3 @@ export default function LayoutWrapper({ children }) {
 		</>
 	)
 }
-