-
-
+ {showLogo && (
+
-
JUNOHUB
-
+ )}
{supplierRoutes.map((route) => (
([])
const [selectedContact, setSelectedContact] = useState(null)
@@ -95,6 +97,11 @@ export function ChatView() {
const handleSetup = async () => {
try {
setContactsError(null)
+ // Ensure we have a user id before trying to set up keys
+ if (!userId) {
+ setContactsError("Session not ready. Please refresh the page and try again.")
+ return
+ }
await setupKeys()
await getSession()
fetchContacts()
@@ -106,7 +113,7 @@ export function ChatView() {
// Auto-setup chat keys when user has none (e.g. supplier who just accepted invitation)
useEffect(() => {
- if (cryptoLoading || hasKeys || autoSetupAttemptedRef.current) return
+ if (cryptoLoading || hasKeys || autoSetupAttemptedRef.current || !userId) return
autoSetupAttemptedRef.current = true
setContactsError(null)
setupKeys()
diff --git a/src/hooks/useChatCrypto.ts b/src/hooks/useChatCrypto.ts
index 36b2048..d967b8f 100644
--- a/src/hooks/useChatCrypto.ts
+++ b/src/hooks/useChatCrypto.ts
@@ -19,16 +19,40 @@ export function useChatCrypto(userId?: string) {
setLoading(false)
return
}
- const stored = localStorage.getItem(privateKeyKey)
+
+ const stored = typeof window !== "undefined" ? localStorage.getItem(privateKeyKey) : null
if (stored) {
setPrivateKey(stored)
setHasKeys(true)
- } else {
- setPrivateKey(null)
- setHasKeys(false)
+ setLoading(false)
+ return
}
- setLoading(false)
- }, [userId, privateKeyKey])
+
+ // No local key – try to restore from server backup
+ ; (async () => {
+ try {
+ const res = await fetch("/api/user/chat-key", { cache: "no-store" })
+ if (!res.ok) {
+ setLoading(false)
+ return
+ }
+ const data = await res.json()
+ if (data.hasBackup && data.privateKey && typeof window !== "undefined") {
+ localStorage.setItem(privateKeyKey, data.privateKey as string)
+ localStorage.setItem(publicKeyKey, (data.publicKey as string | undefined) ?? localStorage.getItem(publicKeyKey) ?? "")
+ setPrivateKey(data.privateKey as string)
+ setHasKeys(true)
+ } else {
+ setPrivateKey(null)
+ setHasKeys(false)
+ }
+ } catch (error) {
+ console.error("restore chat key failed", error)
+ } finally {
+ setLoading(false)
+ }
+ })()
+ }, [userId, privateKeyKey, publicKeyKey])
const setupKeys = useCallback(async () => {
if (!userId) throw new Error("User ID required for chat setup")
@@ -44,7 +68,7 @@ export function useChatCrypto(userId?: string) {
const res = await fetch("/api/user/chat-setup", {
method: "POST",
headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ publicKey: keys.publicKey })
+ body: JSON.stringify({ publicKey: keys.publicKey, privateKey: keys.privateKey })
})
if (!res.ok) throw new Error("Failed to save public key")
diff --git a/src/lib/notifications.ts b/src/lib/notifications.ts
index 58e0e5e..49c8aec 100644
--- a/src/lib/notifications.ts
+++ b/src/lib/notifications.ts
@@ -1,5 +1,6 @@
import { prisma } from "@/lib/prisma"
import { logger } from "@/lib/logger"
+import { sendPushNotification } from "@/lib/push"
// Keep this union in sync with the NotificationType enum in prisma/schema.prisma
type NotificationType =
@@ -18,6 +19,7 @@ interface CreateNotificationParams {
title: string
message: string
metadata?: Record
+ url?: string
}
/**
@@ -28,7 +30,8 @@ export async function createNotification({
type,
title,
message,
- metadata
+ metadata,
+ url
}: CreateNotificationParams) {
try {
// Use dynamic access to handle environments where the Notification model
@@ -43,6 +46,18 @@ export async function createNotification({
metadata: metadata ? metadata : undefined
}
})
+
+ // Fire-and-forget push notification for this event, if push is enabled
+ if (url) {
+ sendPushNotification(userId, {
+ title,
+ body: message,
+ url
+ }).catch((error) => {
+ logger.error("Error sending push notification for notification", error)
+ })
+ }
+
return notification
} catch (error) {
logger.error("Error creating notification", error)
@@ -68,7 +83,8 @@ export async function notifyInvitationAccepted(
connectionId,
supplierName,
storeName
- }
+ },
+ url: "/dashboard/suppliers/my"
})
}
@@ -90,7 +106,8 @@ export async function notifyInvitationReceived(
invitationId,
vendorName,
storeName
- }
+ },
+ url: "/supplier/vendors"
})
}
@@ -115,7 +132,8 @@ export async function notifyConnectionStatusChanged(
connectionId,
status,
otherPartyName
- }
+ },
+ url: "/dashboard"
})
}
@@ -137,7 +155,8 @@ export async function notifyProductSyncRequested(
syncId,
vendorName,
productTitle
- }
+ },
+ url: "/supplier/vendors"
})
}
@@ -164,6 +183,7 @@ export async function notifyProductSyncStatusChanged(
supplierName,
productTitle,
status
- }
+ },
+ url: "/dashboard/new-products"
})
}
diff --git a/src/lib/s3.ts b/src/lib/s3.ts
new file mode 100644
index 0000000..ee37155
--- /dev/null
+++ b/src/lib/s3.ts
@@ -0,0 +1,75 @@
+import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3"
+import crypto from "crypto"
+
+// Prefer S3-specific env vars, fall back to generic AWS ones
+const REGION =
+ process.env.SUPPLIER_PRODUCT_IMAGES_REGION ||
+ process.env.AWS_S3_REGION ||
+ process.env.AWS_REGION ||
+ process.env.AWS_DEFAULT_REGION ||
+ "us-east-1"
+
+const BUCKET =
+ process.env.SUPPLIER_PRODUCT_IMAGES_BUCKET ||
+ process.env.AWS_S3_BUCKET_NAME ||
+ ""
+
+const ACCESS_KEY_ID = process.env.AWS_S3_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID
+const SECRET_ACCESS_KEY = process.env.AWS_S3_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY
+
+if (!BUCKET) {
+ // We intentionally don't throw here to avoid crashing the app in environments
+ // where S3 hasn't been configured yet. The upload API will check and fail
+ // gracefully with a 500 + clear message.
+ // eslint-disable-next-line no-console
+ console.warn(
+ "[S3] SUPPLIER_PRODUCT_IMAGES_BUCKET or AWS_S3_BUCKET_NAME is not set. Supplier image uploads will fail."
+ )
+}
+
+export const s3Client = new S3Client({
+ region: REGION,
+ credentials:
+ ACCESS_KEY_ID && SECRET_ACCESS_KEY
+ ? {
+ accessKeyId: ACCESS_KEY_ID,
+ secretAccessKey: SECRET_ACCESS_KEY
+ }
+ : undefined
+})
+
+export async function uploadSupplierProductImage(params: {
+ supplierId: string
+ fileBuffer: Buffer
+ contentType?: string
+ originalName?: string
+}) {
+ if (!BUCKET) {
+ throw new Error("S3 bucket is not configured for supplier product images")
+ }
+
+ const extensionFromType =
+ params.contentType && params.contentType.includes("/")
+ ? params.contentType.split("/")[1]
+ : undefined
+
+ const ext =
+ (params.originalName && params.originalName.split(".").pop()) ||
+ extensionFromType ||
+ "bin"
+
+ const key = `supplier-products/${params.supplierId}/${crypto.randomUUID()}.${ext}`
+
+ const command = new PutObjectCommand({
+ Bucket: BUCKET,
+ Key: key,
+ Body: params.fileBuffer,
+ ContentType: params.contentType
+ })
+
+ await s3Client.send(command)
+
+ const url = `https://${BUCKET}.s3.${REGION}.amazonaws.com/${key}`
+ return { key, url }
+}
+