Skip to content

Commit a290cc0

Browse files
committed
just boolean
1 parent 2256e3f commit a290cc0

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

Diff for: packages/next/src/server/lib/router-server.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ export async function initialize(opts: {
325325

326326
// handle hot-reloader first
327327
if (developmentBundler) {
328-
if (blockCrossSite(req, res, allowedOrigins, `${opts.port}`).finished) {
328+
if (blockCrossSite(req, res, allowedOrigins, `${opts.port}`)) {
329329
return
330330
}
331331
const origUrl = req.url || '/'
@@ -691,9 +691,7 @@ export async function initialize(opts: {
691691
})
692692

693693
if (opts.dev && developmentBundler && req.url) {
694-
if (
695-
blockCrossSite(req, socket, allowedOrigins, `${opts.port}`).finished
696-
) {
694+
if (blockCrossSite(req, socket, allowedOrigins, `${opts.port}`)) {
697695
return
698696
}
699697
const { basePath, assetPrefix } = config

Diff for: packages/next/src/server/lib/router-utils/block-cross-site.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ export const blockCrossSite = (
88
res: ServerResponse | Duplex,
99
allowedOrigins: string[],
1010
activePort: string
11-
): {
12-
finished?: boolean
13-
} => {
11+
): boolean => {
1412
// only process _next URLs
1513
if (!req.url?.includes('/_next')) {
16-
return {}
14+
return false
1715
}
1816
// block non-cors request from cross-site e.g. script tag on
1917
// different host
@@ -25,9 +23,7 @@ export const blockCrossSite = (
2523
res.statusCode = 403
2624
}
2725
res.end('Unauthorized')
28-
return {
29-
finished: true,
30-
}
26+
return true
3127
}
3228

3329
// ensure websocket requests from allowed origin
@@ -54,12 +50,10 @@ export const blockCrossSite = (
5450
res.statusCode = 403
5551
}
5652
res.end('Unauthorized')
57-
return {
58-
finished: true,
59-
}
53+
return true
6054
}
6155
}
6256
}
6357

64-
return {}
58+
return false
6559
}

0 commit comments

Comments
 (0)