diff --git a/packages/frontpage/.gitignore b/packages/frontpage/.gitignore index 1dd45b2..fd3dbb5 100644 --- a/packages/frontpage/.gitignore +++ b/packages/frontpage/.gitignore @@ -34,6 +34,3 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts - -# Sentry Config File -.env.sentry-build-plugin diff --git a/packages/frontpage/app/global-error.tsx b/packages/frontpage/app/global-error.tsx deleted file mode 100644 index 4f9c8a9..0000000 --- a/packages/frontpage/app/global-error.tsx +++ /dev/null @@ -1,27 +0,0 @@ -"use client"; - -import * as Sentry from "@sentry/nextjs"; -import NextError from "next/error"; -import { useEffect } from "react"; - -export default function GlobalError({ - error, -}: { - error: Error & { digest?: string }; -}) { - useEffect(() => { - Sentry.captureException(error); - }, [error]); - - return ( - - - {/* `NextError` is the default Next.js error page component. Its type - definition requires a `statusCode` prop. However, since the App Router - does not expose status codes for errors, we simply pass 0 to render a - generic error message. */} - - - - ); -} diff --git a/packages/frontpage/lib/auth.ts b/packages/frontpage/lib/auth.ts index ba161a0..9e0fa7a 100644 --- a/packages/frontpage/lib/auth.ts +++ b/packages/frontpage/lib/auth.ts @@ -31,7 +31,6 @@ import { db } from "./db"; import * as schema from "./schema"; import { eq } from "drizzle-orm"; import { getDidFromHandleOrDid } from "./data/atproto/identity"; -import { startSpan } from "@sentry/nextjs"; const USER_AGENT = "appview/@frontpage.fyi (@tom-sherman.com)"; @@ -383,39 +382,37 @@ export async function signOut() { .where(eq(schema.OauthSession.sessionId, session.user.sessionId)); } -export const getSession = cache(() => - startSpan({ name: "getSession" }, async () => { - const tokenCookie = (await cookies()).get(AUTH_COOKIE_NAME); - if (!tokenCookie) { - return null; - } +export const getSession = cache(async () => { + const tokenCookie = (await cookies()).get(AUTH_COOKIE_NAME); + if (!tokenCookie) { + return null; + } - let token; - try { - token = await jwtVerify(tokenCookie.value, await getPublicJwk()); - } catch (e) { - console.error("Failed to verify token", e); - return null; - } + let token; + try { + token = await jwtVerify(tokenCookie.value, await getPublicJwk()); + } catch (e) { + console.error("Failed to verify token", e); + return null; + } - if (!token.payload.jti) { - return null; - } + if (!token.payload.jti) { + return null; + } - const [session] = await db - .select() - .from(schema.OauthSession) - .where(eq(schema.OauthSession.sessionId, Number(token.payload.jti))); + const [session] = await db + .select() + .from(schema.OauthSession) + .where(eq(schema.OauthSession.sessionId, Number(token.payload.jti))); - if (!session) { - return null; - } + if (!session) { + return null; + } - return { - user: session, - }; - }), -); + return { + user: session, + }; +}); export async function importDpopJwks({ privateJwk, diff --git a/turbo.json b/turbo.json index 2156a5a..3567ce5 100644 --- a/turbo.json +++ b/turbo.json @@ -16,11 +16,7 @@ "VERCEL_ENV", "CRON_SECRET", "NEXT_RUNTIME", - "SENTRY_AUTH_TOKEN", "VERCEL_GIT_COMMIT_SHA", - "SENTRY_PROJECT", - "SENTRY_ORG", - "NEXT_PUBLIC_SENTRY_DSN", "PLC_DIRECTORY_URL" ] },