=> {
diff --git a/tests/fixtures/test-app/next-env.d.ts b/tests/fixtures/test-app/next-env.d.ts
index 9bc3dd46b..4f11a03dc 100644
--- a/tests/fixtures/test-app/next-env.d.ts
+++ b/tests/fixtures/test-app/next-env.d.ts
@@ -1,5 +1,4 @@
///
-///
///
// NOTE: This file should not be edited
diff --git a/tests/fixtures/test-app/pages/protected.tsx b/tests/fixtures/test-app/pages/protected.tsx
index 3f70a72b4..c2867745f 100644
--- a/tests/fixtures/test-app/pages/protected.tsx
+++ b/tests/fixtures/test-app/pages/protected.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { NextPageContext } from 'next';
-export default function protectedPage(): React.ReactElement {
- return Protected Page
;
+export default function protectedPage({ user }: { user?: { sub: string } }): React.ReactElement {
+ return Protected Page {user ? user.sub : ''}
;
}
export const getServerSideProps = (ctx: NextPageContext): any => (global as any).withPageAuthRequired()(ctx);
diff --git a/tests/fixtures/test-app/pages/wrapped-get-server-side-props.tsx b/tests/fixtures/test-app/pages/wrapped-get-server-side-props.tsx
new file mode 100644
index 000000000..338682498
--- /dev/null
+++ b/tests/fixtures/test-app/pages/wrapped-get-server-side-props.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { NextPageContext } from 'next';
+
+export default function wrappedGetServerSidePropsPage({
+ isAuthenticated
+}: {
+ isAuthenticated?: boolean;
+}): React.ReactElement {
+ return isAuthenticated: {String(isAuthenticated)}
;
+}
+
+export const getServerSideProps = (_ctx: NextPageContext): any =>
+ (global as any).getServerSidePropsWrapper(async (ctx: NextPageContext) => {
+ const session = (global as any).getSession(ctx.req, ctx.res);
+ const asyncProps = (global as any).asyncProps;
+ const props = { isAuthenticated: !!session };
+ return { props: asyncProps ? Promise.resolve(props) : props };
+ })(_ctx);
diff --git a/tests/helpers/get-server-side-props-wrapper.test.ts b/tests/helpers/get-server-side-props-wrapper.test.ts
new file mode 100644
index 000000000..82a0ca13b
--- /dev/null
+++ b/tests/helpers/get-server-side-props-wrapper.test.ts
@@ -0,0 +1,53 @@
+import { login, setup, teardown } from '../fixtures/setup';
+import { withoutApi } from '../fixtures/default-settings';
+import { get } from '../auth0-session/fixtures/helpers';
+
+describe('get-server-side-props-wrapper', () => {
+ afterEach(teardown);
+
+ test('wrap getServerSideProps', async () => {
+ const baseUrl = await setup(withoutApi);
+
+ const {
+ res: { statusCode },
+ data
+ } = await get(baseUrl, '/wrapped-get-server-side-props', { fullResponse: true });
+ expect(statusCode).toBe(200);
+ expect(data).toMatch(/isAuthenticated: .*false/);
+ });
+
+ test('wrap getServerSideProps with session', async () => {
+ const baseUrl = await setup(withoutApi);
+ const cookieJar = await login(baseUrl);
+
+ const {
+ res: { statusCode },
+ data
+ } = await get(baseUrl, '/wrapped-get-server-side-props', { fullResponse: true, cookieJar });
+ expect(statusCode).toBe(200);
+ expect(data).toMatch(/isAuthenticated: .*true/);
+ });
+
+ test('wrap getServerSideProps with async props', async () => {
+ const baseUrl = await setup(withoutApi, { asyncProps: true });
+
+ const {
+ res: { statusCode },
+ data
+ } = await get(baseUrl, '/wrapped-get-server-side-props', { fullResponse: true });
+ expect(statusCode).toBe(200);
+ expect(data).toMatch(/isAuthenticated: .*false/);
+ });
+
+ test('wrap getServerSideProps with async props and session', async () => {
+ const baseUrl = await setup(withoutApi, { asyncProps: true });
+ const cookieJar = await login(baseUrl);
+
+ const {
+ res: { statusCode },
+ data
+ } = await get(baseUrl, '/wrapped-get-server-side-props', { fullResponse: true, cookieJar });
+ expect(statusCode).toBe(200);
+ expect(data).toMatch(/isAuthenticated: .*true/);
+ });
+});
diff --git a/tests/helpers/with-page-auth-required.test.ts b/tests/helpers/with-page-auth-required.test.ts
index 4fbb403b3..4dee56cfd 100644
--- a/tests/helpers/with-page-auth-required.test.ts
+++ b/tests/helpers/with-page-auth-required.test.ts
@@ -24,7 +24,7 @@ describe('with-page-auth-required ssr', () => {
data
} = await get(baseUrl, '/protected', { cookieJar, fullResponse: true });
expect(statusCode).toBe(200);
- expect(data).toMatch(/Protected Page<\/div>/);
+ expect(data).toMatch(/Protected Page.*__test_sub__/);
});
test('accept a custom returnTo url', async () => {
@@ -80,4 +80,24 @@ describe('with-page-auth-required ssr', () => {
const url = new URL(headers.location, baseUrl);
expect(url.searchParams.get('returnTo')).toEqual('/foo?bar=baz&qux=quux');
});
+
+ test('allow access to a page with a valid session and async props', async () => {
+ const baseUrl = await setup(withoutApi, {
+ withPageAuthRequiredOptions: {
+ getServerSideProps() {
+ return Promise.resolve({ props: Promise.resolve({}) });
+ }
+ }
+ });
+ const cookieJar = await login(baseUrl);
+
+ const {
+ res: { statusCode, headers },
+ data
+ } = await get(baseUrl, '/protected', { cookieJar, fullResponse: true });
+ expect(statusCode).toBe(200);
+ expect(data).toMatch(/Protected Page.*__test_sub__/);
+ const [cookie] = headers['set-cookie'];
+ expect(cookie).toMatch(/^appSession=/);
+ });
});
diff --git a/tests/session/cache.test.ts b/tests/session/cache.test.ts
index 0aa3cfc25..903923529 100644
--- a/tests/session/cache.test.ts
+++ b/tests/session/cache.test.ts
@@ -32,7 +32,7 @@ describe('SessionCache', () => {
test('should create the session entry', () => {
cache.create(req, res, session);
expect(cache.get(req, res)).toEqual(session);
- expect(cookieStore.save).toHaveBeenCalledWith(req, res, session);
+ expect(cookieStore.save).toHaveBeenCalledWith(req, res, session, undefined);
});
test('should delete the session entry', () => {