sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-07 06:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88 from sasjs/quick-fix

Browse Source 
fix: web index js script included
This commit is contained in:
Allan Bowe
2022-03-17 11:55:03 +02:00
committed by GitHub
parent 1beac914db a45b42107e
commit 02a242fe4b
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/app.ts
View File

@@ -31,7 +31,6 @@ app.use(cookieParser())
app.use(morgan('tiny')) app.use(morgan('tiny'))
app.use(express.json({ limit: '50mb' })) app.use(express.json({ limit: '50mb' }))
app.use(express.static(path.join(__dirname, '../public'))) app.use(express.static(path.join(__dirname, '../public')))
app.use(express.static(getWebBuildFolderPath()))
const onError: ErrorRequestHandler = (err, req, res, next) => { const onError: ErrorRequestHandler = (err, req, res, next) => {
console.error(err.stack) console.error(err.stack)
@@ -44,6 +43,10 @@ export default setProcessVariables().then(async () => {
const { setupRoutes } = await import('./routes/setupRoutes') const { setupRoutes } = await import('./routes/setupRoutes')
setupRoutes(app) setupRoutes(app)
// should be served after setting up web route
// index.html needs to be injected with some js script.
app.use(express.static(getWebBuildFolderPath()))
console.log('sasJSCoreMacros', sasJSCoreMacros) console.log('sasJSCoreMacros', sasJSCoreMacros)
app.use(onError) app.use(onError)

8
api/src/routes/api/drive.ts
View File

@@ -40,7 +40,7 @@ driveRouter.get('/file', async (req, res) => {
const { error: errQ, value: query } = fileParamValidation(req.query) const { error: errQ, value: query } = fileParamValidation(req.query)
const { error: errB, value: body } = fileBodyValidation(req.body) const { error: errB, value: body } = fileBodyValidation(req.body)
if (errQ && errB) return res.status(400).send(errB.details[0].message) if (errQ && errB) return res.status(400).send(errQ.details[0].message)
try { try {
await controller.getFile(req, query._filePath, body.filePath) await controller.getFile(req, query._filePath, body.filePath)
@@ -53,7 +53,7 @@ driveRouter.delete('/file', async (req, res) => {
const { error: errQ, value: query } = fileParamValidation(req.query) const { error: errQ, value: query } = fileParamValidation(req.query)
const { error: errB, value: body } = fileBodyValidation(req.body) const { error: errB, value: body } = fileBodyValidation(req.body)
if (errQ && errB) return res.status(400).send(errB.details[0].message) if (errQ && errB) return res.status(400).send(errQ.details[0].message)
try { try {
const response = await controller.deleteFile(query._filePath, body.filePath) const response = await controller.deleteFile(query._filePath, body.filePath)
@@ -72,7 +72,7 @@ driveRouter.post(
if (errQ && errB) { if (errQ && errB) {
if (req.file) await deleteFile(req.file.path) if (req.file) await deleteFile(req.file.path)
return res.status(400).send(errB.details[0].message) return res.status(400).send(errQ.details[0].message)
} }
if (!req.file) return res.status(400).send('"file" is not present.') if (!req.file) return res.status(400).send('"file" is not present.')
@@ -100,7 +100,7 @@ driveRouter.patch(
if (errQ && errB) { if (errQ && errB) {
if (req.file) await deleteFile(req.file.path) if (req.file) await deleteFile(req.file.path)
return res.status(400).send(errB.details[0].message) return res.status(400).send(errQ.details[0].message)
} }
if (!req.file) return res.status(400).send('"file" is not present.') if (!req.file) return res.status(400).send('"file" is not present.')

12
api/src/routes/api/spec/drive.spec.ts
View File

@@ -260,7 +260,7 @@ describe('files', () => {
.attach('file', fileToAttachPath) .attach('file', fileToAttachPath)
.expect(400) .expect(400)
expect(res.text).toEqual(`"filePath" is required`) expect(res.text).toEqual(`"_filePath" is required`)
expect(res.body).toEqual({}) expect(res.body).toEqual({})
}) })
@@ -269,9 +269,9 @@ describe('files', () => {
const pathToUpload = '/my/path/code.oth' const pathToUpload = '/my/path/code.oth'
const res = await request(app) const res = await request(app)
.post('/SASjsApi/drive/file') .post(`/SASjsApi/drive/file?_filePath=${pathToUpload}`)
.auth(accessToken, { type: 'bearer' }) .auth(accessToken, { type: 'bearer' })
.field('filePath', pathToUpload) // .field('filePath', pathToUpload)
.attach('file', fileToAttachPath) .attach('file', fileToAttachPath)
.expect(400) .expect(400)
@@ -420,7 +420,7 @@ describe('files', () => {
.attach('file', fileToAttachPath) .attach('file', fileToAttachPath)
.expect(400) .expect(400)
expect(res.text).toEqual(`"filePath" is required`) expect(res.text).toEqual(`"_filePath" is required`)
expect(res.body).toEqual({}) expect(res.body).toEqual({})
}) })
@@ -429,9 +429,9 @@ describe('files', () => {
const pathToUpload = '/my/path/code.oth' const pathToUpload = '/my/path/code.oth'
const res = await request(app) const res = await request(app)
.patch('/SASjsApi/drive/file') .patch(`/SASjsApi/drive/file?_filePath=${pathToUpload}`)
.auth(accessToken, { type: 'bearer' }) .auth(accessToken, { type: 'bearer' })
.field('filePath', pathToUpload) // .field('filePath', pathToUpload)
.attach('file', fileToAttachPath) .attach('file', fileToAttachPath)
.expect(400) .expect(400)