LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Merge pull request #831 from jessopb/fourOhFourCode

Browse source 
app sends 404 code for /fallback and failing canonical
This commit is contained in:
Shawn K 2018-12-17 19:53:19 -06:00 committed by GitHub
commit 8ed5e0f275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/render/handleShowRender.jsx
View file

@ -49,9 +49,12 @@ export default (req, res) => {
action = false,
saga = false,
} = httpContext.get('routeData');
if (action === 'fallback') {
res.status(404);
}
const runSaga = (action !== false && saga !== false);
const renderPage = (store) => {
// Workaround, remove when a solution for async httpContext exists
@ -63,10 +66,10 @@ export default (req, res) => {
} else {
const channelKeys = Object.keys(showState.channelList);
if(channelKeys.length !== 0) {
if (channelKeys.length !== 0) {
res.claimId = showState.channelList[channelKeys[0]].longId;
res.isChannel = true;
}
}
}
// render component to a string
@ -115,10 +118,16 @@ export default (req, res) => {
.then(() => {
// redirect if request does not use canonical url
const canonicalUrl = getCanonicalUrlFromShow(store.getState().show);
if (!canonicalUrl) {
res.status(404);
}
if (canonicalUrl && canonicalUrl !== req.originalUrl) {
console.log(`redirecting ${req.originalUrl} to ${canonicalUrl}`);
res.redirect(canonicalUrl);
}
return renderPage(store)
});
} else {