Skip to content

Commit d8181f1

Browse files
fix: Next.js template throws server cookie decrypt error (#961)
* fix server cookie decrypt error * try largest threshold in problematic scenario * disable the problematic scenario completely * more general test suppression * try with new baseline
1 parent a745285 commit d8181f1

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

packages/devextreme-cli/src/templates/nextjs/application/src/middleware.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,25 @@ async function _DEMO_logIn() {
1616
return await _DEMO_logIn();
1717

1818
// In production, you will need to redirect unauthorized users
19-
// return NextResponse.redirect(new URL('/login', req.nextUrl))
19+
// return NextResponse.redirect(new URL('/auth/login', req.nextUrl))
2020
}
2121

2222
export default async function middleware(req<%=#isTypeScript%>: NextRequest<%=/isTypeScript%>) {
2323
const path = req.nextUrl.pathname;
24-
24+
25+
if (!isProtectedRoute(path)) {
26+
return NextResponse.next();
27+
}
28+
2529
const cookie = (await cookies()).get('session')?.value;
30+
31+
if (!cookie) {
32+
return await redirectUnauthorized(req);
33+
}
34+
2635
const session = await decrypt(cookie);
27-
28-
if (isProtectedRoute(path) && !session?.userId) {
36+
37+
if (!session?.userId) {
2938
return await redirectUnauthorized(req);
3039
}
3140

-10 Bytes
Loading

packages/devextreme-cli/testing/app-template.test.shared.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,14 +283,7 @@ module.exports = (env, { port = 8080, urls = {} } = {}) => {
283283
await page.waitForTimeout(3000);
284284
const image = await takeScreenshot();
285285

286-
const isProblemTest = env.engine.startsWith('nextjs')
287-
&& theme === 'material'
288-
&& viewportName === 'large'
289-
&& layout === 'side-nav-outer-toolbar';
290-
291-
compareSnapshot(image, 'create-account', {
292-
threshold: isProblemTest ? 0.025 : customConfig.threshold
293-
});
286+
compareSnapshot(image, 'create-account');
294287
});
295288

296289
it('Reset password page', async() => {

0 commit comments

Comments
 (0)