1
0
mirror of https://github.com/sasjs/server.git synced 2026-01-14 01:10:05 +00:00

Merge branch 'issue16-session' of github.com:sasjs/server into issue16-session

Conflicts:
	src/routes/index.ts
	src/utils/upload.ts
This commit is contained in:
Mihajlo Medjedovic
2021-10-15 12:57:20 +00:00
4 changed files with 23 additions and 13 deletions

View File

@@ -1,9 +1,19 @@
import express from 'express'
import { createFileTree, getSessionController, getTreeExample } from '../controllers'
import {
createFileTree,
getSessionController,
getTreeExample
} from '../controllers'
import { ExecutionResult, isRequestQuery, isFileTree } from '../types'
import path from 'path'
import { addExtensionIfNotFound, getTmpFilesFolderPath, getTmpFolderPath, makeFilesNamesMap } from '../utils'
import {
addExtensionIfNotFound,
getTmpFilesFolderPath,
getTmpFolderPath,
makeFilesNamesMap
} from '../utils'
import { ExecutionController, FileUploadController } from '../controllers'
import { uuidv4 } from '@sasjs/utils'
const router = express.Router()
@@ -51,7 +61,7 @@ router.get('/SASjsExecutor/do', async (req, res) => {
let sasCodePath = path
.join(getTmpFilesFolderPath(), req.query._program)
.replace(new RegExp('/', 'g'), path.sep)
// If no extension provided, add .sas extension
sasCodePath += !sasCodePath.includes('.') ? '.sas' : ''