Skip to content

Commit cc0eab9

Browse files
committed
fix authentication
1 parent 147989b commit cc0eab9

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

apps/seven/app/root.test.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ async function renderStub() {
1212
Component: () => (
1313
<Layout
1414
params={{}}
15-
loaderData={{ locale: 'en', content: {} as any, site: {} as any }}
15+
loaderData={{
16+
locale: 'en',
17+
content: {} as any,
18+
site: {} as any,
19+
isAuthenticated: false,
20+
}}
1621
matches={[{} as any]}
1722
>
1823
<p>Root Layout</p>
@@ -51,6 +56,7 @@ describe('loader', () => {
5156
method: () => ({
5257
getContent: getContentMock,
5358
getSite: getSiteMock,
59+
config: {},
5460
}),
5561
});
5662
const request = new Request('http://example.com');
@@ -78,6 +84,7 @@ describe('loader', () => {
7884
method: () => ({
7985
getContent: getContentMock,
8086
getSite: getSiteMock,
87+
config: {},
8188
}),
8289
});
8390
const request = new Request('http://example.com/test-content');
@@ -111,6 +118,7 @@ describe('loader', () => {
111118
method: () => ({
112119
getContent: getContentMock,
113120
getSite: getSiteMock,
121+
config: {},
114122
}),
115123
});
116124
const request = new Request('http://example.com');
@@ -137,6 +145,7 @@ describe('loader', () => {
137145
method: () => ({
138146
getContent: getContentMock,
139147
getSite: getSiteMock,
148+
config: {},
140149
}),
141150
});
142151
const request = new Request('http://example.com');

apps/seven/app/root.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
installServerMiddleware,
1313
otherResources,
1414
} from './middleware.server';
15+
import { getAuthFromRequest } from '@plone/react-router';
1516

1617
export const middleware = [
1718
installServerMiddleware,
@@ -23,6 +24,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
2324
const locale = await i18next.getLocale(request);
2425

2526
const expand = ['navroot', 'breadcrumbs', 'navigation', 'actions'];
27+
const token = await getAuthFromRequest(request);
2628

2729
const cli = config
2830
.getUtility({
@@ -31,6 +33,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
3133
})
3234
.method() as PloneClient;
3335

36+
cli.config.token = token;
37+
3438
const path = `/${params['*'] || ''}`;
3539

3640
const rootLoaderDataUtilities = config.getUtilities({
@@ -69,6 +73,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
6973
content: flattenToAppURL(content.data),
7074
site: flattenToAppURL(site.data),
7175
locale,
76+
isAuthenticated: !!token,
7277
...rootLoaderDataUtilitiesData
7378
.filter((item) => item)
7479
.reduce((acc, item) => ({ ...acc, ...item }), {}),

0 commit comments

Comments
 (0)