simplify authentication check/requirement

Author: hejmsdz

app/components/landing-page/dashboard-button.tsx

@@ -1,29 +1,19 @@
 import { Key } from "lucide-react";
 import { Button } from "~/components/ui/button";
-import { Link, useLoaderData } from "react-router";
-import type { loader } from "~/routes/_index";
+import { Link } from "react-router";
 
 const DashboardButton = () => {
-  const { isAuthenticated } = useLoaderData<typeof loader>();
-
   return (
     <Button
       size="lg"
       variant="outline"
       className="w-full sm:w-auto border-primary-foreground/30 text-primary-background hover:bg-primary-foreground/10 px-8 hover:text-primary-foreground"
       asChild
     >
-      {isAuthenticated ? (
-        <Link to={`/dashboard`}>
-          <Key className="w-4 h-4" />
-          Przejdź do panelu
-        </Link>
-      ) : (
-        <Link to={`/auth/google`}>
-          <Key className="w-4 h-4" />
-          Zaloguj się do panelu
-        </Link>
-      )}
+      <Link to="/dashboard">
+        <Key className="w-4 h-4" />
+        Zaloguj się do panelu
+      </Link>
     </Button>
   );
 };

app/routes/_index.tsx

@@ -1,10 +1,9 @@
 import { useLoaderData } from "react-router";
-import type { LoaderFunctionArgs, MetaFunction } from "react-router";
+import type { MetaFunction } from "react-router";
 import { randomUUID } from "crypto";
 import jwt from "jsonwebtoken";
 import { defaultApi } from "~/api/api";
 import { getBootstrap } from "~/api/bootstrap";
-import { getSession } from "~/session";
 import Hero from "~/components/landing-page/hero";
 import Features from "~/components/landing-page/features";
 import Screenshots from "~/components/landing-page/screenshots";
@@ -41,9 +40,8 @@ export default function Index() {
   );
 }
 
-export async function loader({ request }: LoaderFunctionArgs) {
+export async function loader() {
   const bootstrap = await getBootstrap(defaultApi);
-  const session = await getSession(request.headers.get("Cookie"));
 
   const hasWaitlist = Boolean(process.env.WAITLIST_API_URL);
   let formToken = "";
@@ -58,7 +56,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
   return {
     appDownloadUrl: bootstrap.appDownloadUrl,
     contactUrl: bootstrap.contactUrl,
-    isAuthenticated: Boolean(session.data?.accessToken),
     hasWaitlist,
     formToken,
   };

app/routes/dashboard._index.tsx

@@ -1,7 +1,7 @@
 import { LoaderFunctionArgs, redirect } from "react-router";
 import { getSongs } from "~/api/songs";
 import { SiteHeader } from "~/components/site-header";
-import { createAuthenticatedApi, requireSession } from "~/session";
+import { createAuthenticatedApi, requireSessionWithRefresh } from "~/session";
 
 export default function DashboardIndex() {
   return (
@@ -12,7 +12,7 @@ export default function DashboardIndex() {
 }
 
 export async function loader({ request }: LoaderFunctionArgs) {
-  const session = await requireSession(request);
+  const session = await requireSessionWithRefresh(request);
   const api = await createAuthenticatedApi(session);
 
   const currentTeamId = session.get("teamId") ?? "";