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

chore: added check session + code refactor

Browse Source
This commit is contained in:
Saad Jutt
2021-12-05 08:17:54 +05:00
parent a80e5c8ead
commit 43545fa04b
14 changed files with 123 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/controllers/index.ts
View File

@@ -4,3 +4,4 @@ export * from './drive'
export * from './group'
export * from './stp'
export * from './user'
export * from './session'

22
api/src/controllers/internal/Execution.ts
View File

@@ -100,26 +100,20 @@ ${program}`
const debugValue =
typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug
let debugResponse: string | undefined
if ((debugValue && debugValue >= 131) || session.crashed) {
debugResponse = `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
}
session.inUse = false
sessionController.deleteSession(session)
if (returnJson) {
const response: any = {
webout: webout
return {
webout,
log:
(debugValue && debugValue >= 131) || session.crashed ? log : undefined
}
if ((debugValue && debugValue >= 131) || session.crashed) {
response.log = log
}
return response
}
return debugResponse ?? webout
return (debugValue && debugValue >= 131) || session.crashed
? `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
: webout
}
buildDirectorytree() {

30
api/src/controllers/session.ts Normal file
View File

@@ -0,0 +1,30 @@
import express from 'express'
import { Request, Security, Route, Tags, Example, Get } from 'tsoa'
import { UserResponse } from './user'
@Security('bearerAuth')
@Route('SASjsApi/session')
@Tags('Session')
export class SessionController {
/**
* @summary Get session info (username).
*
*/
@Example<UserResponse>({
id: 123,
username: 'johnusername',
displayName: 'John'
})
@Get('/')
public async session(
@Request() request: express.Request
): Promise<UserResponse> {
return session(request)
}
}
const session = (req: any) => ({
id: req.user.id,
username: req.user.username,
displayName: req.user.displayName
})

24
api/src/controllers/stp.ts
View File

@@ -1,16 +1,6 @@
import express, { response } from 'express'
import express from 'express'
import path from 'path'
import {
Request,
Security,
Route,
Tags,
Example,
Post,
Body,
Get,
Query
} from 'tsoa'
import { Request, Security, Route, Tags, Post, Body, Get, Query } from 'tsoa'
import { ExecutionController } from './internal'
import { PreProgramVars } from '../types'
import { getTmpFilesFolderPath, makeFilesNamesMap } from '../utils'
@@ -24,8 +14,8 @@ interface ExecuteReturnJsonPayload {
}
interface ExecuteReturnJsonResponse {
status: string
_webout: string
log?: string
_webout?: string
message?: string
}
@@ -111,17 +101,17 @@ const executeReturnJson = async (
const filesNamesMap = req.files?.length ? makeFilesNamesMap(req.files) : null
try {
const jsonResult: any = await new ExecutionController().execute(
const { webout, log } = (await new ExecutionController().execute(
sasCodePath,
getPreProgramVariables(req),
{ ...req.query, ...req.body },
{ filesNamesMap: filesNamesMap },
true
)
)) as { webout: string; log: string }
return {
status: 'success',
_webout: jsonResult.webout,
log: jsonResult.log
_webout: webout,
log
}
} catch (err: any) {
throw {