fix: get file instead of it's content

api/public/swagger.yaml

@@ -223,18 +223,6 @@ components:
                 - fileTree
             type: object
             additionalProperties: false
-        GetFileResponse:
-            properties:
-                status:
-                    type: string
-                fileContent:
-                    type: string
-                message:
-                    type: string
-            required:
-                - status
-            type: object
-            additionalProperties: false
         UpdateFileResponse:
             properties:
                 status:
@@ -610,24 +598,8 @@ paths:
         get:
             operationId: GetFile
             responses:
-                '200':
+                '204':
-                    description: Ok
+                    description: 'No content'
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/GetFileResponse'
-                            examples:
-                                'Example 1':
-                                    value: {status: success, fileContent: 'Contents of the File'}
-                '400':
-                    description: 'Unable to get File'
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/GetFileResponse'
-                            examples:
-                                'Example 1':
-                                    value: {status: failure, message: 'File request failed.'}
             summary: 'Get file from SASjs Drive'
             tags:
                 - Drive

api/src/controllers/drive.ts

@@ -1,7 +1,8 @@
 import path from 'path'
-import { Express } from 'express'
+import express, { Express } from 'express'
 import {
   Security,
+  Request,
   Route,
   Tags,
   Example,
@@ -14,14 +15,7 @@ import {
   UploadedFile,
   FormField
 } from 'tsoa'
-import {
+import { fileExists, createFile, moveFile, createFolder } from '@sasjs/utils'
-  fileExists,
-  readFile,
-  createFile,
-  moveFile,
-  createFolder,
-  deleteFile
-} from '@sasjs/utils'
 import { createFileTree, ExecutionController, getTreeExample } from './internal'
 
 import { FileTree, isFileTree, TreeNode } from '../types'
@@ -103,17 +97,12 @@ export class DriveController {
    * @query filePath Location of SAS program
    * @example filePath "/Public/somefolder/some.file"
    */
-  @Example<GetFileResponse>({
-    status: 'success',
-    fileContent: 'Contents of the File'
-  })
-  @Response<GetFileResponse>(400, 'Unable to get File', {
-    status: 'failure',
-    message: 'File request failed.'
-  })
   @Get('/file')
-  public async getFile(@Query() filePath: string): Promise<GetFileResponse> {
+  public async getFile(
-    return getFile(filePath)
+    @Request() request: express.Request,
+    @Query() filePath: string
+  ) {
+    return getFile(request, filePath)
   }
 
   /**
@@ -190,24 +179,22 @@ const deploy = async (data: DeployPayload) => {
   return successDeployResponse
 }
 
-const getFile = async (filePath: string): Promise<GetFileResponse> => {
+const getFile = async (req: express.Request, filePath: string) => {
-  try {
+  const driveFilesPath = getTmpFilesFolderPath()
+
   const filePathFull = path
     .join(getTmpFilesFolderPath(), filePath)
     .replace(new RegExp('/', 'g'), path.sep)
 
-    await validateFilePath(filePathFull)
+  if (!filePathFull.includes(driveFilesPath)) {
-    const fileContent = await readFile(filePathFull)
+    throw new Error('Cannot get file outside drive.')
+  }
 
-    return { status: 'success', fileContent: fileContent }
+  if (!(await fileExists(filePathFull))) {
-  } catch (err: any) {
+    throw new Error('File does not exist.')
-    throw {
-      code: 400,
-      status: 'failure',
-      message: 'File request failed.',
-      error: typeof err === 'object' ? err.toString() : err
-    }
   }
+
+  req.res?.download(filePathFull)
 }
 
 const saveFile = async (

api/src/routes/api/drive.ts

@@ -32,14 +32,9 @@ driveRouter.get('/file', async (req, res) => {
   if (error) return res.status(400).send(error.details[0].message)
 
   try {
-    const response = await controller.getFile(query.filePath)
+    await controller.getFile(req, query.filePath)
-    res.send(response)
   } catch (err: any) {
-    const statusCode = err.code
+    res.status(403).send(err.toString())
-
-    delete err.code
-
-    res.status(statusCode).send(err)
   }
 })