feat: cleanup cookie passing and rm debug output

ndom91 · Aug 11, 2024 · 0a2e832 · 0a2e832
1 parent 280ee0b
commit 0a2e832
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/apps/backend/src/jobs/queue-worker/create-screenshot.ts b/apps/backend/src/jobs/queue-worker/create-screenshot.ts
@@ -28,7 +28,6 @@ export interface CreateScreenshot {
 }
 
 export const createScreenshot = async (data: CreateScreenshot) => {
-  console.log("CREATING SCREENSHOT")
   if (
     !process.env.BUCKET_PUBLIC_URL
     || !process.env.BUCKET_SECRET_KEY
@@ -83,10 +82,7 @@ const updateImageUrl = async ({
 }
 
 const screenshotUrl = async ({ url }: ScreenshotArgs) => {
-
-  console.log("SCREENSHOTURL")
   const localChromiumPath = await getLocalChromiumPath()
-  console.log("SCREENSHOTURL.LOCALCHROMIUMPATH", localChromiumPath)
   const browser = await chromium.launch({
     executablePath:
       process.env.NODE_ENV !== "development"

diff --git a/apps/backend/src/lib/auth.ts b/apps/backend/src/lib/auth.ts
@@ -26,7 +26,9 @@ export async function getUserId(c: Context) {
       = process.env.NODE_ENV !== "production"
         ? "authjs.session-token"
         : "__Secure-authjs.session-token"
+
     const cookieValue = getCookie(c, cookieName)!
+
     debug("Parsing cookies", { cookieName, cookieValue })
 
     const session = await getSession(cookieValue)

diff --git a/apps/backend/src/routes/feed/index.ts b/apps/backend/src/routes/feed/index.ts
@@ -7,7 +7,7 @@ import { feedQueue } from "../../plugins/queue.js"
 
 const api = new Hono()
 
-api.get("/", async (c) => {
+api.get("/", (c) => {
   try {
     const queueList = feedQueue.getQueue()
 

diff --git a/apps/web/src/lib/components/bookmark-row/BookmarkRow.svelte b/apps/web/src/lib/components/bookmark-row/BookmarkRow.svelte
@@ -51,7 +51,7 @@
 
   const imageUrl = $derived.by(() => {
     if (bookmark.image) {
-      return `${PUBLIC_WORKER_URL}/img/s_260x144/${bookmark.image}`
+      return `${PUBLIC_WORKER_URL}/img/s_260x144,pos_top/${bookmark.image}`
     } else {
       return `${PUBLIC_WORKER_URL}/img/_/https://picsum.photos/seed/${btoa(bookmark.url).substring(0, 16)}/256/144.webp`
     }

diff --git a/apps/web/src/routes/api/v1/bookmarks/+server.ts b/apps/web/src/routes/api/v1/bookmarks/+server.ts
@@ -92,19 +92,16 @@ export const POST: RequestHandler = async (event) => {
       skipDuplicates: true,
     })
 
-    console.log("BACKEND.HEADERS", event.request.headers)
     // Add bookmark to queue for fetching screenshot
     if (PUBLIC_WORKER_URL) {
-      const res = await event.fetch(`${PUBLIC_WORKER_URL}/v1/bookmark`, {
+      await event.fetch(`${PUBLIC_WORKER_URL}/v1/bookmark`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
           "cookie": event.request.headers.get("cookie") ?? ""
         },
         body: JSON.stringify({ data: bookmarkData.filter((bookmark) => !bookmark.image) }),
       })
-      const resText = await res.text()
-      console.log('POST TO BACKEND /BOOKMARKS.RESPONS', { res, resText })
     }
 
     return json({ data: upsertResponse, bookmarkData })

diff --git a/apps/web/src/routes/settings/+page.server.ts b/apps/web/src/routes/settings/+page.server.ts
@@ -36,10 +36,11 @@ export const actions: Actions = {
         return fail(400, { type: "error", message: "Feed URL Required" })
       }
 
-      const feedRes = await fetch(`${PUBLIC_WORKER_URL}/v1/feed`, {
+      const feedRes = await event.fetch(`${PUBLIC_WORKER_URL}/v1/feed`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
+          "cookie": event.request.headers.get("cookie") ?? ""
         },
         body: JSON.stringify({
           feedUrl,