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

Merge pull request #132 from sasjs/fix-drive-path

Browse Source 
Fix drive path
This commit is contained in:
Muhammad Saad
2022-04-19 18:56:13 -07:00
committed by GitHub
parent 1513c3623d fe0866ace7
commit c35b2b3f59
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/app.ts
View File

@@ -61,6 +61,6 @@ export default setProcessVariables().then(async () => {
app.use(onError) app.use(onError)
connectDB() await connectDB()
return app return app
}) })

2
api/src/utils/connectDB.ts
View File

@@ -2,7 +2,7 @@ import mongoose from 'mongoose'
import { populateClients } from '../routes/api/auth' import { populateClients } from '../routes/api/auth'
import { seedDB } from './seedDB' import { seedDB } from './seedDB'
export const connectDB = () => { export const connectDB = async () => {
// NOTE: when exporting app.js as agent for supertest // NOTE: when exporting app.js as agent for supertest
// we should exclude connecting to the real database // we should exclude connecting to the real database
if (process.env.NODE_ENV === 'test') { if (process.env.NODE_ENV === 'test') {

17
api/src/utils/setProcessVariables.ts
View File

@@ -1,5 +1,5 @@
import path from 'path' import path from 'path'
import { getRealPath } from '@sasjs/utils' import { getAbsolutePath, getRealPath } from '@sasjs/utils'
import { configuration } from '../../package.json' import { configuration } from '../../package.json'
import { getDesktopFields } from '.' import { getDesktopFields } from '.'
@@ -12,18 +12,17 @@ export const setProcessVariables = async () => {
const { MODE } = process.env const { MODE } = process.env
if (MODE?.trim() !== 'server') { if (MODE?.trim() === 'server') {
const { SAS_PATH, DRIVE_PATH } = process.env
process.sasLoc = SAS_PATH ?? configuration.sasPath
const absPath = getAbsolutePath(DRIVE_PATH ?? 'tmp', process.cwd())
process.driveLoc = getRealPath(absPath)
} else {
const { sasLoc, driveLoc } = await getDesktopFields() const { sasLoc, driveLoc } = await getDesktopFields()
process.sasLoc = sasLoc process.sasLoc = sasLoc
process.driveLoc = driveLoc process.driveLoc = driveLoc
} else {
const { SAS_PATH, DRIVE_PATH } = process.env
process.sasLoc = SAS_PATH ?? configuration.sasPath
process.driveLoc = getRealPath(
path.join(process.cwd(), DRIVE_PATH ?? 'tmp')
)
} }
console.log('sasLoc: ', process.sasLoc) console.log('sasLoc: ', process.sasLoc)