fix issues from test deploy

src/app/auth/resource/[resourceId]/components/AccessToken.tsx

@@ -0,0 +1,84 @@
+"use client";
+
+import { createApiClient } from "@app/api";
+import { Button } from "@app/components/ui/button";
+import {
+    Card,
+    CardContent,
+    CardFooter,
+    CardHeader,
+    CardTitle
+} from "@app/components/ui/card";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+import { AuthWithAccessTokenResponse } from "@server/routers/resource";
+import { AxiosResponse } from "axios";
+import { Loader2 } from "lucide-react";
+import Link from "next/link";
+import { useEffect, useState } from "react";
+
+type AccessTokenProps = {
+    accessTokenId: string | undefined;
+    accessToken: string | undefined;
+    resourceId: number;
+    redirectUrl: string;
+};
+
+export default function AccessToken({
+    accessTokenId,
+    accessToken,
+    resourceId,
+    redirectUrl
+}: AccessTokenProps) {
+    const [loading, setLoading] = useState(true);
+
+    const api = createApiClient(useEnvContext());
+
+    useEffect(() => {
+        if (!accessTokenId || !accessToken) {
+            setLoading(false);
+            return;
+        }
+
+        async function check() {
+            try {
+                const res = await api.post<
+                    AxiosResponse<AuthWithAccessTokenResponse>
+                >(`/auth/resource/${resourceId}/access-token`, {
+                    accessToken,
+                    accessTokenId
+                });
+
+                if (res.data.data.session) {
+                    window.location.href = redirectUrl;
+                }
+            } catch (e) {
+                console.error("Error checking access token", e);
+            } finally {
+                setLoading(false);
+            }
+        }
+
+        check();
+    }, [accessTokenId, accessToken]);
+
+    return loading ? (
+        <div></div>
+    ) : (
+        <Card className="w-full max-w-md">
+            <CardHeader>
+                <CardTitle className="text-center text-2xl font-bold">
+                    Access URL Invalid
+                </CardTitle>
+            </CardHeader>
+            <CardContent>
+                This shared access URL is invalid. Please contact the resource
+                owner for a new URL.
+                <div className="text-center mt-4">
+                    <Button>
+                        <Link href="/">Go Home</Link>
+                    </Button>
+                </div>
+            </CardContent>
+        </Card>
+    );
+}

src/app/auth/resource/[resourceId]/components/AccessTokenInvalid.tsx

@@ -1,32 +0,0 @@
-"use client";
-
-import { Button } from "@app/components/ui/button";
-import {
-    Card,
-    CardContent,
-    CardFooter,
-    CardHeader,
-    CardTitle
-} from "@app/components/ui/card";
-import Link from "next/link";
-
-export default function AccessTokenInvalid() {
-    return (
-        <Card className="w-full max-w-md">
-            <CardHeader>
-                <CardTitle className="text-center text-2xl font-bold">
-                    Acess URL Invalid
-                </CardTitle>
-            </CardHeader>
-            <CardContent>
-                This shared access URL is invalid. Please contact the resource
-                owner for a new URL.
-                <div className="text-center mt-4">
-                    <Button>
-                        <Link href="/">Go Home</Link>
-                    </Button>
-                </div>
-            </CardContent>
-        </Card>
-    );
-}

src/app/auth/resource/[resourceId]/page.tsx

@@ -14,7 +14,8 @@ import ResourceNotFound from "./components/ResourceNotFound";
 import ResourceAccessDenied from "./components/ResourceAccessDenied";
 import { cookies } from "next/headers";
 import { CheckResourceSessionResponse } from "@server/routers/auth";
-import AccessTokenInvalid from "./components/AccessTokenInvalid";
+import AccessTokenInvalid from "./components/AccessToken";
+import AccessToken from "./components/AccessToken";
 
 export default async function ResourceAuthPage(props: {
     params: Promise<{ resourceId: number }>;
@@ -50,35 +51,6 @@ export default async function ResourceAuthPage(props: {
 
     const redirectUrl = searchParams.redirect || authInfo.url;
 
-    if (searchParams.token) {
-        let doRedirect = false;
-        try {
-            const res = await internal.post<
-                AxiosResponse<AuthWithAccessTokenResponse>
-            >(
-                `/auth/resource/${params.resourceId}/access-token`,
-                {
-                    accessToken: searchParams.token
-                },
-                await authCookieHeader()
-            );
-
-            if (res.data.data.session) {
-                doRedirect = true;
-            }
-        } catch (e) {
-            return (
-                <div className="w-full max-w-md">
-                    <AccessTokenInvalid />
-                </div>
-            );
-        }
-
-        if (doRedirect) {
-            redirect(redirectUrl);
-        }
-    }
-
     const hasAuth =
         authInfo.password ||
         authInfo.pincode ||
@@ -146,6 +118,20 @@ export default async function ResourceAuthPage(props: {
         }
     }
 
+    if (searchParams.token) {
+        const [accessTokenId, accessToken] = searchParams.token.split(".");
+        return (
+            <div className="w-full max-w-md">
+                <AccessToken
+                    accessToken={accessToken}
+                    accessTokenId={accessTokenId}
+                    resourceId={params.resourceId}
+                    redirectUrl={redirectUrl}
+                />
+            </div>
+        );
+    }
+
     return (
         <>
             {userIsUnauthorized && isSSOOnly ? (