Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

added errorRedirect to middleware opts #960

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion runtime/src/server/middleware/get_page_handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import App from '@sapper/internal/App.svelte';

export function get_page_handler(
manifest: Manifest,
session_getter: (req: Req, res: Res) => any
session_getter: (req: Req, res: Res) => any,
errorRedirect: any
) {
const get_build_info = dev
? () => JSON.parse(fs.readFileSync(path.join(build_dir, 'build.json'), 'utf-8'))
Expand Down Expand Up @@ -187,6 +188,21 @@ export function get_page_handler(
preload_error = { statusCode: 500, message: err };
preloaded = []; // appease TypeScript
}

// TODO validate location path against available routes
// TODO right now if location path doesn't exist, infinite redirects occur
try {
if (errorRedirect) {
const { errorStatusCode = 404, statusCode = 301, location = '/' } = errorRedirect;
const errStatusCode = (typeof errorStatusCode === 'number' || typeof errorStatusCode === 'string') ?
[Number(errorStatusCode)] : errorStatusCode.map(v => Number(v));
if (~errStatusCode.indexOf(status)) {
redirect = { statusCode: statusCode, location: location }
}
}
} catch (err) {
console.log(err)
}

try {
if (redirect) {
Expand Down
7 changes: 4 additions & 3 deletions runtime/src/server/middleware/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { lookup } from './mime';

export default function middleware(opts: {
session?: (req: Req, res: Res) => any,
ignore?: any
ignore?: any,
errorRedirect?:any
} = {}) {
const { session, ignore } = opts;
const { session, ignore, errorRedirect } = opts;

let emitted_basepath = false;

Expand Down Expand Up @@ -61,7 +62,7 @@ export default function middleware(opts: {

get_server_route_handler(manifest.server_routes),

get_page_handler(manifest, session || noop)
get_page_handler(manifest, session || noop, errorRedirect)
].filter(Boolean));
}

Expand Down