diff --git a/packages/gitbook/src/components/SitePage/SitePageNotFound.tsx b/packages/gitbook/src/components/SitePage/SitePageNotFound.tsx
index 94e394fc6..d6796c36e 100644
--- a/packages/gitbook/src/components/SitePage/SitePageNotFound.tsx
+++ b/packages/gitbook/src/components/SitePage/SitePageNotFound.tsx
@@ -22,6 +22,7 @@ import {
} from '../SpaceLayout/SpaceLayoutContext';
import { TrackPageViewEvent } from '@/components/Insights';
import { t, tString, useLanguage } from '@/intl/client';
+import { isVisitorAuthenticated } from '@/lib/adaptive';
import { tcls } from '@/lib/tailwind';
const RELATED_PAGES_COUNT = 5;
@@ -36,7 +37,7 @@ export function SitePageNotFound() {
const basePath = useSpaceBasePath();
const adaptiveAuthLoginHref = useSiteAdaptiveAuthLoginHref();
const siteIndexURL = useSiteIndexURL();
- const { siteSpaceId } = useCurrentContent();
+ const { siteSpaceId, visitorAuthClaims } = useCurrentContent();
const language = useLanguage();
const router = useRouter();
const searchParams = useSearchParams();
@@ -44,6 +45,13 @@ export function SitePageNotFound() {
const setSearchState = useSetSearchState();
const { assistants } = useAI();
+ const isAuthenticated = isVisitorAuthenticated(visitorAuthClaims);
+ const [titleKey, messageKey] = !adaptiveAuthLoginHref
+ ? (['notfound_title', 'notfound'] as const)
+ : isAuthenticated
+ ? (['notfound_adaptive_no_access_title', 'notfound_adaptive_no_access'] as const)
+ : (['notfound_adaptive_title', 'notfound_adaptive'] as const);
+
// Show the assistant input when a non-search assistant is available (i.e. not just ask-AI).
const assistant = assistants.find((candidate) => candidate.mode !== 'search') ?? null;
const inputLabel = tString(language, assistant ? 'search_or_ask' : 'search');
@@ -124,21 +132,20 @@ export function SitePageNotFound() {
'text-tint-strong'
)}
>
- {t(
- language,
- adaptiveAuthLoginHref
- ? 'notfound_adaptive_title'
- : 'notfound_title'
- )}
+ {t(language, titleKey)}
- {t(
- language,
- adaptiveAuthLoginHref ? 'notfound_adaptive' : 'notfound'
- )}
+ {t(language, messageKey)}
- {adaptiveAuthLoginHref ? (
+ {adaptiveAuthLoginHref && isAuthenticated ? (
+ // Re-running login refreshes the visitor's claims, e.g. after a role change.
+
+ ) : adaptiveAuthLoginHref ? (
{
+ it('is false without claims', () => {
+ expect(isVisitorAuthenticated({})).toBe(false);
+ });
+
+ it('is false with only unsigned claims', () => {
+ expect(isVisitorAuthenticated({ unsigned: { plan: 'free' } })).toBe(false);
+ });
+
+ it('is true with signed claims', () => {
+ expect(isVisitorAuthenticated({ role: 'admin', unsigned: {} })).toBe(true);
+ });
+});
diff --git a/packages/gitbook/src/lib/adaptive.ts b/packages/gitbook/src/lib/adaptive.ts
index 5152d58a7..5be4613c0 100644
--- a/packages/gitbook/src/lib/adaptive.ts
+++ b/packages/gitbook/src/lib/adaptive.ts
@@ -24,3 +24,10 @@ export function getVisitorAuthClaims(siteData: SiteURLData): VisitorAuthClaims {
export function getVisitorAuthClaimsFromToken(token: SiteAPIToken): VisitorAuthClaims {
return token.claims ?? {};
}
+
+/**
+ * Whether the visitor is authenticated, i.e. has claims beyond the unsigned ones anyone can set.
+ */
+export function isVisitorAuthenticated(claims: VisitorAuthClaims): boolean {
+ return Object.keys(claims).some((key) => key !== 'unsigned');
+}