sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2025-12-11 19:44:35 +00:00
Code Issues Projects Releases Wiki Activity

fix(appstream): redirect to relative + nested resource should be accessed

Browse Source
This commit is contained in:
Saad Jutt
2022-06-09 01:16:25 +05:00
parent ad82ee7106
commit 5ab35b02c4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/routes/appStream/index.ts
View File

@@ -2,11 +2,7 @@ import path from 'path'
import express, { Request } from 'express' import express, { Request } from 'express'
import { folderExists } from '@sasjs/utils' import { folderExists } from '@sasjs/utils'
import { import { addEntryToAppStreamConfig, getFilesFolder } from '../../utils'
addEntryToAppStreamConfig,
getFilesFolder,
getFullUrl
} from '../../utils'
import { appStreamHtml } from './appStreamHtml' import { appStreamHtml } from './appStreamHtml'
const appStreams: { [key: string]: string } = {} const appStreams: { [key: string]: string } = {}
@@ -73,14 +69,16 @@ export const publishAppStream = async (
router.get(`/*`, function (req: Request, res, next) { router.get(`/*`, function (req: Request, res, next) {
const reqPath = req.path.replace(/^\//, '') const reqPath = req.path.replace(/^\//, '')
// Redirecting to url with trailing slash for base appStream URL only // Redirecting to url with trailing slash for appStream base URL only
if (reqPath.split('/').length === 1 && !reqPath.endsWith('/')) if (reqPath.split('/').length === 1 && !reqPath.endsWith('/'))
return res.redirect(301, `${getFullUrl(req)}/`) // navigating to same url with slash at start
return res.redirect(301, `${reqPath}/`)
const appStream = reqPath.split('/')[0] const appStream = reqPath.split('/')[0]
const appStreamFilesPath = appStreams[appStream] const appStreamFilesPath = appStreams[appStream]
if (appStreamFilesPath) { if (appStreamFilesPath) {
const resourcePath = reqPath.split('/')[1] || 'index.html' // resourcePath is without appStream base path
const resourcePath = reqPath.split('/').slice(1).join('/') || 'index.html'
req.url = resourcePath req.url = resourcePath