chore: wip replicating folders api

.env.example

@@ -1,5 +1,4 @@
-SAS_EXEC_PATH=<path to folder containing SAS executable>
-SAS_EXEC_NAME=<name of SAS executable file>
+SAS_EXEC=<path to folder containing SAS executable 'sas'>
 PORT_API=<port for sasjs server (api)>
 PORT_WEB=<port for sasjs web component(react)>
 ACCESS_TOKEN_SECRET=<secret>

.github/CONTRIBUTING.md

@@ -1,115 +0,0 @@
-# CONTRIBUTING
-
-Contributions are very welcome!  Feel free to raise an issue or start a discussion, for help in getting started.
-
-
-## Configuration
-
-Configuration is made in the `configuration` section of `package.json`:
-
-- Provide path to SAS9 executable.
-
-
-### Using dockers:
-
-There is `.env.example` file present at root of the project. [for Production]
-
-There is `.env.example` file present at `./api` of the project. [for Development]
-
-There is `.env.example` file present at `./web` of the project. [for Development]
-
-Remember to provide enviornment variables.
-
-#### Development
-
-Command to run docker for development:
-
-```
-docker-compose up -d
-```
-
-It uses default docker compose file i.e. `docker-compose.yml` present at root.
-It will build following images if running first time:
-
-- `sasjs_server_api` - image for sasjs api server app based on _ExpressJS_
-- `sasjs_server_web` - image for sasjs web component app based on _ReactJS_
-- `mongodb` - image for mongo database
-- `mongo-seed-users` - will be populating user data specified in _./mongo-seed/users/user.json_
-- `mongo-seed-clients` - will be populating client data specified in _./mongo-seed/clients/client.json_
-
-
-#### Production
-
-Command to run docker for production:
-
-```
-docker-compose -f docker-compose.prod.yml up -d
-```
-
-It uses specified docker compose file i.e. `docker-compose.prod.yml` present at root.
-It will build following images if running first time:
-
-- `sasjs_server_prod` - image for sasjs server app containing api and web component's build served at route `/`
-- `mongodb` - image for mongo database
-- `mongo-seed-users` - will be populating user data specified in _./mongo-seed/users/user.json_
-- `mongo-seed-clients` - will be populating client data specified in _./mongo-seed/clients/client.json_
-
-### Using node:
-
-#### Development (running api and web seperately):
-
-##### API
-
-Navigate to `./api`
-There is `.env.example` file present at `./api` directory. Remember to provide enviornment variables else default values will be used mentioned in `.env.example` files
-Command to install and run api server.
-
-```
-npm install
-npm start
-```
-
-##### Web
-
-Navigate to `./web`
-There is `.env.example` file present at `./web` directory. Remember to provide enviornment variables else default values will be used mentioned in `.env.example` files
-Command to install and run api server.
-
-```
-npm install
-npm start
-```
-
-#### Development (running only api server and have web build served):
-
-##### API server also serving Web build files
-
-There is `.env.example` file present at `./api` directory. Remember to provide enviornment variables else default values will be used mentioned in `.env.example` files
-Command to install and run api server.
-
-```
-cd ./web && npm i && npm build && cd ../
-cd ./api && npm i && npm start
-```
-
-#### Production
-
-##### API & WEB
-
-```
-npm run server
-```
-
-This will install/build `web` and install `api`, then start prod server.
-
-
-## Executables
-
-Command to generate executables
-
-```
-cd ./web && npm i && npm build && cd ../
-cd ./api && npm i && npm run exe
-```
-
-This will install/build web app and install/create executables of sasjs server at root `./executables`

.github/workflows/release.yml

@@ -32,17 +32,10 @@ jobs:
         env:
           CI: true
 
-      - name: Compress Executables
-        working-directory: ./executables
-        run: |
-          zip linux.zip api-linux
-          zip macos.zip api-macos
-          zip windows.zip api-win.exe
-
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./executables/linux.zip
-            ./executables/macos.zip
-            ./executables/windows.zip
+            ./executables/api-linux
+            ./executables/api-macos
+            ./executables/api-win.exe

.gitignore

@@ -7,7 +7,6 @@ sas/
 tmp/
 build/
 sasjsbuild/
-sasjscore/
 certificates/
 executables/
 .env

.gitpod.yml

@@ -1,10 +0,0 @@
-# This configuration file was automatically generated by Gitpod.
-# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
-# and commit this file to your remote git repository to share the goodness with others.
-
-tasks:
-  - init: npm install
-vscode:
-  extensions:
-    - dbaeumer.vscode-eslint
-    - sasjs.sasjs-for-vscode

CHANGELOG.md

@@ -2,209 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [0.0.32](https://github.com/sasjs/server/compare/v0.0.31...v0.0.32) (2022-03-14)
-
-
-### Features
-
-* **web:** added delete option  in Drive ([7a6e6c8](https://github.com/sasjs/server/commit/7a6e6c8becab31410d0a36bcc22e13d5359a6cdf))
-
-### [0.0.31](https://github.com/sasjs/server/compare/v0.0.30...v0.0.31) (2022-03-14)
-
-
-### Features
-
-* **drive:** new route delete file api ([3d583ff](https://github.com/sasjs/server/commit/3d583ff21d344a71aa861c7e5b1426ebc2d54c22))
-
-
-### Bug Fixes
-
-* added cookie for accessToken ([698180a](https://github.com/sasjs/server/commit/698180ab7e44d67d46c84352ececca5b6c83b230))
-* **drive:** update file API is same as create file ([7072e28](https://github.com/sasjs/server/commit/7072e282b1cd1a296d81512c57130237610c1c1e))
-* show content of get file api ([6ab42ca](https://github.com/sasjs/server/commit/6ab42ca4868366874f5f21bd711b7b8b72e36774))
-* **stp:** return plain/text header for GET & debug ([145ac45](https://github.com/sasjs/server/commit/145ac450365ed39279248ec9321bbe4918bee9fa))
-
-### [0.0.30](https://github.com/sasjs/server/compare/v0.0.29...v0.0.30) (2022-03-05)
-
-
-### Features
-
-* parse log to array ([c5ad72c](https://github.com/sasjs/server/commit/c5ad72c931ec8fbd7d5a6475838adcbd380c8aee))
-* set response headers provded by SAS Code execution ([2c4aa42](https://github.com/sasjs/server/commit/2c4aa420b3119890cafde4265ed5dddbc9d6a636))
-
-
-### Bug Fixes
-
-* added http headers to /code api as well ([da899b9](https://github.com/sasjs/server/commit/da899b90e26d5ee393eefc302be985eb7c9055a5))
-* code api is updated return type ([e2a6810](https://github.com/sasjs/server/commit/e2a6810e9531a8102d3c51fd8df2e1f78f0d965f))
-* **file:** fixes response headers ([ef41691](https://github.com/sasjs/server/commit/ef41691e408ef1c1c7a921cc1050bdd533651331))
-* get file instead of it's content ([efaf38d](https://github.com/sasjs/server/commit/efaf38d3039391392ce0e14a3accddd8f34ea7d6))
-* hot fix for web component ([0a4b202](https://github.com/sasjs/server/commit/0a4b202428e14effc8014a6813cecf7761ce3715))
-* improvement in flow of uploading ([8c1941a](https://github.com/sasjs/server/commit/8c1941a87bc184be4e0e09eeff73fc6cb69e3041))
-* macros are available Sessions with SASAUTOS ([95843fa](https://github.com/sasjs/server/commit/95843fa4c711aa695ee63ad265b8def4ba56360d))
-* minor changes ([0b5f958](https://github.com/sasjs/server/commit/0b5f958f456d291ec7a8697236657c7819d5c654))
-* multi-part file upload + validations + specs ([e60f172](https://github.com/sasjs/server/commit/e60f17268d1fa9ab623313026d46bd3f63756f69))
-* organized code for usage of multer ([ce0a5e1](https://github.com/sasjs/server/commit/ce0a5e1229bed69c450061fac2bc19711448da56))
-* return buffer in case of file response ([3e6234e](https://github.com/sasjs/server/commit/3e6234e6019c5f3ae4280fac079ecc9cb0effc07))
-* **stp:** return json for webout ([5005f20](https://github.com/sasjs/server/commit/5005f203b8d6b1d577cdf094b83886bd1fc817a2))
-* updating docs ([7312763](https://github.com/sasjs/server/commit/7312763339d6769826328561e2c8d11bbfc0c9f4))
-* **upload:** added query param as well for filepath ([feeec4e](https://github.com/sasjs/server/commit/feeec4eb149e9a47e5a52320d1fc95243bf5eb15))
-
-### [0.0.29](https://github.com/sasjs/server/compare/v0.0.28...v0.0.29) (2022-02-16)
-
-
-### Bug Fixes
-
-* adding .. in folder path ([5931fc1](https://github.com/sasjs/server/commit/5931fc1e712c545ef80454dea5b36e684017c367))
-* adding sasjs stpsrv_header() path to autoexec.  Relates to [#58](https://github.com/sasjs/server/issues/58) ([ce9bde5](https://github.com/sasjs/server/commit/ce9bde5717369de2d76dc183319be8830b2362b2))
-
-### [0.0.28](https://github.com/sasjs/server/compare/v0.0.27...v0.0.28) (2022-02-16)
-
-
-### Features
-
-* default macros and bumping core ([6f19d3d](https://github.com/sasjs/server/commit/6f19d3d0ea3815815f246a3e455495c72c8604c7))
-
-
-### Bug Fixes
-
-* moving core ([f10138b](https://github.com/sasjs/server/commit/f10138b0f2005a958f63cb3a8351e1afa52f086a))
-
-### [0.0.27](https://github.com/sasjs/server/compare/v0.0.26...v0.0.27) (2022-02-16)
-
-
-### Features
-
-* removing stpsrv_header and updating README with auth details ([d3674c7](https://github.com/sasjs/server/commit/d3674c7f9449d77977e482cd63ccdf7e974fa838))
-* **stp-execution:** add returnLog option to execution query ([bf5767e](https://github.com/sasjs/server/commit/bf5767eadfb87f7ed902659347a18361a6a6c74b))
-
-### [0.0.26](https://github.com/sasjs/server/compare/v0.0.25...v0.0.26) (2022-02-14)
-
-
-### Bug Fixes
-
-* refactored + removed unused package ([d7e1aca](https://github.com/sasjs/server/commit/d7e1aca7e33c3264c784d406fa766e29a6b15ae9))
-* release should also has https protocol ([0cfe724](https://github.com/sasjs/server/commit/0cfe724ffa089b84a9f8bca49c9033b56f51c9cb))
-* updated token expiry times ([d17a3dd](https://github.com/sasjs/server/commit/d17a3dd5900d5eb88120af8575e3fc7c2cb71ed6))
-
-### [0.0.25](https://github.com/sasjs/server/compare/v0.0.24...v0.0.25) (2022-02-11)
-
-
-### Bug Fixes
-
-* adding global macvar and bumping sasjs/core with additional server support ([404f1ec](https://github.com/sasjs/server/commit/404f1ec0593a027ed5e84b1d6a84cb9f2d09d99e))
-
-### [0.0.24](https://github.com/sasjs/server/compare/v0.0.23...v0.0.24) (2022-02-11)
-
-
-### Bug Fixes
-
-* removing sysmacdelete ([480ee4d](https://github.com/sasjs/server/commit/480ee4da831d2a89888c58ebec26bd89802ee2f5))
-
-### [0.0.23](https://github.com/sasjs/server/compare/v0.0.22...v0.0.23) (2022-02-08)
-
-### [0.0.22](https://github.com/sasjs/server/compare/v0.0.17...v0.0.22) (2022-02-08)
-
-
-### Bug Fixes
-
-* adding missing global vars to autoexec ([1966b17](https://github.com/sasjs/server/commit/1966b17f27e66bf1c9673ef6e1c11f4868b4f816))
-* avoid uninitialised note ([e4c027a](https://github.com/sasjs/server/commit/e4c027ad5121302b9ae093b2b76dc27f51a94365))
-* bumping core version ([a8df5f4](https://github.com/sasjs/server/commit/a8df5f4afd6c4522270d0a60ab8153dfbdf79e16))
-* bumping sasjs/core and updating descriptions ([31532c0](https://github.com/sasjs/server/commit/31532c0efa41e53f87377a2c7c41d21c7909e3a0))
-* compressing release files for faster download times ([d8b75a4](https://github.com/sasjs/server/commit/d8b75a47d305e0772ccbf8837ba4d7347b94cc93))
-* fixing versioning blooper ([a3b57f6](https://github.com/sasjs/server/commit/a3b57f6e28448fe98e634383041a5633541c8c02))
-
-### [0.0.21](https://github.com/sasjs/server/compare/v0.0.20...v0.0.21) (2022-02-01)
-
-
-### Bug Fixes
-
-* avoid uninitialised note ([e4c027a](https://github.com/sasjs/server/commit/e4c027ad5121302b9ae093b2b76dc27f51a94365))
-
-### [0.0.20](https://github.com/sasjs/server/compare/v0.0.2...v0.0.20) (2022-01-20)
-
-
-### Bug Fixes
-
-* fixing versioning blooper ([a3b57f6](https://github.com/sasjs/server/commit/a3b57f6e28448fe98e634383041a5633541c8c02))
-
-### [0.0.19](https://github.com/sasjs/server/compare/v0.0.18...v0.0.19) (2022-01-20)
-
-
-### Bug Fixes
-
-* bumping sasjs/core and updating descriptions ([31532c0](https://github.com/sasjs/server/commit/31532c0efa41e53f87377a2c7c41d21c7909e3a0))
-
-### [0.0.18](https://github.com/sasjs/server/compare/v0.0.17...v0.0.18) (2022-01-08)
-
-
-### Bug Fixes
-
-* compressing release files for faster download times ([d8b75a4](https://github.com/sasjs/server/commit/d8b75a47d305e0772ccbf8837ba4d7347b94cc93))
-
-### [0.0.17](https://github.com/sasjs/server/compare/v0.0.16...v0.0.17) (2022-01-07)
-
-
-### Bug Fixes
-
-* bug removed, log is clean now ([43769e7](https://github.com/sasjs/server/commit/43769e711d37a4f670786545630139a2d926dc76))
-
-### [0.0.16](https://github.com/sasjs/server/compare/v0.0.15...v0.0.16) (2022-01-07)
-
-
-### Bug Fixes
-
-* added sas9 server address ([cd83891](https://github.com/sasjs/server/commit/cd838915fdb216ee364ea677747409311b1214fb))
-* recreate crashed session ([6cbc657](https://github.com/sasjs/server/commit/6cbc657da3eb7fa821a678443a3ae4079c2a1f09))
-* session should be marked as consumed ([7a3d710](https://github.com/sasjs/server/commit/7a3d710153f37d12160ff45f8f97fb4fcc75d684))
-
-### [0.0.15](https://github.com/sasjs/server/compare/v0.0.14...v0.0.15) (2022-01-06)
-
-
-### Bug Fixes
-
-* **studio:** web component updated ([2d77222](https://github.com/sasjs/server/commit/2d77222ae8a139acd9d96466d0e68291c4ebd70e))
-* updated route for sas code ([e1eb044](https://github.com/sasjs/server/commit/e1eb04494a5650726c95990f74fc719eced4ccb5))
-* **web:** autosave and autofocus ([51ee8c0](https://github.com/sasjs/server/commit/51ee8c0825f021d1d67b2d765d5b434cbf248a1f))
-* **web:** parsing of webout ([a115160](https://github.com/sasjs/server/commit/a1151606f21e0007e2b1ca1245d592d96866f62a))
-* **web:** sticky tabs on Studio + extra run code button removed ([450d99f](https://github.com/sasjs/server/commit/450d99f06e5929eb1679e6203284e4faa44e19b0))
-
-### [0.0.14](https://github.com/sasjs/server/compare/v0.0.13...v0.0.14) (2021-12-19)
-
-
-### Bug Fixes
-
-* actually a README change, the fix was in the previous commit (updating ms_webout) that should have been a PR, to trigger a release ([d86c841](https://github.com/sasjs/server/commit/d86c841f1fb94455ac3500f215a42b4acb8b0017))
-* bumping sasjs/core with adjustment to ms_webout() ([076b866](https://github.com/sasjs/server/commit/076b866c020fb017512c2764801022a57fe4cca8))
-* switch to main branch ([ceca370](https://github.com/sasjs/server/commit/ceca370e2757baf2e8ebb90dab6dfd27f7b990fc))
-
-### [0.0.13](https://github.com/sasjs/server/compare/v0.0.12...v0.0.13) (2021-12-16)
-
-
-### Features
-
-* **studio:** run selected code + open in studio ([27129a8](https://github.com/sasjs/server/commit/27129a8921084c72968383fdbc2ecbd2f417456c))
-
-
-### Bug Fixes
-
-* output for Studio ([e5be0e6](https://github.com/sasjs/server/commit/e5be0e678965b05c64bcc8f55c48a366e0ff55a3))
-
-### [0.0.12](https://github.com/sasjs/server/compare/v0.0.11...v0.0.12) (2021-12-15)
-
-
-### Bug Fixes
-
-* use env if provided for desktop mode ([d19ce25](https://github.com/sasjs/server/commit/d19ce253b4e2d2a7dd912d43a553d4c1bd60ba58))
-
-### [0.0.11](https://github.com/sasjs/server/compare/v0.0.10...v0.0.11) (2021-12-15)
-
-
-### Features
-
-* added authorization route for web ([#37](https://github.com/sasjs/server/issues/37)) ([d0a1457](https://github.com/sasjs/server/commit/d0a1457f44a3d8993b57106e5e681c4e51fe8e7d))
-
 ### [0.0.10](https://github.com/sasjs/server/compare/v0.0.9...v0.0.10) (2021-12-07)
 
 ### [0.0.9](https://github.com/sasjs/server/compare/v0.0.3...v0.0.9) (2021-12-07)

README.md

@@ -8,94 +8,110 @@ SASjs Server provides a NodeJS wrapper for calling the SAS binary executable. It
 
 One major benefit of using SASjs Server (alongside other components of the SASjs framework such as the [CLI](https://cli.sasjs.io), [Adapter](https://adapter.sasjs.io) and [Core](https://core.sasjs.io) library) is that the projects you create can be very easily ported to SAS 9 (Stored Process server) or Viya (Job Execution server).
 
-SASjs Server is available in two modes - Desktop (without authentication) and Server (with authentiation, and a database)
-
-
 ## Configuration
 
-When launching the app, it will make use of specific environment variables. These can be set in the following places:
+Configuration is made in the `configuration` section of `package.json`:
 
-- Configured globally in /etc/environment file
-- Export in terminal or shell script (`export VAR=VALUE`)
-- Prepend in command
-- Enter in the `.env` file alongside the executable
+- Provide path to SAS9 executable.
 
-Example variables:
+### Using dockers:
+
+There is `.env.example` file present at root of the project. [for Production]
+
+There is `.env.example` file present at `./api` of the project. [for Development]
+
+There is `.env.example` file present at `./web` of the project. [for Development]
+
+Remember to provide enviornment variables.
+
+#### Development
+
+Command to run docker for development:
 
 ```
-MODE=[desktop|server] default considered as desktop
-CORS=[disable|enable] default considered as disable
-PROTOCOL=[http|https] default considered as http
-PORT=[5000] default value is 5000
-PORT_WEB=[port for sasjs web component(react)] default value is 3000
-SAS_PATH=/path/to/sas/executable.exe
-DRIVE_PATH=./tmp
-PROTOCOL=[http|https] default considered as http. Use pems below if htttps.
-PRIVATE_KEY=privkey.pem
-FULL_CHAIN=fullchain.pem
+docker-compose up -d
 ```
 
-## Desktop Version
+It uses default docker compose file i.e. `docker-compose.yml` present at root.
+It will build following images if running first time:
 
-### Manual Installation
+- `sasjs_server_api` - image for sasjs api server app based on _ExpressJS_
+- `sasjs_server_web` - image for sasjs web component app based on _ReactJS_
+- `mongodb` - image for mongo database
+- `mongo-seed-users` - will be populating user data specified in _./mongo-seed/users/user.json_
+- `mongo-seed-clients` - will be populating client data specified in _./mongo-seed/clients/client.json_
 
-Download the relevant package from the [releases](https://github.com/sasjs/server/releases) page
+#### Production
 
-Next, trigger by double clicking (windows) or executing from commandline.
-
-You are presented with two prompts (if not set as ENV vars):
-
-- Location of your `sas.exe` / `sas.sh` executable
-- Path to a filesystem location for Stored Programs and temporary files
-
-## Programmatic Installation
-
-Fetch the relevant package from github using `curl`, eg as follows (for linux):
-
-```bash
-curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-unzip linux.zip
-```
-
-The app can then be launched with `./api-linux` and prompts followed (if ENV vars not set).
-
-Normally the server process will stop when your terminal dies. To keep it going you can use the npm package [pm2](https://www.npmjs.com/package/pm2) (`npm install pm2@latest -g`) as follows:
-
-```bash
-export SAS_PATH=/opt/sas9/SASHome/SASFoundation/9.4/sasexe/sas
-export PORT=5001
-export DRIVE_PATH=./tmp
-
-pm2 start api-linux
-```
-
-To get the logs (and some usefull commands):
-
-```bash
-pm2 [list|ls|status]
-pm2 logs
-pm2 logs --lines 200
-```
-
-Managing processes:
+Command to run docker for production:
 
 ```
-pm2 restart app_name
-pm2 reload app_name
-pm2 stop app_name
-pm2 delete app_name
+docker-compose -f docker-compose.prod.yml up -d
 ```
 
-Instead of `app_name` you can pass:
+It uses specified docker compose file i.e. `docker-compose.prod.yml` present at root.
+It will build following images if running first time:
 
-- `all` to act on all processes
-- `id` to act on a specific process id
+- `sasjs_server_prod` - image for sasjs server app containing api and web component's build served at route `/`
+- `mongodb` - image for mongo database
+- `mongo-seed-users` - will be populating user data specified in _./mongo-seed/users/user.json_
+- `mongo-seed-clients` - will be populating client data specified in _./mongo-seed/clients/client.json_
 
+### Using node:
 
-## Server Version
+#### Development (running api and web separately):
 
-The following credentials can be used for the initial connection to SASjs/server.  It is recommended to change these on first use.
+##### API
 
-* CLIENTID:  `clientID1`
-* USERNAME:  `secretuser`
-* PASSWORD:  `secretpassword`
+Navigate to `./api`
+There is `.env.example` file present at `./api` directory. Remember to provide environment variables else default values will be used mentioned in `.env.example` files
+Command to install and run api server.
+
+```
+npm install
+npm start
+```
+
+##### Web
+
+Navigate to `./web`
+There is `.env.example` file present at `./web` directory. Remember to provide enviornment variables else default values will be used mentioned in `.env.example` files
+Command to install and run api server.
+
+```
+npm install
+npm start
+```
+
+#### Development (running only api server and have web build served):
+
+##### API server also serving Web build files
+
+There is `.env.example` file present at `./api` directory. Remember to provide enviornment variables else default values will be used mentioned in `.env.example` files
+Command to install and run api server.
+
+```
+cd ./web && npm i && npm build && cd ../
+cd ./api && npm i && npm start
+```
+
+#### Production
+
+##### API & WEB
+
+```
+npm run server
+```
+
+This will install/build `web` and install `api`, then start prod server.
+
+## Executables
+
+Command to generate executables
+
+```
+cd ./web && npm i && npm build && cd ../
+cd ./api && npm i && npm run exe
+```
+
+This will install/build web app and install/create executables of sasjs server at root `./executables`

SASjsServer.drawio

@@ -1,89 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="HJy_QFGaI9JSrArARLup" name="Page-1">
-        <mxGraphModel dx="1908" dy="2140" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="4" value="End user" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontStyle=0" vertex="1" parent="1">
-                    <mxGeometry x="-360" y="-120" width="40" height="80" as="geometry"/>
-                </mxCell>
-                <mxCell id="7" value="SASjs Server" style="whiteSpace=wrap;html=1;verticalAlign=top;fontStyle=0;fontSize=30;" vertex="1" parent="1">
-                    <mxGeometry x="30" y="-150" width="360" height="850" as="geometry"/>
-                </mxCell>
-                <mxCell id="8" value="" style="edgeStyle=none;html=1;entryX=0;entryY=0.25;entryDx=0;entryDy=0;" edge="1" parent="1" target="28">
-                    <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="-340" y="23" as="sourcePoint"/>
-                        <mxPoint x="115" y="22.586363636363558" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="11" value="&lt;div style=&quot;font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px ; line-height: 18px&quot;&gt;&lt;span style=&quot;color: #a31515&quot;&gt;/SASjsApi/auth/authorize&lt;br&gt;(username,password,clientId)&lt;/span&gt;&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="8">
-                    <mxGeometry x="-0.1257" y="2" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="14" value="" style="edgeStyle=none;html=1;exitX=-0.002;exitY=0.874;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="28">
-                    <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="110" y="80" as="sourcePoint"/>
-                        <mxPoint x="-340" y="80" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="16" value="&lt;font color=&quot;#a31515&quot; face=&quot;menlo, monaco, courier new, monospace&quot;&gt;&lt;span style=&quot;font-size: 12px&quot;&gt;`code`&lt;/span&gt;&lt;/font&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="14">
-                    <mxGeometry x="0.1931" y="-1" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="21" value="End user" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontStyle=0" vertex="1" parent="1">
-                    <mxGeometry x="-360" y="545" width="40" height="80" as="geometry"/>
-                </mxCell>
-                <mxCell id="22" value="" style="edgeStyle=none;html=1;entryX=0;entryY=0.25;entryDx=0;entryDy=0;" edge="1" parent="1" target="30">
-                    <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="-340" y="165" as="sourcePoint"/>
-                        <mxPoint x="115" y="165" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="23" value="&lt;div style=&quot;font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px ; line-height: 18px&quot;&gt;&lt;div style=&quot;font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; line-height: 18px&quot;&gt;&lt;span style=&quot;color: #a31515&quot;&gt;/SASjsApi/auth/token&lt;/span&gt;&lt;/div&gt;&lt;span style=&quot;color: #a31515&quot;&gt;(clientId,code)&lt;/span&gt;&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="22">
-                    <mxGeometry x="-0.1257" y="2" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="24" value="" style="edgeStyle=none;html=1;exitX=0.009;exitY=0.905;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="30">
-                    <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="210" y="222.5" as="sourcePoint"/>
-                        <mxPoint x="-340" y="223" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="25" value="&lt;font color=&quot;#a31515&quot; face=&quot;menlo, monaco, courier new, monospace&quot;&gt;&lt;span style=&quot;font-size: 12px&quot;&gt;`&lt;/span&gt;&lt;/font&gt;&lt;span style=&quot;color: rgb(163 , 21 , 21) ; font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px&quot;&gt;accessToken&lt;/span&gt;&lt;span style=&quot;font-size: 12px ; color: rgb(163 , 21 , 21) ; font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace&quot;&gt;` &amp;amp; `&lt;/span&gt;&lt;span style=&quot;color: rgb(163 , 21 , 21) ; font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px&quot;&gt;refreshToken&lt;/span&gt;&lt;span style=&quot;color: rgb(163 , 21 , 21) ; font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px&quot;&gt;`&lt;/span&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="24">
-                    <mxGeometry x="0.1931" y="-1" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="26" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" edge="1" parent="1" source="21" target="4">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="40" y="240" as="sourcePoint"/>
-                        <mxPoint x="90" y="190" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="28" value="&lt;span&gt;Validates&lt;/span&gt;&lt;br&gt;&lt;span&gt;username/password/clientId&lt;/span&gt;&lt;br&gt;&lt;span&gt;and issue short&lt;/span&gt;&lt;br&gt;&lt;span&gt;Authorization code&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="115" width="190" height="90" as="geometry"/>
-                </mxCell>
-                <mxCell id="30" value="Validates&lt;br&gt;clientId &amp;amp; authorization code&lt;br&gt;and issue&lt;br&gt;Access Token &amp;amp; Refresh Token" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="115" y="140" width="190" height="90" as="geometry"/>
-                </mxCell>
-                <mxCell id="32" value="Protected APIs&lt;br&gt;Authenticate requests &lt;br&gt;with provided Bearer Token" style="whiteSpace=wrap;html=1;verticalAlign=top;fontStyle=0;" vertex="1" parent="1">
-                    <mxGeometry x="50" y="280" width="320" height="400" as="geometry"/>
-                </mxCell>
-                <mxCell id="33" value="" style="edgeStyle=none;html=1;entryX=0;entryY=0.373;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" target="32">
-                    <mxGeometry relative="1" as="geometry">
-                        <mxPoint x="-340" y="432.5" as="sourcePoint"/>
-                        <mxPoint x="-10" y="430" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="34" value="&lt;div style=&quot;font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; font-size: 12px ; line-height: 18px&quot;&gt;&lt;div style=&quot;font-family: &amp;#34;menlo&amp;#34; , &amp;#34;monaco&amp;#34; , &amp;#34;courier new&amp;#34; , monospace ; line-height: 18px&quot;&gt;&lt;font color=&quot;#a31515&quot;&gt;Request with Access Token&lt;/font&gt;&lt;/div&gt;&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="33">
-                    <mxGeometry x="-0.1257" y="2" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>

api/.env.example

@@ -1,14 +1,8 @@
 MODE=[desktop|server] default considered as desktop
 CORS=[disable|enable] default considered as disable
-PROTOCOL=[http|https] default considered as http
-PRIVATE_KEY=privkey.pem
-FULL_CHAIN=fullchain.pem
 PORT=[5000] default value is 5000
 PORT_WEB=[port for sasjs web component(react)] default value is 3000
 ACCESS_TOKEN_SECRET=<secret>
 REFRESH_TOKEN_SECRET=<secret>
 AUTH_CODE_SECRET=<secret>
-DB_CONNECT=mongodb+srv://<DB_USERNAME>:<DB_PASSWORD>@<CLUSTER>/<DB_NAME>?retryWrites=true&w=majority
-
-SAS_PATH=/opt/sas/sas9/SASHome/SASFoundation/9.4/sas
-DRIVE_PATH=./tmp
+DB_CONNECT=mongodb+srv://<DB_USERNAME>:<DB_PASSWORD>@<CLUSTER>/<DB_NAME>?retryWrites=true&w=majority

api/.vscode/launch.json

@@ -1,13 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch via NPM",
-      "request": "launch",
-      "runtimeArgs": ["run-script", "start"],
-      "runtimeExecutable": "npm",
-      "skipFiles": ["<node_internals>/**"],
-      "type": "pwa-node"
-    }
-  ]
-}

api/package.json

@@ -1,28 +1,29 @@
 {
   "name": "api",
-  "version": "0.0.2",
+  "version": "0.0.1",
   "description": "Api of SASjs server",
   "main": "./src/server.ts",
   "scripts": {
-    "initial": "npm run swagger && npm run compileSysInit && npm run copySASjsCore",
+    "initial": "npm run swagger && npm run compileSysInit",
     "prestart": "npm run initial",
+    "prestart:prod": "npm run initial",
     "prebuild": "npm run initial",
     "start": "nodemon ./src/server.ts",
+    "start:prod": "nodemon ./src/prod-server.ts",
     "build": "rimraf build && tsc",
     "swagger": "tsoa spec",
+    "semantic-release": "semantic-release -d",
     "prepare": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true",
     "test": "mkdir -p tmp && mkdir -p ../web/build && jest --silent --coverage",
     "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
     "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
     "package:lib": "npm run build && cp ./package.json build && cp README.md build && cd build && npm version \"5.0.0\" && npm pack",
     "exe": "npm run build && npm run exe:copy && pkg .",
-    "exe:copy": "npm run public:copy && npm run sasjsbuild:copy && npm run sasjscore:copy && npm run web:copy",
+    "exe:copy": "npm run public:copy && npm run sasjsbuild:copy && npm run web:copy",
     "public:copy": "cp -r ./public/ ./build/public/",
     "sasjsbuild:copy": "cp -r ./sasjsbuild/ ./build/sasjsbuild/",
-    "sasjscore:copy": "cp -r ./sasjscore/ ./build/sasjscore/",
     "web:copy": "rimraf web && mkdir web && cp -r ../web/build/ ./web/build/",
-    "compileSysInit": "ts-node ./scripts/compileSysInit.ts",
-    "copySASjsCore": "ts-node ./scripts/copySASjsCore.ts"
+    "compileSysInit": "ts-node ./scripts/compileSysInit.ts"
   },
   "bin": "./build/src/server.js",
   "pkg": {
@@ -40,15 +41,14 @@
   },
   "release": {
     "branches": [
-      "main"
+      "master"
     ]
   },
-  "author": "4GL Ltd",
+  "author": "Analytium Ltd",
   "dependencies": {
-    "@sasjs/core": "4.9.0",
+    "@sasjs/core": "^2.48.6",
     "@sasjs/utils": "2.34.1",
     "bcryptjs": "^2.4.3",
-    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "joi": "^17.4.2",
@@ -58,11 +58,10 @@
     "morgan": "^1.10.0",
     "multer": "^1.4.3",
     "swagger-ui-express": "^4.1.6",
-    "tsoa": "3.14.1"
+    "tsoa": "^3.14.0"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",
-    "@types/cookie-parser": "^1.4.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.12",
     "@types/jest": "^26.0.24",
@@ -74,19 +73,19 @@
     "@types/supertest": "^2.0.11",
     "@types/swagger-ui-express": "^4.1.3",
     "dotenv": "^10.0.0",
-    "http-headers-validation": "^0.0.1",
     "jest": "^27.0.6",
     "mongodb-memory-server": "^8.0.0",
     "nodemon": "^2.0.7",
-    "pkg": "5.5.2",
+    "pkg": "^5.4.1",
     "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
+    "semantic-release": "^17.4.3",
     "supertest": "^6.1.3",
     "ts-jest": "^27.0.3",
     "ts-node": "^10.0.0",
     "typescript": "^4.3.2"
   },
   "configuration": {
-    "sasPath": "/opt/sas/sas9/SASHome/SASFoundation/9.4/sas"
+    "sasPath": "/opt/sas/sas9/SASHome/SASFoundation/9.4"
   }
 }

api/public/swagger.yaml

@@ -92,58 +92,6 @@ components:
                 - clientSecret
             type: object
             additionalProperties: false
-        IRecordOfAny:
-            properties: {}
-            type: object
-            additionalProperties: {}
-        LogLine:
-            properties:
-                line:
-                    type: string
-            required:
-                - line
-            type: object
-            additionalProperties: false
-        HTTPHeaders:
-            properties: {}
-            type: object
-            additionalProperties:
-                type: string
-        ExecuteReturnJsonResponse:
-            properties:
-                status:
-                    type: string
-                _webout:
-                    anyOf:
-                        -
-                            type: string
-                        -
-                            $ref: '#/components/schemas/IRecordOfAny'
-                log:
-                    items:
-                        $ref: '#/components/schemas/LogLine'
-                    type: array
-                message:
-                    type: string
-                httpHeaders:
-                    $ref: '#/components/schemas/HTTPHeaders'
-            required:
-                - status
-                - _webout
-                - log
-                - httpHeaders
-            type: object
-            additionalProperties: false
-        ExecuteSASCodePayload:
-            properties:
-                code:
-                    type: string
-                    description: 'Code of SAS program'
-                    example: '* SAS Code HERE;'
-            required:
-                - code
-            type: object
-            additionalProperties: false
         MemberType.folder:
             enum:
                 - folder
@@ -223,6 +171,18 @@ 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:
@@ -233,6 +193,21 @@ components:
                 - status
             type: object
             additionalProperties: false
+        FilePayload:
+            properties:
+                filePath:
+                    type: string
+                    description: 'Path of the file'
+                    example: /Public/somefolder/some.file
+                fileContent:
+                    type: string
+                    description: 'Contents of the file'
+                    example: 'Contents of the File'
+            required:
+                - filePath
+                - fileContent
+            type: object
+            additionalProperties: false
         TreeNode:
             properties:
                 name:
@@ -383,6 +358,21 @@ components:
                 - description
             type: object
             additionalProperties: false
+        ExecuteReturnJsonResponse:
+            properties:
+                status:
+                    type: string
+                _webout:
+                    type: string
+                log:
+                    type: string
+                message:
+                    type: string
+            required:
+                - status
+                - _webout
+            type: object
+            additionalProperties: false
         ExecuteReturnJsonPayload:
             properties:
                 _program:
@@ -398,10 +388,10 @@ components:
             bearerFormat: JWT
 info:
     title: api
-    version: 0.0.2
+    version: 0.0.1
     description: 'Api of SASjs server'
     contact:
-        name: '4GL Ltd'
+        name: 'Analytium Ltd'
 openapi: 3.0.0
 paths:
     /SASjsApi/auth/authorize:
@@ -511,30 +501,6 @@ paths:
                     application/json:
                         schema:
                             $ref: '#/components/schemas/ClientPayload'
-    /SASjsApi/code/execute:
-        post:
-            operationId: ExecuteSASCode
-            responses:
-                '200':
-                    description: Ok
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ExecuteReturnJsonResponse'
-            description: 'Execute SAS code.'
-            summary: 'Run SAS Code and returns log'
-            tags:
-                - CODE
-            security:
-                -
-                    bearerAuth: []
-            parameters: []
-            requestBody:
-                required: true
-                content:
-                    application/json:
-                        schema:
-                            $ref: '#/components/schemas/ExecuteSASCodePayload'
     /SASjsApi/drive/deploy:
         post:
             operationId: Deploy
@@ -583,9 +549,24 @@ paths:
         get:
             operationId: GetFile
             responses:
-                '204':
-                    description: 'No content'
-            description: "It's optional to either provide `_filePath` in url as query parameter\nOr provide `filePath` in body as form field.\nBut it's required to provide else API will respond with Bad Request."
+                '200':
+                    description: Ok
+                    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
@@ -595,57 +576,11 @@ paths:
             parameters:
                 -
                     in: query
-                    name: _filePath
-                    required: false
+                    name: filePath
+                    required: true
                     schema:
                         type: string
                     example: /Public/somefolder/some.file
-            requestBody:
-                required: false
-                content:
-                    multipart/form-data:
-                        schema:
-                            type: object
-                            properties:
-                                filePath:
-                                    type: string
-        delete:
-            operationId: DeleteFile
-            responses:
-                '200':
-                    description: Ok
-                    content:
-                        application/json:
-                            schema:
-                                properties:
-                                    status: {type: string}
-                                required:
-                                    - status
-                                type: object
-            description: "It's optional to either provide `_filePath` in url as query parameter\nOr provide `filePath` in body as form field.\nBut it's required to provide else API will respond with Bad Request."
-            summary: 'Delete file from SASjs Drive'
-            tags:
-                - Drive
-            security:
-                -
-                    bearerAuth: []
-            parameters:
-                -
-                    in: query
-                    name: _filePath
-                    required: false
-                    schema:
-                        type: string
-                    example: /Public/somefolder/some.file
-            requestBody:
-                required: false
-                content:
-                    multipart/form-data:
-                        schema:
-                            type: object
-                            properties:
-                                filePath:
-                                    type: string
         post:
             operationId: SaveFile
             responses:
@@ -658,7 +593,7 @@ paths:
                             examples:
                                 'Example 1':
                                     value: {status: success}
-                '403':
+                '400':
                     description: 'File already exists'
                     content:
                         application/json:
@@ -667,36 +602,19 @@ paths:
                             examples:
                                 'Example 1':
                                     value: {status: failure, message: 'File request failed.'}
-            description: "It's optional to either provide `_filePath` in url as query parameter\nOr provide `filePath` in body as form field.\nBut it's required to provide else API will respond with Bad Request."
             summary: 'Create a file in SASjs Drive'
             tags:
                 - Drive
             security:
                 -
                     bearerAuth: []
-            parameters:
-                -
-                    description: 'Location of SAS program'
-                    in: query
-                    name: _filePath
-                    required: false
-                    schema:
-                        type: string
-                    example: /Public/somefolder/some.file.sas
+            parameters: []
             requestBody:
                 required: true
                 content:
-                    multipart/form-data:
+                    application/json:
                         schema:
-                            type: object
-                            properties:
-                                file:
-                                    type: string
-                                    format: binary
-                                filePath:
-                                    type: string
-                            required:
-                                - file
+                            $ref: '#/components/schemas/FilePayload'
         patch:
             operationId: UpdateFile
             responses:
@@ -709,8 +627,8 @@ paths:
                             examples:
                                 'Example 1':
                                     value: {status: success}
-                '403':
-                    description: ""
+                '400':
+                    description: 'Unable to get File'
                     content:
                         application/json:
                             schema:
@@ -718,36 +636,19 @@ paths:
                             examples:
                                 'Example 1':
                                     value: {status: failure, message: 'File request failed.'}
-            description: "It's optional to either provide `_filePath` in url as query parameter\nOr provide `filePath` in body as form field.\nBut it's required to provide else API will respond with Bad Request."
             summary: 'Modify a file in SASjs Drive'
             tags:
                 - Drive
             security:
                 -
                     bearerAuth: []
-            parameters:
-                -
-                    description: 'Location of SAS program'
-                    in: query
-                    name: _filePath
-                    required: false
-                    schema:
-                        type: string
-                    example: /Public/somefolder/some.file.sas
+            parameters: []
             requestBody:
                 required: true
                 content:
-                    multipart/form-data:
+                    application/json:
                         schema:
-                            type: object
-                            properties:
-                                file:
-                                    type: string
-                                    format: binary
-                                filePath:
-                                    type: string
-                            required:
-                                - file
+                            $ref: '#/components/schemas/FilePayload'
     /SASjsApi/drive/filetree:
         get:
             operationId: GetFileTree
@@ -1071,6 +972,61 @@ paths:
                         format: double
                         type: number
                     example: '6789'
+    /SASjsApi/stp/execute:
+        get:
+            operationId: ExecuteReturnRaw
+            responses:
+                '200':
+                    description: Ok
+                    content:
+                        application/json:
+                            schema:
+                                type: string
+            description: "Trigger a SAS program using it's location in the _program parameter.\nEnable debugging using the _debug parameter.\nAdditional URL parameters are turned into SAS macro variables.\nAny files provided are placed into the session and\ncorresponding _WEBIN_XXX variables are created."
+            summary: 'Execute Stored Program, return raw content'
+            tags:
+                - STP
+            security:
+                -
+                    bearerAuth: []
+            parameters:
+                -
+                    in: query
+                    name: _program
+                    required: true
+                    schema:
+                        type: string
+                    example: /Public/somefolder/some.file
+        post:
+            operationId: ExecuteReturnJson
+            responses:
+                '200':
+                    description: Ok
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ExecuteReturnJsonResponse'
+            description: "Trigger a SAS program using it's location in the _program parameter.\nEnable debugging using the _debug parameter.\nAdditional URL parameters are turned into SAS macro variables.\nAny files provided are placed into the session and\ncorresponding _WEBIN_XXX variables are created."
+            summary: 'Execute Stored Program, return JSON'
+            tags:
+                - STP
+            security:
+                -
+                    bearerAuth: []
+            parameters:
+                -
+                    in: query
+                    name: _program
+                    required: false
+                    schema:
+                        type: string
+                    example: /Public/somefolder/some.file
+            requestBody:
+                required: false
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/ExecuteReturnJsonPayload'
     /SASjsApi/session:
         get:
             operationId: Session
@@ -1091,68 +1047,6 @@ paths:
                 -
                     bearerAuth: []
             parameters: []
-    /SASjsApi/stp/execute:
-        get:
-            operationId: ExecuteReturnRaw
-            responses:
-                '200':
-                    description: Ok
-                    content:
-                        application/json:
-                            schema:
-                                anyOf:
-                                    - {type: string}
-                                    - {type: string, format: byte}
-            description: "Trigger a SAS program using it's location in the _program URL parameter.\nEnable debugging using the _debug URL parameter.  Setting _debug=131 will\ncause the log to be streamed in the output.\n\nAdditional URL parameters are turned into SAS macro variables.\n\nAny files provided in the request body are placed into the SAS session with\ncorresponding _WEBIN_XXX variables created.\n\nThe response headers can be adjusted using the mfs_httpheader() macro.  Any\nfile type can be returned, including binary files such as zip or xls.\n\nIf _debug is >= 131, response headers will contain Content-Type: 'text/plain'\n\nThis behaviour differs for POST requests, in which case the response is\nalways JSON."
-            summary: 'Execute Stored Program, return raw _webout content.'
-            tags:
-                - STP
-            security:
-                -
-                    bearerAuth: []
-            parameters:
-                -
-                    description: 'Location of SAS program'
-                    in: query
-                    name: _program
-                    required: true
-                    schema:
-                        type: string
-                    example: /Public/somefolder/some.file
-        post:
-            operationId: ExecuteReturnJson
-            responses:
-                '200':
-                    description: Ok
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ExecuteReturnJsonResponse'
-                            examples:
-                                'Example 1':
-                                    value: {status: success, _webout: 'webout content', log: [], httpHeaders: {Content-type: application/zip, Cache-Control: 'public, max-age=1000'}}
-            description: "Trigger a SAS program using it's location in the _program URL parameter.\nEnable debugging using the _debug URL parameter.  In any case, the log is\nalways returned in the log object.\n\nAdditional URL parameters are turned into SAS macro variables.\n\nAny files provided in the request body are placed into the SAS session with\ncorresponding _WEBIN_XXX variables created.\n\nThe response will be a JSON object with the following root attributes: log,\nwebout, headers.\n\nThe webout will be a nested JSON object ONLY if the response-header\ncontains a content-type of application/json AND it is valid JSON.\nOtherwise it will be a stringified version of the webout content.\n\nResponse headers from the mfs_httpheader macro are simply listed in the\nheaders object, for POST requests they have no effect on the actual\nresponse header."
-            summary: 'Execute Stored Program, return JSON'
-            tags:
-                - STP
-            security:
-                -
-                    bearerAuth: []
-            parameters:
-                -
-                    description: 'Location of SAS program'
-                    in: query
-                    name: _program
-                    required: false
-                    schema:
-                        type: string
-                    example: /Public/somefolder/some.file
-            requestBody:
-                required: false
-                content:
-                    application/json:
-                        schema:
-                            $ref: '#/components/schemas/ExecuteReturnJsonPayload'
 servers:
     -
         url: /
@@ -1178,6 +1072,3 @@ tags:
     -
         name: STP
         description: 'Operations about STP'
-    -
-        name: CODE
-        description: 'Operations on SAS code'

api/scripts/compileSysInit.ts

@@ -21,6 +21,7 @@ const compiledSystemInit = async (systemInit: string) =>
   }))
 
 const createSysInitFile = async () => {
+  console.log('macroCorePath', macroCorePath)
   const systemInitContent = await readFile(
     path.join(__dirname, 'systemInit.sas')
   )

api/scripts/copySASjsCore.ts

@@ -1,21 +0,0 @@
-import path from 'path'
-import { asyncForEach, copy, createFolder, deleteFolder } from '@sasjs/utils'
-
-import { apiRoot, sasJSCoreMacros } from '../src/utils'
-
-const macroCorePath = path.join(apiRoot, 'node_modules', '@sasjs', 'core')
-
-export const copySASjsCore = async () => {
-  await deleteFolder(sasJSCoreMacros)
-  await createFolder(sasJSCoreMacros)
-
-  const foldersToCopy = ['base', 'ddl', 'fcmp', 'lua', 'server']
-
-  await asyncForEach(foldersToCopy, async (coreSubFolder) => {
-    const coreSubFolderPath = path.join(macroCorePath, coreSubFolder)
-
-    await copy(coreSubFolderPath, sasJSCoreMacros)
-  })
-}
-
-copySASjsCore()

api/scripts/systemInit.sas

@@ -4,24 +4,10 @@
   @details This program is inserted into every sasjs/server program invocation,
   _before_ any user-provided content.
 
-  A number of useful CORE macros are also compiled below, so that they can be
-  available "out of the box".
-
   <h4> SAS Macros </h4>
   @li mcf_stpsrv_header.sas
-  @li mf_getuser.sas
-  @li mf_getvarlist.sas
-  @li mf_mkdir.sas
-  @li mf_nobs.sas
-  @li mf_uid.sas
-  @li mfs_httpheader.sas
-  @li mp_dirlist.sas
-  @li mp_ds2ddl.sas
-  @li mp_ds2md.sas
-  @li mp_getdbml.sas
-  @li mp_init.sas
-  @li mp_makedata.sas
-  @li mp_zip.sas
 
 **/
 
+
+%mcf_stpsrv_header(wrap=YES, insert_cmplib=YES)

api/src/app.ts

@@ -1,53 +1,39 @@
 import path from 'path'
-import express, { ErrorRequestHandler } from 'express'
+import express from 'express'
 import morgan from 'morgan'
-import cookieParser from 'cookie-parser'
 import dotenv from 'dotenv'
 import cors from 'cors'
 
-import {
-  connectDB,
-  getWebBuildFolderPath,
-  sasJSCoreMacros,
-  setProcessVariables
-} from './utils'
+import webRouter from './routes/web'
+import apiRouter from './routes/api'
+import { connectDB, getWebBuildFolderPath } from './utils'
+
+import { FolderController } from './controllers'
 
 dotenv.config()
 
 const app = express()
 
 const { MODE, CORS, PORT_WEB } = process.env
-const whiteList = [
-  `http://localhost:${PORT_WEB ?? 3000}`,
-  'https://sas.analytium.co.uk:8343'
-]
-
 if (MODE?.trim() !== 'server' || CORS?.trim() === 'enable') {
   console.log('All CORS Requests are enabled')
-  app.use(cors({ credentials: true, origin: whiteList }))
+  app.use(
+    cors({ credentials: true, origin: `http://localhost:${PORT_WEB ?? 3000}` })
+  )
 }
 
-app.use(cookieParser())
-app.use(morgan('tiny'))
 app.use(express.json({ limit: '50mb' }))
+app.use(morgan('tiny'))
 app.use(express.static(path.join(__dirname, '../public')))
+
+app.use('/', webRouter)
+app.use('/SASjsApi', apiRouter)
+app.use(express.json({ limit: '50mb' }))
+
 app.use(express.static(getWebBuildFolderPath()))
 
-const onError: ErrorRequestHandler = (err, req, res, next) => {
-  console.error(err.stack)
-  res.status(500).send('Something broke!')
-}
+const folderController = new FolderController()
 
-export default setProcessVariables().then(async () => {
-  // loading these modules after setting up variables due to
-  // multer's usage of process var process.driveLoc
-  const { setupRoutes } = await import('./routes/setupRoutes')
-  setupRoutes(app)
+folderController.addRootFolder()
 
-  console.log('sasJSCoreMacros', sasJSCoreMacros)
-
-  app.use(onError)
-
-  await connectDB()
-  return app
-})
+export default connectDB().then(() => app)

api/src/controllers/code.ts

@@ -1,71 +0,0 @@
-import express from 'express'
-import { Request, Security, Route, Tags, Post, Body } from 'tsoa'
-import { ExecuteReturnJson, ExecutionController } from './internal'
-import { PreProgramVars } from '../types'
-import { ExecuteReturnJsonResponse } from '.'
-import { parseLogToArray } from '../utils'
-
-interface ExecuteSASCodePayload {
-  /**
-   * Code of SAS program
-   * @example "* SAS Code HERE;"
-   */
-  code: string
-}
-
-@Security('bearerAuth')
-@Route('SASjsApi/code')
-@Tags('CODE')
-export class CodeController {
-  /**
-   * Execute SAS code.
-   * @summary Run SAS Code and returns log
-   */
-  @Post('/execute')
-  public async executeSASCode(
-    @Request() request: express.Request,
-    @Body() body: ExecuteSASCodePayload
-  ): Promise<ExecuteReturnJsonResponse> {
-    return executeSASCode(request, body)
-  }
-}
-
-const executeSASCode = async (req: any, { code }: ExecuteSASCodePayload) => {
-  try {
-    const { webout, log, httpHeaders } =
-      (await new ExecutionController().executeProgram(
-        code,
-        getPreProgramVariables(req),
-        { ...req.query, _debug: 131 },
-        undefined,
-        true
-      )) as ExecuteReturnJson
-
-    return {
-      status: 'success',
-      _webout: webout as string,
-      log: parseLogToArray(log),
-      httpHeaders
-    }
-  } catch (err: any) {
-    throw {
-      code: 400,
-      status: 'failure',
-      message: 'Job execution failed.',
-      error: typeof err === 'object' ? err.toString() : err
-    }
-  }
-}
-
-const getPreProgramVariables = (req: any): PreProgramVars => {
-  const host = req.get('host')
-  const protocol = req.protocol + '://'
-  const { user, accessToken } = req
-  return {
-    username: user.username,
-    userId: user.userId,
-    displayName: user.displayName,
-    serverUrl: protocol + host,
-    accessToken
-  }
-}

api/src/controllers/drive.ts

@@ -1,8 +1,5 @@
-import path from 'path'
-import express, { Express } from 'express'
 import {
   Security,
-  Request,
   Route,
   Tags,
   Example,
@@ -11,26 +8,31 @@ import {
   Response,
   Query,
   Get,
-  Patch,
-  UploadedFile,
-  FormField,
-  Delete
+  Patch
 } from 'tsoa'
-import {
-  fileExists,
-  moveFile,
-  createFolder,
-  deleteFile as deleteFileOnSystem
-} from '@sasjs/utils'
+import { fileExists, readFile, createFile } from '@sasjs/utils'
 import { createFileTree, ExecutionController, getTreeExample } from './internal'
 
 import { FileTree, isFileTree, TreeNode } from '../types'
+import path from 'path'
 import { getTmpFilesFolderPath } from '../utils'
 
 interface DeployPayload {
   appLoc?: string
   fileTree: FileTree
 }
+interface FilePayload {
+  /**
+   * Path of the file
+   * @example "/Public/somefolder/some.file"
+   */
+  filePath: string
+  /**
+   * Contents of the file
+   * @example "Contents of the File"
+   */
+  fileContent: string
+}
 
 interface DeployResponse {
   status: string
@@ -87,91 +89,57 @@ export class DriveController {
   }
 
   /**
-   * It's optional to either provide `_filePath` in url as query parameter
-   * Or provide `filePath` in body as form field.
-   * But it's required to provide else API will respond with Bad Request.
-   *
    * @summary Get file from SASjs Drive
-   * @query _filePath Location of SAS program
-   * @example _filePath "/Public/somefolder/some.file"
+   * @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(
-    @Request() request: express.Request,
-
-    @Query() _filePath?: string,
-    @FormField() filePath?: string
-  ) {
-    return getFile(request, (_filePath ?? filePath)!)
+  public async getFile(@Query() filePath: string): Promise<GetFileResponse> {
+    return getFile(filePath)
   }
 
   /**
-   * It's optional to either provide `_filePath` in url as query parameter
-   * Or provide `filePath` in body as form field.
-   * But it's required to provide else API will respond with Bad Request.
-   *
-   * @summary Delete file from SASjs Drive
-   * @query _filePath Location of SAS program
-   * @example _filePath "/Public/somefolder/some.file"
-   */
-  @Delete('/file')
-  public async deleteFile(
-    @Query() _filePath?: string,
-    @FormField() filePath?: string
-  ) {
-    return deleteFile((_filePath ?? filePath)!)
-  }
-
-  /**
-   * It's optional to either provide `_filePath` in url as query parameter
-   * Or provide `filePath` in body as form field.
-   * But it's required to provide else API will respond with Bad Request.
-   *
    * @summary Create a file in SASjs Drive
-   * @param _filePath Location of SAS program
-   * @example _filePath "/Public/somefolder/some.file.sas"
    *
    */
   @Example<UpdateFileResponse>({
     status: 'success'
   })
-  @Response<UpdateFileResponse>(403, 'File already exists', {
+  @Response<UpdateFileResponse>(400, 'File already exists', {
     status: 'failure',
     message: 'File request failed.'
   })
   @Post('/file')
   public async saveFile(
-    @UploadedFile() file: Express.Multer.File,
-    @Query() _filePath?: string,
-    @FormField() filePath?: string
+    @Body() body: FilePayload
   ): Promise<UpdateFileResponse> {
-    return saveFile((_filePath ?? filePath)!, file)
+    return saveFile(body)
   }
 
   /**
-   * It's optional to either provide `_filePath` in url as query parameter
-   * Or provide `filePath` in body as form field.
-   * But it's required to provide else API will respond with Bad Request.
-   *
    * @summary Modify a file in SASjs Drive
-   * @param _filePath Location of SAS program
-   * @example _filePath "/Public/somefolder/some.file.sas"
    *
    */
   @Example<UpdateFileResponse>({
     status: 'success'
   })
-  @Response<UpdateFileResponse>(403, `File doesn't exist`, {
+  @Response<UpdateFileResponse>(400, 'Unable to get File', {
     status: 'failure',
     message: 'File request failed.'
   })
   @Patch('/file')
   public async updateFile(
-    @UploadedFile() file: Express.Multer.File,
-    @Query() _filePath?: string,
-    @FormField() filePath?: string
+    @Body() body: FilePayload
   ): Promise<UpdateFileResponse> {
-    return updateFile((_filePath ?? filePath)!, file)
+    return updateFile(body)
   }
 
   /**
@@ -185,7 +153,7 @@ export class DriveController {
 }
 
 const getFileTree = () => {
-  const tree = new ExecutionController().buildDirectoryTree()
+  const tree = new ExecutionController().buildDirectorytree()
   return { status: 'success', tree }
 }
 
@@ -204,95 +172,68 @@ const deploy = async (data: DeployPayload) => {
   return successDeployResponse
 }
 
-const getFile = async (req: express.Request, filePath: string) => {
-  const driveFilesPath = getTmpFilesFolderPath()
+const getFile = async (filePath: string): Promise<GetFileResponse> => {
+  try {
+    const filePathFull = path
+      .join(getTmpFilesFolderPath(), filePath)
+      .replace(new RegExp('/', 'g'), path.sep)
 
-  const filePathFull = path
-    .join(getTmpFilesFolderPath(), filePath)
-    .replace(new RegExp('/', 'g'), path.sep)
+    await validateFilePath(filePathFull)
+    const fileContent = await readFile(filePathFull)
 
-  if (!filePathFull.includes(driveFilesPath)) {
-    throw new Error('Cannot get file outside drive.')
+    return { status: 'success', fileContent: fileContent }
+  } catch (err: any) {
+    throw {
+      code: 400,
+      status: 'failure',
+      message: 'File request failed.',
+      error: typeof err === 'object' ? err.toString() : err
+    }
   }
-
-  if (!(await fileExists(filePathFull))) {
-    throw new Error('File does not exist.')
-  }
-
-  const extension = path.extname(filePathFull).toLowerCase()
-  if (extension === '.sas') {
-    req.res?.setHeader('Content-type', 'text/plain')
-  }
-
-  req.res?.sendFile(path.resolve(filePathFull))
 }
 
-const deleteFile = async (filePath: string) => {
-  const driveFilesPath = getTmpFilesFolderPath()
+const saveFile = async (body: FilePayload): Promise<GetFileResponse> => {
+  const { filePath, fileContent } = body
+  try {
+    const filePathFull = path
+      .join(getTmpFilesFolderPath(), filePath)
+      .replace(new RegExp('/', 'g'), path.sep)
 
-  const filePathFull = path
-    .join(getTmpFilesFolderPath(), filePath)
-    .replace(new RegExp('/', 'g'), path.sep)
+    if (await fileExists(filePathFull)) {
+      throw 'DriveController: File already exists.'
+    }
+    await createFile(filePathFull, fileContent)
 
-  if (!filePathFull.includes(driveFilesPath)) {
-    throw new Error('Cannot delete file outside drive.')
+    return { status: 'success' }
+  } catch (err: any) {
+    throw {
+      code: 400,
+      status: 'failure',
+      message: 'File request failed.',
+      error: typeof err === 'object' ? err.toString() : err
+    }
   }
-
-  if (!(await fileExists(filePathFull))) {
-    throw new Error('File does not exist.')
-  }
-
-  await deleteFileOnSystem(filePathFull)
-
-  return { status: 'success' }
 }
 
-const saveFile = async (
-  filePath: string,
-  multerFile: Express.Multer.File
-): Promise<GetFileResponse> => {
-  const driveFilesPath = getTmpFilesFolderPath()
+const updateFile = async (body: FilePayload): Promise<GetFileResponse> => {
+  const { filePath, fileContent } = body
+  try {
+    const filePathFull = path
+      .join(getTmpFilesFolderPath(), filePath)
+      .replace(new RegExp('/', 'g'), path.sep)
 
-  const filePathFull = path
-    .join(driveFilesPath, filePath)
-    .replace(new RegExp('/', 'g'), path.sep)
+    await validateFilePath(filePathFull)
+    await createFile(filePathFull, fileContent)
 
-  if (!filePathFull.includes(driveFilesPath)) {
-    throw new Error('Cannot put file outside drive.')
+    return { status: 'success' }
+  } catch (err: any) {
+    throw {
+      code: 400,
+      status: 'failure',
+      message: 'File request failed.',
+      error: typeof err === 'object' ? err.toString() : err
+    }
   }
-
-  if (await fileExists(filePathFull)) {
-    throw new Error('File already exists.')
-  }
-
-  const folderPath = path.dirname(filePathFull)
-  await createFolder(folderPath)
-  await moveFile(multerFile.path, filePathFull)
-
-  return { status: 'success' }
-}
-
-const updateFile = async (
-  filePath: string,
-  multerFile: Express.Multer.File
-): Promise<GetFileResponse> => {
-  const driveFilesPath = getTmpFilesFolderPath()
-
-  const filePathFull = path
-    .join(driveFilesPath, filePath)
-    .replace(new RegExp('/', 'g'), path.sep)
-
-  if (!filePathFull.includes(driveFilesPath)) {
-    throw new Error('Cannot modify file outside drive.')
-  }
-
-  if (!(await fileExists(filePathFull))) {
-    throw new Error(`File doesn't exist.`)
-  }
-
-  await moveFile(multerFile.path, filePathFull)
-
-  return { status: 'success' }
 }
 
 const validateFilePath = async (filePath: string) => {

api/src/controllers/folder.ts

@@ -0,0 +1,69 @@
+import { Body } from 'tsoa'
+import Folder, { FolderPayload, MemberType } from '../model/Folder'
+
+export class FolderController {
+  public async createFolder(@Body() body: FolderPayload) {
+    return createFolder(body)
+  }
+
+  public async addRootFolder() {
+    await addRootFolder()
+  }
+}
+
+interface FolderDetailsResponse {
+  name: string
+  parentFolderUri: string
+  children: []
+}
+
+const createFolder = async ({
+  name,
+  parentFolderUri,
+  type
+}: FolderPayload): Promise<FolderDetailsResponse> => {
+  parentFolderUri = parentFolderUri.replace(/\/folders\/folders\//i, '')
+  const parentFolder = await Folder.findById(parentFolderUri).catch(
+    (_: any) => {
+      throw new Error(
+        `No folder with an URI '${parentFolderUri}' has been found.`
+      )
+    }
+  )
+
+  const folder = new Folder({
+    name,
+    parentFolderUri,
+    type
+  })
+
+  const savedFolder = await folder.save().catch((err: any) => {
+    // TODO: log error
+    throw new Error(`Error while saving folder.`)
+  })
+
+  await parentFolder?.addMember(savedFolder._id)
+
+  return {
+    name: savedFolder.name,
+    parentFolderUri: savedFolder.parentFolderUri,
+    children: []
+  }
+}
+
+const addRootFolder = async () => {
+  let folder = await Folder.findOne({ name: '/' })
+
+  if (folder) return
+
+  folder = new Folder({
+    name: '/',
+    parentFolderUri: '',
+    type: MemberType.Folder
+  })
+  folder.parentFolderUri = folder._id
+
+  return await folder.save()
+}
+
+const getItem = async({ path })

api/src/controllers/index.ts

@@ -1,8 +1,8 @@
 export * from './auth'
 export * from './client'
-export * from './code'
 export * from './drive'
 export * from './group'
-export * from './session'
 export * from './stp'
 export * from './user'
+export * from './session'
+export * from './folder'

api/src/controllers/internal/Execution.ts

@@ -1,79 +1,34 @@
 import path from 'path'
 import fs from 'fs'
 import { getSessionController } from './'
-import {
-  readFile,
-  fileExists,
-  createFile,
-  moveFile,
-  readFileBinary
-} from '@sasjs/utils'
+import { readFile, fileExists, createFile, moveFile } from '@sasjs/utils'
 import { PreProgramVars, TreeNode } from '../../types'
-import {
-  extractHeaders,
-  generateFileUploadSasCode,
-  getTmpFilesFolderPath,
-  HTTPHeaders,
-  isDebugOn,
-  sasJSCoreMacros
-} from '../../utils'
-
-export interface ExecutionVars {
-  [key: string]: string | number | undefined
-}
-
-export interface ExecuteReturnRaw {
-  httpHeaders: HTTPHeaders
-  result: string | Buffer
-}
-
-export interface ExecuteReturnJson {
-  httpHeaders: HTTPHeaders
-  webout: string | Buffer
-  log?: string
-}
+import { generateFileUploadSasCode, getTmpFilesFolderPath } from '../../utils'
 
 export class ExecutionController {
-  async executeFile(
+  async execute(
     programPath: string,
     preProgramVariables: PreProgramVars,
-    vars: ExecutionVars,
+    vars: { [key: string]: string | number | undefined },
     otherArgs?: any,
     returnJson?: boolean
   ) {
     if (!(await fileExists(programPath)))
       throw 'ExecutionController: SAS file does not exist.'
 
-    const program = await readFile(programPath)
+    let program = await readFile(programPath)
 
-    return this.executeProgram(
-      program,
-      preProgramVariables,
-      vars,
-      otherArgs,
-      returnJson
-    )
-  }
-
-  async executeProgram(
-    program: string,
-    preProgramVariables: PreProgramVars,
-    vars: ExecutionVars,
-    otherArgs?: any,
-    returnJson?: boolean
-  ): Promise<ExecuteReturnRaw | ExecuteReturnJson> {
     const sessionController = getSessionController()
 
     const session = await sessionController.getSession()
     session.inUse = true
-    session.consumed = true
 
     const logPath = path.join(session.path, 'log.log')
-    const headersPath = path.join(session.path, 'stpsrv_header.txt')
-    const weboutPath = path.join(session.path, 'webout.txt')
-    const tokenFile = path.join(session.path, 'accessToken.txt')
 
+    const weboutPath = path.join(session.path, 'webout.txt')
     await createFile(weboutPath, '')
+
+    const tokenFile = path.join(session.path, 'accessToken.txt')
     await createFile(
       tokenFile,
       preProgramVariables?.accessToken ?? 'accessToken'
@@ -84,7 +39,6 @@ export class ExecutionController {
         `${computed}%let ${key}=${vars[key]};\n`,
       ''
     )
-
     const preProgramVarStatments = `
 %let _sasjs_tokenfile=${tokenFile};
 %let _sasjs_username=${preProgramVariables?.username};
@@ -94,20 +48,9 @@ export class ExecutionController {
 %let _sasjs_apipath=/SASjsApi/stp/execute;
 %let _metaperson=&_sasjs_displayname;
 %let _metauser=&_sasjs_username;
-%let sasjsprocessmode=Stored Program;
-%let sasjs_stpsrv_header_loc=%sysfunc(pathname(work))/../stpsrv_header.txt;
-
-%global SYSPROCESSMODE SYSTCPIPHOSTNAME SYSHOSTINFOLONG;
-%macro _sasjs_server_init();
-  %if "&SYSPROCESSMODE"="" %then %let SYSPROCESSMODE=&sasjsprocessmode;
-  %if "&SYSTCPIPHOSTNAME"="" %then %let SYSTCPIPHOSTNAME=&_sasjs_apiserverurl;
-%mend;
-%_sasjs_server_init()
-`
+%let sasjsprocessmode=Stored Program;`
 
     program = `
-options insert=(SASAUTOS="${sasJSCoreMacros}");
-
 /* runtime vars */
 ${varStatments}
 filename _webout "${weboutPath}" mod;
@@ -142,47 +85,38 @@ ${program}`
     await createFile(codePath + '.bkp', program)
     await moveFile(codePath + '.bkp', codePath)
 
-    // we now need to poll the session status
+    // we now need to poll the session array
     while (!session.completed) {
       await delay(50)
     }
 
-    const log = (await fileExists(logPath)) ? await readFile(logPath) : ''
-    const headersContent = (await fileExists(headersPath))
-      ? await readFile(headersPath)
-      : ''
-    const httpHeaders: HTTPHeaders = extractHeaders(headersContent)
-    const fileResponse: boolean =
-      httpHeaders.hasOwnProperty('content-type') && !returnJson
-
+    const log =
+      ((await fileExists(logPath)) ? await readFile(logPath) : '') +
+      session.crashed
     const webout = (await fileExists(weboutPath))
-      ? fileResponse
-        ? await readFileBinary(weboutPath)
-        : await readFile(weboutPath)
+      ? await readFile(weboutPath)
       : ''
 
-    // it should be deleted by scheduleSessionDestroy
+    const debugValue =
+      typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug
+
     session.inUse = false
+    sessionController.deleteSession(session)
 
     if (returnJson) {
       return {
-        httpHeaders,
         webout,
-        log: isDebugOn(vars) || session.crashed ? log : undefined
+        log:
+          (debugValue && debugValue >= 131) || session.crashed ? log : undefined
       }
     }
 
-    return {
-      httpHeaders,
-      result: fileResponse
-        ? webout
-        : isDebugOn(vars) || session.crashed
-        ? `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
-        : 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() {
+  buildDirectorytree() {
     const root: TreeNode = {
       name: 'files',
       relativePath: '',

api/src/controllers/internal/FileUploadController.ts

@@ -18,7 +18,7 @@ export class FileUploadController {
 
   //It will intercept request and generate unique uuid to be used as a subfolder name
   //that will store the files uploaded
-  public preUploadMiddleware = async (req: any, res: any, next: any) => {
+  public preuploadMiddleware = async (req: any, res: any, next: any) => {
     let session
 
     const sessionController = getSessionController()

api/src/controllers/internal/Session.ts

@@ -12,8 +12,7 @@ import {
   createFile,
   fileExists,
   generateTimestamp,
-  readFile,
-  moveFile
+  readFile
 } from '@sasjs/utils'
 
 const execFilePromise = promisify(execFile)
@@ -21,11 +20,8 @@ const execFilePromise = promisify(execFile)
 export class SessionController {
   private sessions: Session[] = []
 
-  private getReadySessions = (): Session[] =>
-    this.sessions.filter((sess: Session) => sess.ready && !sess.consumed)
-
   public async getSession() {
-    const readySessions = this.getReadySessions()
+    const readySessions = this.sessions.filter((sess: Session) => sess.ready)
 
     const session = readySessions.length
       ? readySessions[0]
@@ -36,7 +32,7 @@ export class SessionController {
     return session
   }
 
-  private async createSession(): Promise<Session> {
+  private async createSession() {
     const sessionId = generateUniqueFileName(generateTimestamp())
     const sessionFolder = path.join(getTmpSessionsFolderPath(), sessionId)
 
@@ -51,7 +47,6 @@ export class SessionController {
       id: sessionId,
       ready: false,
       inUse: false,
-      consumed: false,
       completed: false,
       creationTimeStamp,
       deathTimeStamp,
@@ -67,10 +62,7 @@ export class SessionController {
 
     // the autoexec file is executed on SAS startup
     const autoExecPath = path.join(sessionFolder, 'autoexec.sas')
-    const contentForAutoExec = `/* compiled systemInit */
-${compiledSystemInitContent}
-/* autoexec */
-${autoExecContent}`
+    const contentForAutoExec = `/* compiled systemInit */\n${compiledSystemInitContent}\n/* autoexec */\n${autoExecContent}`
     await createFile(autoExecPath, contentForAutoExec)
 
     // create empty code.sas as SAS will not start without a SYSIN
@@ -113,16 +105,15 @@ ${autoExecContent}`
     return session
   }
 
-  private async waitForSession(session: Session) {
+  public async waitForSession(session: Session) {
     const codeFilePath = path.join(session.path, 'code.sas')
 
     // TODO: don't wait forever
     while ((await fileExists(codeFilePath)) && !session.crashed) {}
-
-    if (session.crashed)
-      console.log('session crashed! while waiting to be ready', session.crashed)
+    console.log('session crashed?', !!session.crashed, session.crashed)
 
     session.ready = true
+    return Promise.resolve(session)
   }
 
   public async deleteSession(session: Session) {
@@ -130,9 +121,11 @@ ${autoExecContent}`
     await deleteFolder(session.path)
 
     // remove the session from the session array
-    this.sessions = this.sessions.filter(
-      (sess: Session) => sess.id !== session.id
-    )
+    if (session.ready) {
+      this.sessions = this.sessions.filter(
+        (sess: Session) => sess.id !== session.id
+      )
+    }
   }
 
   private scheduleSessionDestroy(session: Session) {
@@ -160,7 +153,6 @@ const autoExecContent = `
 data _null_;
   /* remove the dummy SYSIN */
   length fname $8;
-  call missing(fname);
   rc=filename(fname,getoption('SYSIN') );
   if rc = 0 and fexist(fname) then rc=fdelete(fname);
   rc=filename(fname);

api/src/controllers/stp.ts

@@ -1,31 +1,9 @@
 import express from 'express'
 import path from 'path'
-import {
-  Request,
-  Security,
-  Route,
-  Tags,
-  Post,
-  Body,
-  Get,
-  Query,
-  Example
-} from 'tsoa'
-import {
-  ExecuteReturnJson,
-  ExecuteReturnRaw,
-  ExecutionController,
-  ExecutionVars
-} from './internal'
+import { Request, Security, Route, Tags, Post, Body, Get, Query } from 'tsoa'
+import { ExecutionController } from './internal'
 import { PreProgramVars } from '../types'
-import {
-  getTmpFilesFolderPath,
-  HTTPHeaders,
-  isDebugOn,
-  LogLine,
-  makeFilesNamesMap,
-  parseLogToArray
-} from '../utils'
+import { getTmpFilesFolderPath, makeFilesNamesMap } from '../utils'
 
 interface ExecuteReturnJsonPayload {
   /**
@@ -34,16 +12,11 @@ interface ExecuteReturnJsonPayload {
    */
   _program?: string
 }
-
-interface IRecordOfAny {
-  [key: string]: any
-}
-export interface ExecuteReturnJsonResponse {
+interface ExecuteReturnJsonResponse {
   status: string
-  _webout: string | IRecordOfAny
-  log: LogLine[]
+  _webout: string
+  log?: string
   message?: string
-  httpHeaders: HTTPHeaders
 }
 
 @Security('bearerAuth')
@@ -51,69 +24,32 @@ export interface ExecuteReturnJsonResponse {
 @Tags('STP')
 export class STPController {
   /**
-   * Trigger a SAS program using it's location in the _program URL parameter.
-   * Enable debugging using the _debug URL parameter.  Setting _debug=131 will
-   * cause the log to be streamed in the output.
-   *
+   * Trigger a SAS program using it's location in the _program parameter.
+   * Enable debugging using the _debug parameter.
    * Additional URL parameters are turned into SAS macro variables.
-   *
-   * Any files provided in the request body are placed into the SAS session with
-   * corresponding _WEBIN_XXX variables created.
-   *
-   * The response headers can be adjusted using the mfs_httpheader() macro.  Any
-   * file type can be returned, including binary files such as zip or xls.
-   *
-   * If _debug is >= 131, response headers will contain Content-Type: 'text/plain'
-   *
-   * This behaviour differs for POST requests, in which case the response is
-   * always JSON.
-   *
-   * @summary Execute Stored Program, return raw _webout content.
-   * @param _program Location of SAS program
+   * Any files provided are placed into the session and
+   * corresponding _WEBIN_XXX variables are created.
+   * @summary Execute Stored Program, return raw content
+   * @query _program Location of SAS program
    * @example _program "/Public/somefolder/some.file"
    */
   @Get('/execute')
   public async executeReturnRaw(
     @Request() request: express.Request,
     @Query() _program: string
-  ): Promise<string | Buffer> {
+  ): Promise<string> {
     return executeReturnRaw(request, _program)
   }
-
   /**
-   * Trigger a SAS program using it's location in the _program URL parameter.
-   * Enable debugging using the _debug URL parameter.  In any case, the log is
-   * always returned in the log object.
-   *
+   * Trigger a SAS program using it's location in the _program parameter.
+   * Enable debugging using the _debug parameter.
    * Additional URL parameters are turned into SAS macro variables.
-   *
-   * Any files provided in the request body are placed into the SAS session with
-   * corresponding _WEBIN_XXX variables created.
-   *
-   * The response will be a JSON object with the following root attributes: log,
-   * webout, headers.
-   *
-   * The webout will be a nested JSON object ONLY if the response-header
-   * contains a content-type of application/json AND it is valid JSON.
-   * Otherwise it will be a stringified version of the webout content.
-   *
-   * Response headers from the mfs_httpheader macro are simply listed in the
-   * headers object, for POST requests they have no effect on the actual
-   * response header.
-   *
+   * Any files provided are placed into the session and
+   * corresponding _WEBIN_XXX variables are created.
    * @summary Execute Stored Program, return JSON
-   * @param _program Location of SAS program
+   * @query _program Location of SAS program
    * @example _program "/Public/somefolder/some.file"
    */
-  @Example<ExecuteReturnJsonResponse>({
-    status: 'success',
-    _webout: 'webout content',
-    log: [],
-    httpHeaders: {
-      'Content-type': 'application/zip',
-      'Cache-Control': 'public, max-age=1000'
-    }
-  })
   @Post('/execute')
   public async executeReturnJson(
     @Request() request: express.Request,
@@ -128,35 +64,21 @@ export class STPController {
 const executeReturnRaw = async (
   req: express.Request,
   _program: string
-): Promise<string | Buffer> => {
-  const query = req.query as ExecutionVars
+): Promise<string> => {
+  const query = req.query as { [key: string]: string | number | undefined }
   const sasCodePath =
     path
       .join(getTmpFilesFolderPath(), _program)
       .replace(new RegExp('/', 'g'), path.sep) + '.sas'
 
   try {
-    const { result, httpHeaders } =
-      (await new ExecutionController().executeFile(
-        sasCodePath,
-        getPreProgramVariables(req),
-        query
-      )) as ExecuteReturnRaw
+    const result = await new ExecutionController().execute(
+      sasCodePath,
+      getPreProgramVariables(req),
+      query
+    )
 
-    // Should over-ride response header for
-    // debug on GET request to see entire log
-    // rendering on browser.
-    if (isDebugOn(query)) {
-      httpHeaders['content-type'] = 'text/plain'
-    }
-
-    req.res?.set(httpHeaders)
-
-    if (result instanceof Buffer) {
-      ;(req as any).sasHeaders = httpHeaders
-    }
-
-    return result
+    return result as string
   } catch (err: any) {
     throw {
       code: 400,
@@ -179,27 +101,17 @@ const executeReturnJson = async (
   const filesNamesMap = req.files?.length ? makeFilesNamesMap(req.files) : null
 
   try {
-    const { webout, log, httpHeaders } =
-      (await new ExecutionController().executeFile(
-        sasCodePath,
-        getPreProgramVariables(req),
-        { ...req.query, ...req.body },
-        { filesNamesMap: filesNamesMap },
-        true
-      )) as ExecuteReturnJson
-
-    let weboutRes: string | IRecordOfAny = webout
-    if (httpHeaders['content-type']?.toLowerCase() === 'application/json') {
-      try {
-        weboutRes = JSON.parse(webout as string)
-      } catch (_) {}
-    }
-
+    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: weboutRes,
-      log: parseLogToArray(log),
-      httpHeaders
+      _webout: webout,
+      log
     }
   } catch (err: any) {
     throw {

api/src/middlewares/authenticateToken.ts

@@ -1,5 +1,7 @@
 import jwt from 'jsonwebtoken'
+import { Request, Response } from 'express'
 import { verifyTokenInDB } from '../utils'
+import { headerIsNotPresentMessage, headerIsNotValidMessage } from './header'
 
 export const authenticateAccessToken = (req: any, res: any, next: any) => {
   authenticateToken(
@@ -21,6 +23,18 @@ export const authenticateRefreshToken = (req: any, res: any, next: any) => {
   )
 }
 
+export const verifyAuthHeaderIsPresent = (req: Request, res: Response) => {
+  console.log(`🤖[verifyAuthHeaderIsPresent]🤖`)
+
+  const authHeader = req.headers.authorization
+
+  if (!authHeader) {
+    return res.status(401).json(headerIsNotPresentMessage('Authorization'))
+  } else if (!/^Bearer\s.{1}/.test(authHeader)) {
+    return res.status(401).json(headerIsNotValidMessage('Authorization'))
+  }
+}
+
 const authenticateToken = (
   req: any,
   res: any,
@@ -43,9 +57,7 @@ const authenticateToken = (
   }
 
   const authHeader = req.headers['authorization']
-  const token =
-    authHeader?.split(' ')[1] ??
-    (tokenType === 'accessToken' ? req.cookies.accessToken : '')
+  const token = authHeader?.split(' ')[1]
   if (!token) return res.sendStatus(401)
 
   jwt.verify(token, key, async (err: any, data: any) => {

api/src/middlewares/header.ts

@@ -0,0 +1,29 @@
+import { Request, Response } from 'express'
+
+export const verifyAcceptHeader = (req: Request, res: Response) => {
+  const acceptHeader = req.headers.accept
+
+  if (!acceptHeader) {
+    return res.status(406).json(headerIsNotPresentMessage('Accept'))
+  } else if (acceptHeader !== 'application/json') {
+    return res.status(406).json(headerIsNotValidMessage('Accept'))
+  }
+}
+
+export const verifyContentTypeHeader = (req: Request, res: Response) => {
+  const contentTypeHeader = req.headers['content-type']
+
+  if (!contentTypeHeader) {
+    return res.status(406).json(headerIsNotPresentMessage('Content-Type'))
+  } else if (contentTypeHeader !== 'application/json') {
+    return res.status(406).json(headerIsNotValidMessage('Content-Type'))
+  }
+}
+
+export const headerIsNotPresentMessage = (header: string) => ({
+  message: `${header} header is not present.`
+})
+
+export const headerIsNotValidMessage = (header: string) => ({
+  message: `${header} header is not valid.`
+})

api/src/middlewares/index.ts

@@ -2,3 +2,5 @@ export * from './authenticateToken'
 export * from './desktop'
 export * from './verifyAdmin'
 export * from './verifyAdminIfNeeded'
+export * from './header'
+export * from './mock'

api/src/middlewares/mock.ts

@@ -0,0 +1,24 @@
+import {
+  verifyAuthHeaderIsPresent,
+  verifyAcceptHeader,
+  verifyContentTypeHeader
+} from './'
+import { Request, Response, NextFunction } from 'express'
+
+export const verifyHeaders = (
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  switch (true) {
+    case verifyAuthHeaderIsPresent(req, res) !== undefined:
+      break
+    case verifyAcceptHeader(req, res) !== undefined:
+      break
+    case verifyContentTypeHeader(req, res) !== undefined:
+      break
+
+    default:
+      return next()
+  }
+}

api/src/middlewares/multer.ts

@@ -1,77 +0,0 @@
-import path from 'path'
-import { Request } from 'express'
-import multer, { FileFilterCallback, Options } from 'multer'
-import { getTmpUploadsPath } from '../utils'
-
-const acceptableExtensions = ['.sas']
-const fieldNameSize = 300
-const fileSize = 10485760 // 10 MB
-
-const storage = multer.diskStorage({
-  destination: getTmpUploadsPath(),
-  filename: function (
-    _req: Request,
-    file: Express.Multer.File,
-    callback: (error: Error | null, filename: string) => void
-  ) {
-    callback(
-      null,
-      file.fieldname + path.extname(file.originalname) + '-' + Date.now()
-    )
-  }
-})
-
-const limits: Options['limits'] = {
-  fieldNameSize,
-  fileSize
-}
-
-const fileFilter: Options['fileFilter'] = (
-  req: Request,
-  file: Express.Multer.File,
-  callback: FileFilterCallback
-) => {
-  const fileExtension = path.extname(file.originalname).toLocaleLowerCase()
-
-  if (!acceptableExtensions.includes(fileExtension)) {
-    return callback(
-      new Error(
-        `File extension '${fileExtension}' not acceptable. Valid extension(s): ${acceptableExtensions.join(
-          ', '
-        )}`
-      )
-    )
-  }
-
-  const uploadFileSize = parseInt(req.headers['content-length'] ?? '')
-  if (uploadFileSize > fileSize) {
-    return callback(
-      new Error(
-        `File size is over limit. File limit is: ${fileSize / 1024 / 1024} MB`
-      )
-    )
-  }
-
-  callback(null, true)
-}
-
-const options: Options = { storage, limits, fileFilter }
-
-const multerInstance = multer(options)
-
-export const multerSingle = (fileName: string, arg: any) => {
-  const [req, res, next] = arg
-  const upload = multerInstance.single(fileName)
-
-  upload(req, res, function (err) {
-    if (err instanceof multer.MulterError) {
-      return res.status(500).send(err.message)
-    } else if (err) {
-      return res.status(400).send(err.message)
-    }
-    // Everything went fine.
-    next()
-  })
-}
-
-export default multerInstance

api/src/model/Folder.ts

@@ -0,0 +1,80 @@
+import { Document, Schema, Model, model } from 'mongoose'
+import {} from '@sasjs/utils'
+
+export interface FolderPayload {
+  parentFolderUri: string
+  name: string
+  type: MemberType
+}
+
+export enum MemberType {
+  Folder = 'Folder',
+  File = 'File'
+}
+
+const isMemberType = (value: string) => value in MemberType
+
+export const getMemberType = (value: string) => {
+  value
+}
+
+interface IFolderDocument extends FolderPayload, Document {
+  members: Schema.Types.ObjectId[]
+  type: MemberType
+}
+
+interface IFolder extends IFolderDocument {
+  addMember(memberId: Schema.Types.ObjectId): Promise<IFolder>
+}
+
+interface IFolderModel extends Model<IFolder> {}
+
+const folderSchema = new Schema({
+  name: { type: String, required: true },
+  parentFolderUri: { type: String, required: true },
+  members: [{ type: Schema.Types.ObjectId, refPath: 'member' }],
+  type: { type: String, required: true }
+})
+
+folderSchema.post('save', (folder: IFolder, next: Function) => {
+  folder.populate('members', '').then(() => next())
+
+  next()
+})
+
+// folderSchema.get('item', (folder: IFolder, next: Function) => {
+
+//   next()
+// })
+
+folderSchema.method(
+  'addMember',
+  async function (memberId: Schema.Types.ObjectId) {
+    const folderIdIndex = this.members.indexOf(memberId)
+
+    if (folderIdIndex === -1) this.members.push(memberId)
+
+    this.markModified('folders')
+
+    return this.save()
+  }
+)
+
+folderSchema.method('getItem', async function (path: string) {
+  console.log(`🤖[getItem]🤖`)
+  console.log(`🤖[path]🤖`, path)
+  // const folderIdIndex = this.members.indexOf(memberId)
+
+  // if (folderIdIndex === -1) this.members.push(memberId)
+
+  // this.markModified('folders')
+
+  // return this.save()
+})
+
+export const Folder: IFolderModel = model<IFolder, IFolderModel>(
+  'Folder',
+  folderSchema
+)
+
+export default Folder

api/src/prod-server.ts

@@ -0,0 +1,21 @@
+import path from 'path'
+import { readFileSync } from 'fs'
+import * as https from 'https'
+import appPromise from './app'
+
+const keyPath = path.join('..', 'certificates', 'privkey.pem')
+const certPath = path.join('..', 'certificates', 'fullchain.pem')
+
+const key = readFileSync(keyPath)
+const cert = readFileSync(certPath)
+
+appPromise.then((app) => {
+  const httpsServer = https.createServer({ key, cert }, app)
+
+  const sasJsPort = process.env.PORT ?? 5000
+  httpsServer.listen(sasJsPort, () => {
+    console.log(
+      `⚡️[server]: Server is running at https://localhost:${sasJsPort}`
+    )
+  })
+})

api/src/routes/api/auth.ts

@@ -8,11 +8,7 @@ import {
   authenticateRefreshToken
 } from '../../middlewares'
 
-import {
-  authorizeValidation,
-  getDesktopFields,
-  tokenValidation
-} from '../../utils'
+import { authorizeValidation, tokenValidation } from '../../utils'
 import { InfoJWT } from '../../types'
 
 const authRouter = express.Router()
@@ -55,9 +51,8 @@ authRouter.post('/token', async (req, res) => {
   const controller = new AuthController()
   try {
     const response = await controller.token(body)
-    const { accessToken } = response
 
-    res.cookie('accessToken', accessToken).send(response)
+    res.send(response)
   } catch (err: any) {
     res.status(403).send(err.toString())
   }

api/src/routes/api/code.ts

@@ -1,31 +0,0 @@
-import express from 'express'
-import { runSASValidation } from '../../utils'
-import { CodeController } from '../../controllers/'
-
-const runRouter = express.Router()
-
-const controller = new CodeController()
-
-runRouter.post('/execute', async (req, res) => {
-  const { error, value: body } = runSASValidation(req.body)
-  if (error) return res.status(400).send(error.details[0].message)
-
-  try {
-    const response = await controller.executeSASCode(req, body)
-
-    if (response instanceof Buffer) {
-      res.writeHead(200, (req as any).sasHeaders)
-      return res.end(response)
-    }
-
-    res.send(response)
-  } catch (err: any) {
-    const statusCode = err.code
-
-    delete err.code
-
-    res.status(statusCode).send(err)
-  }
-})
-
-export default runRouter

api/src/routes/api/drive.ts

@@ -1,15 +1,11 @@
 import express from 'express'
-import { deleteFile } from '@sasjs/utils'
-
-import { multerSingle } from '../../middlewares/multer'
 import { DriveController } from '../../controllers/'
-import { fileBodyValidation, fileParamValidation } from '../../utils'
-
-const controller = new DriveController()
+import { getFileDriveValidation, updateFileDriveValidation } from '../../utils'
 
 const driveRouter = express.Router()
 
 driveRouter.post('/deploy', async (req, res) => {
+  const controller = new DriveController()
   try {
     const response = await controller.deploy(req.body)
     res.send(response)
@@ -23,89 +19,58 @@ driveRouter.post('/deploy', async (req, res) => {
 })
 
 driveRouter.get('/file', async (req, res) => {
-  const { error: errQ, value: query } = fileParamValidation(req.query)
-  const { error: errB, value: body } = fileBodyValidation(req.body)
-
-  if (errQ && errB) return res.status(400).send(errB.details[0].message)
+  const { error, value: query } = getFileDriveValidation(req.query)
+  if (error) return res.status(400).send(error.details[0].message)
 
+  const controller = new DriveController()
   try {
-    await controller.getFile(req, query._filePath, body.filePath)
-  } catch (err: any) {
-    res.status(403).send(err.toString())
-  }
-})
-
-driveRouter.delete('/file', async (req, res) => {
-  const { error: errQ, value: query } = fileParamValidation(req.query)
-  const { error: errB, value: body } = fileBodyValidation(req.body)
-
-  if (errQ && errB) return res.status(400).send(errB.details[0].message)
-
-  try {
-    const response = await controller.deleteFile(query._filePath, body.filePath)
+    const response = await controller.getFile(query.filePath)
     res.send(response)
   } catch (err: any) {
-    res.status(403).send(err.toString())
+    const statusCode = err.code
+
+    delete err.code
+
+    res.status(statusCode).send(err)
   }
 })
 
-driveRouter.post(
-  '/file',
-  (...arg) => multerSingle('file', arg),
-  async (req, res) => {
-    const { error: errQ, value: query } = fileParamValidation(req.query)
-    const { error: errB, value: body } = fileBodyValidation(req.body)
+driveRouter.post('/file', async (req, res) => {
+  const { error, value: body } = updateFileDriveValidation(req.body)
+  if (error) return res.status(400).send(error.details[0].message)
 
-    if (errQ && errB) {
-      if (req.file) await deleteFile(req.file.path)
-      return res.status(400).send(errB.details[0].message)
-    }
+  const controller = new DriveController()
+  try {
+    const response = await controller.saveFile(body)
+    res.send(response)
+  } catch (err: any) {
+    const statusCode = err.code
 
-    if (!req.file) return res.status(400).send('"file" is not present.')
+    delete err.code
 
-    try {
-      const response = await controller.saveFile(
-        req.file,
-        query._filePath,
-        body.filePath
-      )
-      res.send(response)
-    } catch (err: any) {
-      await deleteFile(req.file.path)
-      res.status(403).send(err.toString())
-    }
+    res.status(statusCode).send(err)
   }
-)
+})
 
-driveRouter.patch(
-  '/file',
-  (...arg) => multerSingle('file', arg),
-  async (req, res) => {
-    const { error: errQ, value: query } = fileParamValidation(req.query)
-    const { error: errB, value: body } = fileBodyValidation(req.body)
+driveRouter.patch('/file', async (req, res) => {
+  const { error, value: body } = updateFileDriveValidation(req.body)
+  if (error) return res.status(400).send(error.details[0].message)
 
-    if (errQ && errB) {
-      if (req.file) await deleteFile(req.file.path)
-      return res.status(400).send(errB.details[0].message)
-    }
+  const controller = new DriveController()
+  try {
+    const response = await controller.updateFile(body)
+    res.send(response)
+  } catch (err: any) {
+    const statusCode = err.code
 
-    if (!req.file) return res.status(400).send('"file" is not present.')
+    delete err.code
 
-    try {
-      const response = await controller.updateFile(
-        req.file,
-        query._filePath,
-        body.filePath
-      )
-      res.send(response)
-    } catch (err: any) {
-      await deleteFile(req.file.path)
-      res.status(403).send(err.toString())
-    }
+    res.status(statusCode).send(err)
   }
-)
+})
 
 driveRouter.get('/fileTree', async (req, res) => {
+  const controller = new DriveController()
   try {
     const response = await controller.getFileTree()
     res.send(response)

api/src/routes/api/folders.ts

@@ -0,0 +1,67 @@
+import express from 'express'
+import { verifyHeaders } from '../../middlewares'
+import { verifyQuery, setHeaders } from '../../utils'
+import { FolderController } from '../../controllers'
+
+const foldersRouter = express.Router()
+const controller = new FolderController()
+
+// https://sas.analytium.co.uk/folders/folders?parentFolderUri=/folders/folders/9e442a90-2c5b-40bb-982a-5fe3ff8a66b7
+foldersRouter.post('/folders', verifyHeaders, async (req, res) => {
+  console.log(`🤖[req.query]🤖`, req.query)
+  console.log(`🤖[req.body]🤖`, req.body)
+
+  try {
+    const response = await controller.createFolder({
+      ...req.query,
+      ...req.body
+    })
+
+    console.log(`🤖[response]🤖`, response)
+
+    res.send(response)
+  } catch (err: any) {
+    console.log(`🤖[error]🤖`, err)
+
+    res.status(403).send(err.toString())
+  }
+})
+
+foldersRouter.get('/folders/@item', verifyHeaders, async (req, res) => {
+  const queryParam = 'path'
+
+  try {
+    const response = await controller.getItem({
+      ...req.query,
+      ...req.body
+    })
+
+    console.log(`🤖[response]🤖`, response)
+
+    res.send(response)
+  } catch (err: any) {
+    console.log(`🤖[error]🤖`, err)
+
+    res.status(403).send(err.toString())
+  }
+
+  // if (verifyQuery(req, res, [queryParam])) {
+  //   const folderExist = Math.random() > 0.5
+
+  //   setHeaders(res, folderExist)
+
+  //   if (folderExist) {
+  //     res.status(200).json({ message: 'Folder exists!' })
+  //   } else {
+  //     res.status(404).json({
+  //       errorCode: 11512,
+  //       message: 'No folders match the search criteria.',
+  //       details: [`${queryParam}: ${req.query[queryParam]}`],
+  //       links: [],
+  //       version: 2
+  //     })
+  //   }
+  // }
+})
+
+export default foldersRouter

api/src/routes/api/index.ts

@@ -11,12 +11,12 @@ import {
 
 import driveRouter from './drive'
 import stpRouter from './stp'
-import codeRouter from './code'
 import userRouter from './user'
 import groupRouter from './group'
 import clientRouter from './client'
 import authRouter from './auth'
 import sessionRouter from './session'
+import foldersRouter from './folders'
 
 const router = express.Router()
 
@@ -32,8 +32,8 @@ router.use(
 router.use('/drive', authenticateAccessToken, driveRouter)
 router.use('/group', desktopRestrict, groupRouter)
 router.use('/stp', authenticateAccessToken, stpRouter)
-router.use('/code', authenticateAccessToken, codeRouter)
 router.use('/user', desktopRestrict, userRouter)
+router.use('/folders', foldersRouter)
 router.use(
   '/',
   swaggerUi.serve,

api/src/routes/api/session.ts

@@ -1,5 +1,6 @@
 import express from 'express'
 import { SessionController } from '../../controllers'
+import { authenticateAccessToken } from '../../middlewares'
 
 const sessionRouter = express.Router()
 

api/src/routes/api/spec/drive.spec.ts

@@ -1,34 +1,15 @@
-import path from 'path'
 import { Express } from 'express'
 import mongoose, { Mongoose } from 'mongoose'
 import { MongoMemoryServer } from 'mongodb-memory-server'
 import request from 'supertest'
-
-import {
-  folderExists,
-  fileExists,
-  readFile,
-  deleteFolder,
-  generateTimestamp,
-  copy
-} from '@sasjs/utils'
-import * as fileUtilModules from '../../../utils/file'
-
-const timestamp = generateTimestamp()
-const tmpFolder = path.join(process.cwd(), `tmp-${timestamp}`)
-jest
-  .spyOn(fileUtilModules, 'getTmpFolderPath')
-  .mockImplementation(() => tmpFolder)
-jest
-  .spyOn(fileUtilModules, 'getTmpUploadsPath')
-  .mockImplementation(() => path.join(tmpFolder, 'uploads'))
-
 import appPromise from '../../../app'
 import { UserController } from '../../../controllers/'
 import { getTreeExample } from '../../../controllers/internal'
+import { getTmpFilesFolderPath } from '../../../utils/file'
+import { folderExists, fileExists, readFile, deleteFolder } from '@sasjs/utils'
+import path from 'path'
+import { generateAccessToken, saveTokensInDB } from '../../../utils'
 import { FolderMember, ServiceMember } from '../../../types'
-import { generateAccessToken, saveTokensInDB } from '../../../utils/'
-const { getTmpFilesFolderPath } = fileUtilModules
 
 let app: Express
 appPromise.then((_app) => {
@@ -49,27 +30,28 @@ describe('files', () => {
   let mongoServer: MongoMemoryServer
   const controller = new UserController()
 
-  let accessToken: string
-
   beforeAll(async () => {
     mongoServer = await MongoMemoryServer.create()
     con = await mongoose.connect(mongoServer.getUri())
-
-    const dbUser = await controller.createUser(user)
-    accessToken = generateAccessToken({
-      clientId,
-      userId: dbUser.id
-    })
-    await saveTokensInDB(dbUser.id, clientId, accessToken, 'refreshToken')
   })
 
   afterAll(async () => {
     await con.connection.dropDatabase()
     await con.connection.close()
     await mongoServer.stop()
-    await deleteFolder(tmpFolder)
   })
   describe('deploy', () => {
+    let accessToken: string
+    let dbUser: any
+
+    beforeAll(async () => {
+      dbUser = await controller.createUser(user)
+      accessToken = generateAccessToken({
+        clientId,
+        userId: dbUser.id
+      })
+      await saveTokensInDB(dbUser.id, clientId, accessToken, 'refreshToken')
+    })
     const shouldFailAssertion = async (payload: any) => {
       const res = await request(app)
         .post('/SASjsApi/drive/deploy')
@@ -162,6 +144,8 @@ describe('files', () => {
       const exampleService = getExampleService()
       const testJobFile = path.join(testJobFolder, exampleService.name) + '.sas'
 
+      console.log(`[testJobFile]`, testJobFile)
+
       await expect(fileExists(testJobFile)).resolves.toEqual(true)
 
       await expect(readFile(testJobFile)).resolves.toEqual(exampleService.code)
@@ -169,319 +153,6 @@ describe('files', () => {
       await deleteFolder(getTmpFilesFolderPath())
     })
   })
-
-  describe('file', () => {
-    describe('create', () => {
-      it('should create a SAS file on drive having filePath as form field', async () => {
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', '/my/path/code.sas')
-          .attach('file', path.join(__dirname, 'files', 'sample.sas'))
-
-        expect(res.statusCode).toEqual(200)
-        expect(res.body).toEqual({
-          status: 'success'
-        })
-      })
-
-      it('should create a SAS file on drive having _filePath as query param', async () => {
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .query({ _filePath: '/my/path/code1.sas' })
-          .attach('file', path.join(__dirname, 'files', 'sample.sas'))
-
-        expect(res.statusCode).toEqual(200)
-        expect(res.body).toEqual({
-          status: 'success'
-        })
-      })
-
-      it('should respond with Unauthorized if access token is not present', async () => {
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .field('filePath', '/my/path/code.sas')
-          .attach('file', path.join(__dirname, 'files', 'sample.sas'))
-          .expect(401)
-
-        expect(res.text).toEqual('Unauthorized')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Forbidden if file is already present', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/my/path/code.sas'
-
-        const pathToCopy = path.join(
-          fileUtilModules.getTmpFilesFolderPath(),
-          pathToUpload
-        )
-        await copy(fileToAttachPath, pathToCopy)
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(403)
-
-        expect(res.text).toEqual('Error: File already exists.')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Forbidden if filePath outside Drive', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/../path/code.sas'
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(403)
-
-        expect(res.text).toEqual('Error: Cannot put file outside drive.')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if filePath is missing', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual(`"filePath" is required`)
-        expect(res.body).toEqual({})
-      })
-
-      it("should respond with Bad Request if filePath doesn't has correct extension", async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/my/path/code.oth'
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual('Valid extensions for filePath: .sas')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if file is missing', async () => {
-        const pathToUpload = '/my/path/code.sas'
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .expect(400)
-
-        expect(res.text).toEqual('"file" is not present.')
-        expect(res.body).toEqual({})
-      })
-
-      it("should respond with Bad Request if attached file doesn't has correct extension", async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.oth')
-        const pathToUpload = '/my/path/code.sas'
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual(
-          `File extension '.oth' not acceptable. Valid extension(s): .sas`
-        )
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if attached file exceeds file limit', async () => {
-        const pathToUpload = '/my/path/code.sas'
-
-        const attachedFile = Buffer.from('.'.repeat(20 * 1024 * 1024))
-
-        const res = await request(app)
-          .post('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', attachedFile, 'another.sas')
-          .expect(400)
-
-        expect(res.text).toEqual(
-          'File size is over limit. File limit is: 10 MB'
-        )
-        expect(res.body).toEqual({})
-      })
-    })
-
-    describe('update', () => {
-      it('should update a SAS file on drive having filePath as form field', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/my/path/code.sas'
-
-        const pathToCopy = path.join(
-          fileUtilModules.getTmpFilesFolderPath(),
-          pathToUpload
-        )
-        await copy(fileToAttachPath, pathToCopy)
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-
-        expect(res.statusCode).toEqual(200)
-        expect(res.body).toEqual({
-          status: 'success'
-        })
-      })
-
-      it('should update a SAS file on drive having _filePath as query param', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/my/path/code.sas'
-
-        const pathToCopy = path.join(
-          fileUtilModules.getTmpFilesFolderPath(),
-          pathToUpload
-        )
-        await copy(fileToAttachPath, pathToCopy)
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-
-        expect(res.statusCode).toEqual(200)
-        expect(res.body).toEqual({
-          status: 'success'
-        })
-      })
-
-      it('should respond with Unauthorized if access token is not present', async () => {
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .field('filePath', '/my/path/code.sas')
-          .attach('file', path.join(__dirname, 'files', 'sample.sas'))
-          .expect(401)
-
-        expect(res.text).toEqual('Unauthorized')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Forbidden if file is not present', async () => {
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', `/my/path/code-${generateTimestamp()}.sas`)
-          .attach('file', path.join(__dirname, 'files', 'sample.sas'))
-          .expect(403)
-
-        expect(res.text).toEqual(`Error: File doesn't exist.`)
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Forbidden if filePath outside Drive', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/../path/code.sas'
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(403)
-
-        expect(res.text).toEqual('Error: Cannot modify file outside drive.')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if filePath is missing', async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual(`"filePath" is required`)
-        expect(res.body).toEqual({})
-      })
-
-      it("should respond with Bad Request if filePath doesn't has correct extension", async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.sas')
-        const pathToUpload = '/my/path/code.oth'
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual('Valid extensions for filePath: .sas')
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if file is missing', async () => {
-        const pathToUpload = '/my/path/code.sas'
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .expect(400)
-
-        expect(res.text).toEqual('"file" is not present.')
-        expect(res.body).toEqual({})
-      })
-
-      it("should respond with Bad Request if attached file doesn't has correct extension", async () => {
-        const fileToAttachPath = path.join(__dirname, 'files', 'sample.oth')
-        const pathToUpload = '/my/path/code.sas'
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', fileToAttachPath)
-          .expect(400)
-
-        expect(res.text).toEqual(
-          `File extension '.oth' not acceptable. Valid extension(s): .sas`
-        )
-        expect(res.body).toEqual({})
-      })
-
-      it('should respond with Bad Request if attached file exceeds file limit', async () => {
-        const pathToUpload = '/my/path/code.sas'
-
-        const attachedFile = Buffer.from('.'.repeat(20 * 1024 * 1024))
-
-        const res = await request(app)
-          .patch('/SASjsApi/drive/file')
-          .auth(accessToken, { type: 'bearer' })
-          .field('filePath', pathToUpload)
-          .attach('file', attachedFile, 'another.sas')
-          .expect(400)
-
-        expect(res.text).toEqual(
-          'File size is over limit. File limit is: 10 MB'
-        )
-        expect(res.body).toEqual({})
-      })
-    })
-  })
 })
 
 const getExampleService = (): ServiceMember =>

api/src/routes/api/spec/files/sample.oth

@@ -1 +0,0 @@
-some code of sas

api/src/routes/api/spec/files/sample.sas

@@ -1 +0,0 @@
-some code of sas

api/src/routes/api/stp.ts

@@ -14,12 +14,6 @@ stpRouter.get('/execute', async (req, res) => {
 
   try {
     const response = await controller.executeReturnRaw(req, query._program)
-
-    if (response instanceof Buffer) {
-      res.writeHead(200, (req as any).sasHeaders)
-      return res.end(response)
-    }
-
     res.send(response)
   } catch (err: any) {
     const statusCode = err.code
@@ -32,7 +26,7 @@ stpRouter.get('/execute', async (req, res) => {
 
 stpRouter.post(
   '/execute',
-  fileUploadController.preUploadMiddleware,
+  fileUploadController.preuploadMiddleware,
   fileUploadController.getMulterUploadObject().any(),
   async (req: any, res: any) => {
     const { error: errQ, value: query } = executeProgramRawValidation(req.query)
@@ -46,12 +40,6 @@ stpRouter.post(
         body,
         query?._program
       )
-
-      if (response instanceof Buffer) {
-        res.writeHead(200, (req as any).sasHeaders)
-        return res.end(response)
-      }
-
       res.send(response)
     } catch (err: any) {
       const statusCode = err.code

api/src/routes/setupRoutes.ts

@@ -1,9 +0,0 @@
-import { Express } from 'express'
-
-import webRouter from './web'
-import apiRouter from './api'
-
-export const setupRoutes = (app: Express) => {
-  app.use('/', webRouter)
-  app.use('/SASjsApi', apiRouter)
-}

api/src/server.ts

@@ -1,28 +1,10 @@
-import { createServer } from 'https'
-
 import appPromise from './app'
-import { getCertificates } from './utils'
 
-appPromise.then(async (app) => {
-  const protocol = process.env.PROTOCOL ?? 'http'
+appPromise.then((app) => {
   const sasJsPort = process.env.PORT ?? 5000
-
-  console.log('PROTOCOL: ', protocol)
-
-  if (protocol !== 'https') {
-    app.listen(sasJsPort, () => {
-      console.log(
-        `⚡️[server]: Server is running at http://localhost:${sasJsPort}`
-      )
-    })
-  } else {
-    const { key, cert } = await getCertificates()
-
-    const httpsServer = createServer({ key, cert }, app)
-    httpsServer.listen(sasJsPort, () => {
-      console.log(
-        `⚡️[server]: Server is running at https://localhost:${sasJsPort}`
-      )
-    })
-  }
+  app.listen(sasJsPort, () => {
+    console.log(
+      `⚡️[server]: Server is running at http://localhost:${sasJsPort}`
+    )
+  })
 })

api/src/types/Process.d.ts

@@ -1,7 +1,7 @@
 declare namespace NodeJS {
   export interface Process {
     sasLoc: string
-    driveLoc: string
+    driveLoc?: string
     sessionController?: import('../controllers/internal').SessionController
   }
 }

api/src/types/Session.ts

@@ -5,7 +5,6 @@ export interface Session {
   deathTimeStamp: string
   path: string
   inUse: boolean
-  consumed: boolean
   completed: boolean
   crashed?: string
 }

api/src/utils/connectDB.ts

@@ -1,19 +1,32 @@
+import path from 'path'
 import mongoose from 'mongoose'
+import { configuration } from '../../package.json'
+import { getDesktopFields } from '.'
 import { populateClients } from '../routes/api/auth'
 
 export const connectDB = async () => {
   // NOTE: when exporting app.js as agent for supertest
-  // we should exclude connecting to the real database
-  if (process.env.NODE_ENV === 'test') {
-    return
-  } else {
+  // we should exlcude connecting to the real database
+  if (process.env.NODE_ENV !== 'test') {
     const { MODE } = process.env
-
     if (MODE?.trim() !== 'server') {
       console.log('Running in Destop Mode, no DB to connect.')
+
+      const { sasLoc, driveLoc } = await getDesktopFields()
+
+      process.sasLoc = sasLoc
+      process.driveLoc = driveLoc
+
       return
     }
 
+    const { SAS_PATH } = process.env
+    const sasDir = SAS_PATH ?? configuration.sasPath
+
+    process.sasLoc = path.join(sasDir, 'sas')
+
+    console.log('sasLoc: ', process.sasLoc)
+
     mongoose.connect(process.env.DB_CONNECT as string, async (err) => {
       if (err) throw err
 

api/src/utils/extractHeaders.ts

@@ -1,25 +0,0 @@
-const headerUtils = require('http-headers-validation')
-
-export interface HTTPHeaders {
-  [key: string]: string
-}
-
-export const extractHeaders = (content?: string): HTTPHeaders => {
-  const headersObj: HTTPHeaders = {}
-  const headersArr = content
-    ?.split('\n')
-    .map((line) => line.trim())
-    .filter((line) => !!line)
-
-  headersArr?.forEach((headerStr) => {
-    const [key, value] = headerStr.split(':').map((data) => data.trim())
-
-    if (value && headerUtils.validateHeader(key, value)) {
-      headersObj[key.toLowerCase()] = value
-    } else {
-      delete headersObj[key.toLowerCase()]
-    }
-  })
-
-  return headersObj
-}

api/src/utils/file.ts

@@ -1,4 +1,5 @@
 import path from 'path'
+import { getRealPath } from '@sasjs/utils'
 
 export const apiRoot = path.join(__dirname, '..', '..')
 export const codebaseRoot = path.join(apiRoot, '..')
@@ -8,14 +9,11 @@ export const sysInitCompiledPath = path.join(
   'systemInitCompiled.sas'
 )
 
-export const sasJSCoreMacros = path.join(apiRoot, 'sasjscore')
-
 export const getWebBuildFolderPath = () =>
   path.join(codebaseRoot, 'web', 'build')
 
-export const getTmpFolderPath = () => process.driveLoc
-
-export const getTmpUploadsPath = () => path.join(getTmpFolderPath(), 'uploads')
+export const getTmpFolderPath = () =>
+  process.driveLoc ?? getRealPath(path.join(process.cwd(), 'tmp'))
 
 export const getTmpFilesFolderPath = () =>
   path.join(getTmpFolderPath(), 'files')

api/src/utils/generateAccessToken.ts

@@ -3,5 +3,5 @@ import { InfoJWT } from '../types'
 
 export const generateAccessToken = (data: InfoJWT) =>
   jwt.sign(data, process.env.ACCESS_TOKEN_SECRET as string, {
-    expiresIn: '1day'
+    expiresIn: '1h'
   })

api/src/utils/generateRefreshToken.ts

@@ -3,5 +3,5 @@ import { InfoJWT } from '../types'
 
 export const generateRefreshToken = (data: InfoJWT) =>
   jwt.sign(data, process.env.REFRESH_TOKEN_SECRET as string, {
-    expiresIn: '30 days'
+    expiresIn: '1day'
   })

api/src/utils/getCertificates.ts

@@ -1,36 +0,0 @@
-import path from 'path'
-import { fileExists, getString, readFile } from '@sasjs/utils'
-
-export const getCertificates = async () => {
-  const { PRIVATE_KEY, FULL_CHAIN } = process.env
-
-  const keyPath = PRIVATE_KEY ?? (await getFileInput('Private Key (PEM)'))
-  const certPath = FULL_CHAIN ?? (await getFileInput('Full Chain (PEM)'))
-
-  console.log('keyPath: ', keyPath)
-  console.log('certPath: ', certPath)
-
-  const key = await readFile(keyPath)
-  const cert = await readFile(certPath)
-
-  return { key, cert }
-}
-
-const getFileInput = async (filename: string): Promise<string> => {
-  const validator = async (filePath: string) => {
-    if (!filePath) return `Path to ${filename} is required.`
-
-    if (!(await fileExists(path.join(process.cwd(), filePath)))) {
-      return 'No file found at provided path.'
-    }
-
-    return true
-  }
-
-  const targetName = await getString(
-    `Please enter path to ${filename} (relative path): `,
-    validator
-  )
-
-  return targetName
-}

api/src/utils/getDesktopFields.ts

@@ -5,10 +5,8 @@ import { createFolder, fileExists, folderExists } from '@sasjs/utils'
 const isWindows = () => process.platform === 'win32'
 
 export const getDesktopFields = async () => {
-  const { SAS_PATH, DRIVE_PATH } = process.env
-
-  const sasLoc = SAS_PATH ?? (await getSASLocation())
-  const driveLoc = DRIVE_PATH ?? (await getDriveLocation())
+  const sasLoc = await getSASLocation()
+  const driveLoc = await getDriveLocation()
 
   return { sasLoc, driveLoc }
 }

api/src/utils/index.ts

@@ -1,17 +1,13 @@
 export * from './connectDB'
-export * from './extractHeaders'
 export * from './file'
 export * from './generateAccessToken'
 export * from './generateAuthCode'
 export * from './generateRefreshToken'
-export * from './isDebugOn'
-export * from './getCertificates'
 export * from './getDesktopFields'
-export * from './parseLogToArray'
 export * from './removeTokensInDB'
 export * from './saveTokensInDB'
-export * from './setProcessVariables'
 export * from './sleep'
 export * from './upload'
 export * from './validation'
 export * from './verifyTokenInDB'
+export * from './mock'

api/src/utils/isDebugOn.ts

@@ -1,8 +0,0 @@
-import { ExecutionVars } from '../controllers/internal'
-
-export const isDebugOn = (vars: ExecutionVars) => {
-  const debugValue =
-    typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug
-
-  return !!(debugValue && debugValue >= 131)
-}

api/src/utils/mock/header.ts

@@ -0,0 +1,38 @@
+import { Response } from 'express'
+import { uuidv4 } from '@sasjs/utils'
+
+export const setHeaders = (res: Response, isSuccess: boolean) => {
+  res.setHeader(
+    'cache-control',
+    `no-cache, no-store, max-age=0, must-revalidate`
+  )
+  res.setHeader(
+    'content-security-policy',
+    `default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' *.sas.com blob: data:; style-src 'self' 'unsafe-inline'; child-src 'self' blob: data: mailto:;`
+  )
+  res.setHeader(
+    'content-type',
+    `application/vnd.sas.${isSuccess ? 'content.folder' : 'error'}+json${
+      isSuccess ? '' : '; version=2;charset=UTF-8'
+    }`
+  )
+  res.setHeader('pragma', `no-cache`)
+  res.setHeader('server', `Apache/2.4`)
+  res.setHeader('strict-transport-security', `max-age=31536000`)
+  res.setHeader('Transfer-Encoding', `chunked`)
+  res.setHeader('vary', `User-Agent`)
+  res.setHeader('x-content-type-options', `nosniff`)
+  res.setHeader('x-frame-options', `SAMEORIGIN`)
+  res.setHeader('x-xss-protection', `1; mode=block`)
+
+  if (isSuccess) {
+    const uuid = uuidv4()
+
+    res.setHeader('content-location', `/folders/folders/${uuid}`)
+    res.setHeader('etag', `-2066812946`)
+    res.setHeader('last-modified', `${new Date(Date.now()).toUTCString()}`)
+    res.setHeader('location', `/folders/folders/${uuid}`)
+  } else {
+    res.setHeader('sas-service-response-flag', `true`)
+  }
+}

api/src/utils/mock/index.ts

@@ -0,0 +1,2 @@
+export * from './query'
+export * from './header'

api/src/utils/mock/query.ts

@@ -0,0 +1,18 @@
+import { Request, Response } from 'express'
+
+export const verifyQuery = (req: Request, res: Response, args: string[]) => {
+  let isValid = true
+  const { query } = req
+
+  args.forEach((arg: string) => {
+    if (!Object.keys(query).includes(arg)) {
+      res.status(400).json({ message: `${arg} query argument is not present.` })
+      isValid = false
+    } else if (!query[arg]) {
+      res.status(400).json({ message: `${arg} query argument is not valid.` })
+      isValid = false
+    }
+  })
+
+  return isValid
+}

api/src/utils/parseLogToArray.ts

@@ -1,9 +0,0 @@
-export interface LogLine {
-  line: string
-}
-
-export const parseLogToArray = (content?: string): LogLine[] => {
-  if (!content) return []
-
-  return content.split('\n').map((line) => ({ line: line }))
-}

api/src/utils/setProcessVariables.ts

@@ -1,31 +0,0 @@
-import path from 'path'
-import { getRealPath } from '@sasjs/utils'
-
-import { configuration } from '../../package.json'
-import { getDesktopFields } from '.'
-
-export const setProcessVariables = async () => {
-  if (process.env.NODE_ENV === 'test') {
-    process.driveLoc = path.join(process.cwd(), 'tmp')
-    return
-  }
-
-  const { MODE } = process.env
-
-  if (MODE?.trim() !== 'server') {
-    const { sasLoc, driveLoc } = await getDesktopFields()
-
-    process.sasLoc = sasLoc
-    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('sasDrive: ', process.driveLoc)
-}

api/src/utils/specs/extractHeaders.spec.ts

@@ -1,52 +0,0 @@
-import { extractHeaders } from '..'
-
-describe('extractHeaders', () => {
-  it('should return valid http headers', () => {
-    const headers = extractHeaders(`
-      Content-type: application/csv
-      Cache-Control: public, max-age=2000
-      Content-type: application/text
-      Cache-Control: public, max-age=1500
-      Content-type: application/zip
-      Cache-Control: public, max-age=1000
-    `)
-
-    expect(headers).toEqual({
-      'content-type': 'application/zip',
-      'cache-control': 'public, max-age=1000'
-    })
-  })
-
-  it('should not return http headers if last occurrence is blank', () => {
-    const headers = extractHeaders(`
-      Content-type: application/csv
-      Cache-Control: public, max-age=1000
-      Content-type: application/text
-      Content-type:    
-    `)
-
-    expect(headers).toEqual({ 'cache-control': 'public, max-age=1000' })
-  })
-
-  it('should return only valid http headers', () => {
-    const headers = extractHeaders(`
-      Content-type[]: application/csv
-      Content//-type: application/text
-      Content()-type: application/zip
-    `)
-
-    expect(headers).toEqual({})
-  })
-
-  it('should return http headers if empty', () => {
-    const headers = extractHeaders('')
-
-    expect(headers).toEqual({})
-  })
-
-  it('should return http headers if not provided', () => {
-    const headers = extractHeaders()
-
-    expect(headers).toEqual({})
-  })
-})

api/src/utils/specs/parseLogToArray.spec.ts

@@ -1,33 +0,0 @@
-import { parseLogToArray } from '..'
-
-describe('parseLogToArray', () => {
-  it('should parse log to array type', () => {
-    const log = parseLogToArray(`
-line 1 of log content
-line 2 of log content
-line 3 of log content
-line 4 of log content
-    `)
-
-    expect(log).toEqual([
-      { line: '' },
-      { line: 'line 1 of log content' },
-      { line: 'line 2 of log content' },
-      { line: 'line 3 of log content' },
-      { line: 'line 4 of log content' },
-      { line: '    ' }
-    ])
-  })
-
-  it('should parse log to array type if empty', () => {
-    const log = parseLogToArray('')
-
-    expect(log).toEqual([])
-  })
-
-  it('should parse log to array type if not provided', () => {
-    const log = parseLogToArray()
-
-    expect(log).toEqual([])
-  })
-})

api/src/utils/validation.ts

@@ -66,23 +66,15 @@ export const registerClientValidation = (data: any): Joi.ValidationResult =>
     clientSecret: Joi.string().required()
   }).validate(data)
 
-export const fileBodyValidation = (data: any): Joi.ValidationResult =>
+export const getFileDriveValidation = (data: any): Joi.ValidationResult =>
   Joi.object({
-    filePath: Joi.string().pattern(/.sas$/).required().messages({
-      'string.pattern.base': `Valid extensions for filePath: .sas`
-    })
+    filePath: Joi.string().required()
   }).validate(data)
 
-export const fileParamValidation = (data: any): Joi.ValidationResult =>
+export const updateFileDriveValidation = (data: any): Joi.ValidationResult =>
   Joi.object({
-    _filePath: Joi.string().pattern(/.sas$/).required().messages({
-      'string.pattern.base': `Valid extensions for filePath: .sas`
-    })
-  }).validate(data)
-
-export const runSASValidation = (data: any): Joi.ValidationResult =>
-  Joi.object({
-    code: Joi.string().required()
+    filePath: Joi.string().required(),
+    fileContent: Joi.string().required()
   }).validate(data)
 
 export const executeProgramRawValidation = (data: any): Joi.ValidationResult =>

api/tsoa.json

@@ -38,10 +38,6 @@
       {
         "name": "STP",
         "description": "Operations about STP"
-      },
-      {
-        "name": "CODE",
-        "description": "Operations on SAS code"
       }
     ],
     "yaml": true,

docker-compose.prod.yml

@@ -14,14 +14,14 @@ services:
       REFRESH_TOKEN_SECRET: ${REFRESH_TOKEN_SECRET}
       AUTH_CODE_SECRET: ${AUTH_CODE_SECRET}
       DB_CONNECT: mongodb://mongodb:27017/sasjs
-      SAS_PATH: /usr/server/sasexe/${SAS_EXEC_NAME}
+      SAS_PATH: /usr/server/sasexe
     expose:
       - ${PORT_API}
     ports:
       - ${PORT_API}:${PORT_API}
     volumes:
       - type: bind
-        source: ${SAS_EXEC_PATH}
+        source: ${SAS_EXEC}
         target: /usr/server/sasexe
         read_only: true
     links:

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: DockerfileApi
     environment:
-      MODE: 'server'
+      MODE: ${MODE}
       CORS: ${CORS}
       PORT: ${PORT_API}
       PORT_WEB: ${PORT_WEB}
@@ -43,7 +43,7 @@ services:
       - ./web:/usr/server/web
 
   mongodb:
-    image: mongo:5.0.4
+    image: mongo:latest
     ports:
       - 27017:27017
     volumes:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "server",
-  "version": "0.0.32",
+  "version": "0.0.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "server",
-      "version": "0.0.32",
+      "version": "0.0.10",
       "devDependencies": {
         "prettier": "^2.3.1",
         "standard-version": "^9.3.2"
@@ -865,9 +865,9 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
       "dev": true
     },
     "node_modules/handlebars": {
@@ -1350,9 +1350,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/minimist-options": {
@@ -2787,9 +2787,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
       "dev": true
     },
     "handlebars": {
@@ -3158,9 +3158,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "minimist-options": {

package.json

@@ -1,12 +1,11 @@
 {
   "name": "server",
-  "version": "0.0.32",
+  "version": "0.0.10",
   "description": "NodeJS wrapper for calling the SAS binary executable",
-  "repository": "https://github.com/sasjs/server",
   "scripts": {
     "server": "npm run server:prepare && npm run server:start",
     "server:prepare": "cd web && npm ci && npm run build && cd ../api && npm ci && cd ..",
-    "server:start": "cd api && npm run start",
+    "server:start": "cd api && npm run start:prod",
     "release": "standard-version",
     "lint-api:fix": "npx prettier --write \"api/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
     "lint-api": "npx prettier --check \"api/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",

restClient/auth.rest

@@ -1,22 +0,0 @@
-### Get Auth Code
-POST http://localhost:5000/SASjsApi/auth/authorize
-Content-Type: application/json
-
-{
-  "username": "secretuser",
-  "password": "secretpassword",
-  "client_id": "clientID1"
-}
-
-### Exchange AuthCode with Access/Refresh Tokens
-POST http://localhost:5000/SASjsApi/auth/token
-Content-Type: application/json
-
-{
-  "client_id": "clientID1",
-  "client_secret": "clientID1secret",
-  "code": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRfaWQiOiJjbGllbnRJRDEiLCJ1c2VybmFtZSI6InVzZXJuYW1lMSIsImlzYWRtaW4iOmZhbHNlLCJpc2FjdGl2ZSI6dHJ1ZSwiaWF0IjoxNjM1ODA0MDYxLCJleHAiOjE2MzU4MDQwOTF9.jV7DpBWG7XAGODs22zAW_kWOqVLZvOxmmYJGpSNQ-KM"
-}
-
-### Perform logout to deactivate access token instantly
-DELETE http://localhost:5000/SASjsApi/auth/logout

restClient/drive.rest

@@ -1,45 +0,0 @@
-###
-POST http://localhost:5000/SASjsApi/drive/deploy
-Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRfaWQiOiJjbGllbnRJRDEiLCJ1c2VybmFtZSI6InVzZXJuYW1lMSIsImlzYWRtaW4iOmZhbHNlLCJpc2FjdGl2ZSI6dHJ1ZSwiaWF0IjoxNjM1ODA0MDc2LCJleHAiOjE2MzU4OTA0NzZ9.Cx1F54ILgAUtnkit0Wg1K1YVO2RdNjOnTKdPhUtDm5I
-
-### multipart upload to sas server file
-POST http://localhost:5000/SASjsApi/drive/file
-Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
-
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="filePath"
-
-/saad/files/new.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="file"; filename="sample_new.sas"
-Content-Type: application/octet-stream
-
-< ./sample.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW--
-
-### multipart upload to sas server file text
-POST http://localhost:5000/SASjsApi/drive/file
-Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
-  
-------WebKitFormBoundary7MA4YWxkTrZu0gW \n
-Content-Disposition: form-data; name="filePath"
-
-/saad/files/new2.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="file"; filename="sample_new.sas"
-Content-Type: text/plain
-
-SOME CONTENTS OF SAS FILE IN REQUEST
-
-------WebKitFormBoundary7MA4YWxkTrZu0gW--
-
-
-Users
-  "username": "username1",
-  "password": "some password",
-
-  "username": "username2",
-  "password": "some password",
-Admins
-  "username": "secretuser",
-  "password": "secretpassword",

restClient/sample.sas

@@ -1 +0,0 @@
-some code of sas

restClient/session.rest

@@ -1,2 +0,0 @@
-### Get current user's info via access token
-GET http://localhost:5000/SASjsApi/session

restClient/users.rest

@@ -1,10 +0,0 @@
-### Create User
-POST http://localhost:5000/SASjsApi/user
-Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRfaWQiOiJjbGllbnRJRDEiLCJ1c2VybmFtZSI6InNlY3JldHVzZXIiLCJpc2FkbWluIjp0cnVlLCJpc2FjdGl2ZSI6dHJ1ZSwiaWF0IjoxNjM1ODAzOTc3LCJleHAiOjE2MzU4OTAzNzd9.f-FLgLwryKvB5XrihdzaGZajO3d5E5OHEEuJI_03GRI
-Content-Type: application/json
-
-{
-  "displayname": "User 2",
-  "username": "username2",
-  "password": "some password"
-}

routes.rest

@@ -23,7 +23,7 @@ Content-Type: application/json
   "client_secret": "newClientSecret"
 }
 ###
-POST http://localhost:5000/SASjsApi/auth/authorize
+POST https://sas.analytium.co.uk:5002/SASjsApi/auth/authorize
 Content-Type: application/json
 
 {
@@ -45,41 +45,6 @@ Content-Type: application/json
 ###
 DELETE http://localhost:5000/SASjsApi/auth/logout
 
-###
-GET http://localhost:5000/SASjsApi/session
-
-
-### multipart upload to sas server file
-POST http://localhost:5000/SASjsApi/drive/file
-Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
-
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="filePath"
-
-/saad/files/new.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="file"; filename="sample_new.sas"
-Content-Type: application/octet-stream
-
-< ./sample.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW--
-
-### multipart upload to sas server file text
-POST http://localhost:5000/SASjsApi/drive/file
-Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
-  
-------WebKitFormBoundary7MA4YWxkTrZu0gW \n
-Content-Disposition: form-data; name="filePath"
-
-/saad/files/new2.sas
-------WebKitFormBoundary7MA4YWxkTrZu0gW
-Content-Disposition: form-data; name="file"; filename="sample_new.sas"
-Content-Type: text/plain
-
-SOME CONTENTS OF SAS FILE IN REQUEST
-
-------WebKitFormBoundary7MA4YWxkTrZu0gW--
-
 
 Users
   "username": "username1",

web/.babelrc

@@ -1,4 +0,0 @@
-{
-  "presets": ["@babel/env", "@babel/react", "@babel/preset-typescript"],
-  "plugins": ["@babel/plugin-proposal-class-properties"]
-}

web/.env.example

@@ -1,2 +1,2 @@
-PORT_API=[place sasjs server port] default value is 5000
-CLIENT_ID=<place clientId here>
+REACT_APP_PORT_API=[place sasjs server port] default value is 5000
+REACT_APP_CLIENT_ID=<place clientId here>

web/package.json

@@ -3,8 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "start": "npx webpack-dev-server --config webpack.dev.ts --hot",
-    "build": "npx webpack --config webpack.prod.ts"
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
   },
   "dependencies": {
     "@emotion/react": "^11.4.1",
@@ -20,43 +22,19 @@
     "@types/jest": "^26.0.24",
     "@types/node": "^12.20.28",
     "@types/react": "^17.0.27",
-    "axios": "^0.24.0",
+    "@types/react-dom": "^17.0.9",
+    "axios": "^0.22.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "^5.3.0"
+    "react-router-dom": "^5.3.0",
+    "react-scripts": "4.0.3",
+    "typescript": "^4.4.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/node": "^7.16.0",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/preset-react": "^7.16.0",
-    "@babel/preset-typescript": "^7.16.0",
-    "@types/dotenv-webpack": "^7.0.3",
     "@types/prismjs": "^1.16.6",
-    "@types/react": "^17.0.37",
-    "@types/react-dom": "^17.0.11",
     "@types/react-router-dom": "^5.3.1",
-    "babel-loader": "^8.2.3",
     "babel-plugin-prismjs": "^2.1.0",
-    "copy-webpack-plugin": "^10.0.0",
-    "css-loader": "^6.5.1",
-    "dotenv-webpack": "^7.1.0",
-    "eslint": "^8.5.0",
-    "eslint-config-react-app": "^7.0.0",
-    "eslint-webpack-plugin": "^3.1.1",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "5.5.0",
-    "path": "0.12.7",
-    "prettier": "^2.4.1",
-    "sass": "^1.44.0",
-    "sass-loader": "^12.3.0",
-    "style-loader": "^3.3.1",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.5.2",
-    "webpack": "5.64.3",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "4.7.4"
+    "prettier": "^2.4.1"
   },
   "eslintConfig": {
     "extends": [

web/public/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="SASjs Server Web Interface" />
@@ -10,7 +10,7 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="manifest.json" />
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

web/src/App.tsx

@@ -19,14 +19,7 @@ function App() {
       <ThemeProvider theme={theme}>
         <HashRouter>
           <Header />
-          <Switch>
-            <Route exact path="/SASjsLogon">
-              <Login getCodeOnly />
-            </Route>
-            <Route path="/">
-              <Login setTokens={setTokens} />
-            </Route>
-          </Switch>
+          <Login setTokens={setTokens} />
         </HashRouter>
       </ThemeProvider>
     )
@@ -46,9 +39,6 @@ function App() {
           <Route exact path="/SASjsStudio">
             <Studio />
           </Route>
-          <Route exact path="/SASjsLogon">
-            <Login getCodeOnly />
-          </Route>
         </Switch>
       </HashRouter>
     </ThemeProvider>

web/src/components/home.tsx

@@ -23,7 +23,7 @@ const Home = () => {
         and contributions are welcomed.
       </p>
       <p>
-        SASjs Server is maintained by the SAS Apps team -{' '}
+        SASjs Server is maintained by the SASjs Apps team -{' '}
         <a
           href="https://sasapps.io/contact-us"
           target="_blank"

web/src/components/login.tsx

@@ -1,29 +1,24 @@
 import React, { useState } from 'react'
-import { useLocation } from 'react-router-dom'
 import PropTypes from 'prop-types'
 
-import { CssBaseline, Box, TextField, Button, Typography } from '@mui/material'
+import { CssBaseline, Box, TextField, Button } from '@mui/material'
 
 const headers = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 }
-const NODE_ENV = process.env.NODE_ENV
-const PORT_API = process.env.PORT_API
+const { NODE_ENV, REACT_APP_PORT_API } = process.env
 const baseUrl =
-  NODE_ENV === 'development' ? `http://localhost:${PORT_API ?? 5000}` : ''
+  NODE_ENV === 'development'
+    ? `http://localhost:${REACT_APP_PORT_API ?? 5000}`
+    : ''
 
 const getAuthCode = async (credentials: any) => {
   return fetch(`${baseUrl}/SASjsApi/auth/authorize`, {
     method: 'POST',
     headers,
     body: JSON.stringify(credentials)
-  }).then(async (response) => {
-    const resText = await response.text()
-    if (response.status !== 200) throw resText
-
-    return JSON.parse(resText)
-  })
+  }).then((data) => data.json())
 }
 const getTokens = async (payload: any) => {
   return fetch(`${baseUrl}/SASjsApi/auth/token`, {
@@ -33,62 +28,26 @@ const getTokens = async (payload: any) => {
   }).then((data) => data.json())
 }
 
-const Login = ({ setTokens, getCodeOnly }: any) => {
-  const location = useLocation()
-  const [username, setUserName] = useState('')
-  const [password, setPassword] = useState('')
-  const [errorMessage, setErrorMessage] = useState('')
-  let error: boolean
-  const [displayCode, setDisplayCode] = useState(null)
+const Login = ({ setTokens }: any) => {
+  const [username, setUserName] = useState()
+  const [password, setPassword] = useState()
 
   const handleSubmit = async (e: any) => {
-    error = false
-    setErrorMessage('')
     e.preventDefault()
-    let clientId = process.env.CLIENT_ID
-
-    if (getCodeOnly) {
-      const params = new URLSearchParams(location.search)
-      const responseType = params.get('response_type')
-      if (responseType === 'code')
-        clientId = params.get('client_id') ?? undefined
-    }
+    const { REACT_APP_CLIENT_ID: clientId } = process.env
 
     const { code } = await getAuthCode({
       clientId,
       username,
       password
-    }).catch((err: string) => {
-      error = true
-      setErrorMessage(err)
-      return {}
     })
 
-    if (!error) {
-      if (getCodeOnly) return setDisplayCode(code)
+    const { accessToken, refreshToken } = await getTokens({
+      clientId,
+      code
+    })
 
-      const { accessToken, refreshToken } = await getTokens({
-        clientId,
-        code
-      })
-
-      setTokens(accessToken, refreshToken)
-    }
-  }
-
-  if (displayCode) {
-    return (
-      <Box className="main">
-        <CssBaseline />
-        <br />
-        <h2>Authorization Code</h2>
-        <Typography m={2} p={3} style={{ overflowWrap: 'anywhere' }}>
-          {displayCode}
-        </Typography>
-
-        <br />
-      </Box>
-    )
+    setTokens(accessToken, refreshToken)
   }
 
   return (
@@ -102,12 +61,7 @@ const Login = ({ setTokens, getCodeOnly }: any) => {
     >
       <CssBaseline />
       <br />
-      <h2 style={{ width: 'auto' }}>Welcome to SASjs Server!</h2>
-      {getCodeOnly && (
-        <p style={{ width: 'auto' }}>
-          Provide credentials to get authorization code.
-        </p>
-      )}
+      <h2>Welcome to SASjs Server!</h2>
       <br />
 
       <TextField
@@ -126,7 +80,6 @@ const Login = ({ setTokens, getCodeOnly }: any) => {
         onChange={(e: any) => setPassword(e.target.value)}
         required
       />
-      {errorMessage && <span>{errorMessage}</span>}
       <Button type="submit" variant="outlined">
         Submit
       </Button>
@@ -135,8 +88,7 @@ const Login = ({ setTokens, getCodeOnly }: any) => {
 }
 
 Login.propTypes = {
-  setTokens: PropTypes.func,
-  getCodeOnly: PropTypes.bool
+  setTokens: PropTypes.func.isRequired
 }
 
 export default Login

web/src/components/useTokens.ts

@@ -3,8 +3,15 @@ import { useEffect, useState } from 'react'
 
 export default function useTokens() {
   const getTokens = () => {
-    const accessToken = localStorage.getItem('accessToken')
-    const refreshToken = localStorage.getItem('refreshToken')
+    const accessTokenString = localStorage.getItem('accessToken')
+    const accessToken: string = accessTokenString
+      ? JSON.parse(accessTokenString)
+      : undefined
+
+    const refreshTokenString = localStorage.getItem('refreshToken')
+    const refreshToken: string = refreshTokenString
+      ? JSON.parse(refreshTokenString)
+      : undefined
 
     if (accessToken && refreshToken) {
       setAxiosRequestHeader(accessToken)
@@ -24,8 +31,8 @@ export default function useTokens() {
   setAxiosResponse(setTokens)
 
   const saveTokens = (accessToken: string, refreshToken: string) => {
-    localStorage.setItem('accessToken', accessToken)
-    localStorage.setItem('refreshToken', refreshToken)
+    localStorage.setItem('accessToken', JSON.stringify(accessToken))
+    localStorage.setItem('refreshToken', JSON.stringify(refreshToken))
     setAxiosRequestHeader(accessToken)
     setTokens({ accessToken, refreshToken })
   }
@@ -36,10 +43,11 @@ export default function useTokens() {
   }
 }
 
-const NODE_ENV = process.env.NODE_ENV
-const PORT_API = process.env.PORT_API
+const { NODE_ENV, REACT_APP_PORT_API } = process.env
 const baseUrl =
-  NODE_ENV === 'development' ? `http://localhost:${PORT_API ?? 5000}` : ''
+  NODE_ENV === 'development'
+    ? `http://localhost:${REACT_APP_PORT_API ?? 5000}`
+    : ''
 
 const isAbsoluteURLRegex = /^(?:\w+:)\/\//
 

web/src/containers/Drive/main.tsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react'
-import { Link } from 'react-router-dom'
 import axios from 'axios'
 
 import Editor from '@monaco-editor/react'
@@ -23,9 +22,9 @@ const Main = (props: any) => {
     if (props.selectedFilePath) {
       setIsLoading(true)
       axios
-        .get(`/SASjsApi/drive/file?_filePath=${props.selectedFilePath}`)
+        .get(`/SASjsApi/drive/file?filePath=${props.selectedFilePath}`)
         .then((res: any) => {
-          setFileContent(res.data)
+          setFileContent(res.data.fileContent)
         })
         .catch((err) => {
           console.log(err)
@@ -36,40 +35,17 @@ const Main = (props: any) => {
     }
   }, [props.selectedFilePath])
 
-  const handleDeleteBtnClick = () => {
-    setIsLoading(true)
-
-    const filePath = props.selectedFilePath
-
-    axios
-      .delete(`/SASjsApi/drive/file?_filePath=${filePath}`)
-      .then((res) => {
-        setFileContent('')
-        window.history.pushState('', '', `${baseUrl}/#/SASjsDrive`)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-      .finally(() => {
-        setIsLoading(false)
-      })
-  }
-
   const handleEditSaveBtnClick = () => {
     if (!editMode) {
       setFileContentBeforeEdit(fileContent)
       setEditMode(true)
     } else {
       setIsLoading(true)
-
-      const formData = new FormData()
-
-      const stringBlob = new Blob([fileContent], { type: 'text/plain' })
-      formData.append('file', stringBlob, 'filename.sas')
-      formData.append('filePath', props.selectedFilePath)
-
       axios
-        .patch(`/SASjsApi/drive/file`, formData)
+        .patch(`/SASjsApi/drive/file`, {
+          filePath: props.selectedFilePath,
+          fileContent: fileContent
+        })
         .then((res) => {
           setEditMode(false)
         })
@@ -113,10 +89,10 @@ const Main = (props: any) => {
             style={{ position: 'absolute', left: '50%', top: '50%' }}
           />
         )}
-        {!isLoading && props?.selectedFilePath && !editMode && (
+        {!isLoading && props?.selectedFilePath !== '' && !editMode && (
           <code style={{ whiteSpace: 'break-spaces' }}>{fileContent}</code>
         )}
-        {!isLoading && props?.selectedFilePath && editMode && (
+        {!isLoading && props?.selectedFilePath !== '' && editMode && (
           <Editor
             height="95%"
             value={fileContent}
@@ -131,36 +107,20 @@ const Main = (props: any) => {
         direction="row"
         sx={{ justifyContent: 'center', marginTop: '20px' }}
       >
-        <Button
-          variant="contained"
-          onClick={handleDeleteBtnClick}
-          disabled={isLoading || !props?.selectedFilePath}
-        >
-          Delete
-        </Button>
         <Button
           variant="contained"
           onClick={handleEditSaveBtnClick}
-          disabled={isLoading || !props?.selectedFilePath}
+          disabled={isLoading || props?.selectedFilePath === ''}
         >
           {!editMode ? 'Edit' : 'Save'}
         </Button>
         <Button
           variant="contained"
           onClick={handleCancelExecuteBtnClick}
-          disabled={isLoading || !props?.selectedFilePath}
+          disabled={isLoading || props?.selectedFilePath === ''}
         >
           {editMode ? 'Cancel' : 'Execute'}
         </Button>
-        {props?.selectedFilePath && (
-          <Button
-            variant="contained"
-            component={Link}
-            to={`/SASjsStudio?_program=${props.selectedFilePath}`}
-          >
-            Open in Studio
-          </Button>
-        )}
       </Stack>
     </Box>
   )

web/src/containers/Drive/sideBar.tsx

@@ -64,16 +64,14 @@ const SideBar = (props: any) => {
   }, [setFilePathOnMount])
 
   const handleSelect = (node: TreeNode) => {
-    if (node.children.length) return
-
-    if (!node.name.includes('.')) return
-
-    window.history.pushState(
-      '',
-      '',
-      `${baseUrl}/#/SASjsDrive?filePath=${node.relativePath}`
-    )
-    setSelectedFilePath(node.relativePath)
+    if (!node.children.length) {
+      window.history.pushState(
+        '',
+        '',
+        `${baseUrl}/#/SASjsDrive?filePath=${node.relativePath}`
+      )
+      setSelectedFilePath(node.relativePath)
+    }
   }
 
   const renderTree = (nodes: TreeNode) => (

web/src/containers/Studio/index.tsx

@@ -1,169 +1,14 @@
-import React, { useEffect, useRef, useState } from 'react'
-import axios from 'axios'
+import React from 'react'
 
+import CssBaseline from '@mui/material/CssBaseline'
 import Box from '@mui/material/Box'
-import { Button, Paper, Stack, Tab } from '@mui/material'
-import { makeStyles } from '@mui/styles'
-import Editor, { OnMount } from '@monaco-editor/react'
-import { useLocation } from 'react-router-dom'
-import { TabContext, TabList, TabPanel } from '@mui/lab'
-
-const useStyles = makeStyles(() => ({
-  root: {
-    fontSize: '1rem',
-    color: 'gray',
-    '&.Mui-selected': {
-      color: 'black'
-    }
-  }
-}))
 
 const Studio = () => {
-  const location = useLocation()
-  const [fileContent, setFileContent] = useState('')
-  const [log, setLog] = useState('')
-  const [webout, setWebout] = useState('')
-  const [tab, setTab] = React.useState('1')
-  const handleTabChange = (_e: any, newValue: string) => {
-    setTab(newValue)
-  }
-
-  const editorRef = useRef(null as any)
-  const handleEditorDidMount: OnMount = (editor) => {
-    editor.focus()
-    editorRef.current = editor
-  }
-
-  const getSelection = () => {
-    const editor = editorRef.current as any
-    const selection = editor?.getModel().getValueInRange(editor?.getSelection())
-    return selection ?? ''
-  }
-
-  const handleRunBtnClick = () => runCode(getSelection() || fileContent)
-
-  const runCode = (code: string) => {
-    axios
-      .post(`/SASjsApi/code/execute`, { code })
-      .then((res: any) => {
-        const parsedLog = res?.data?.log
-          .map((logLine: any) => logLine.line)
-          .join('\n')
-
-        setLog(`<div><h2>SAS Log</h2><pre>${parsedLog}</pre></div>`)
-
-        let weboutString: string
-        try {
-          weboutString = res.data.webout
-            .split('>>weboutBEGIN<<')[1]
-            .split('>>weboutEND<<')[0]
-        } catch (_) {
-          weboutString = res?.data?.webout ?? ''
-        }
-
-        let webout: string
-        try {
-          webout = JSON.stringify(JSON.parse(weboutString), null, 4)
-        } catch (_) {
-          webout = weboutString
-        }
-
-        setWebout(`<pre><code>${webout}</code></pre>`)
-        setTab('2')
-      })
-      .catch((err) => console.log(err))
-  }
-
-  useEffect(() => {
-    const content = localStorage.getItem('fileContent') ?? ''
-    setFileContent(content)
-  }, [])
-
-  useEffect(() => {
-    if (fileContent.length) {
-      localStorage.setItem('fileContent', fileContent)
-    }
-  }, [fileContent])
-
-  useEffect(() => {
-    const params = new URLSearchParams(location.search)
-    const programPath = params.get('_program')
-
-    if (programPath?.length)
-      axios
-        .get(`/SASjsApi/drive/file?filePath=${programPath}`)
-        .then((res: any) => setFileContent(res.data.fileContent))
-        .catch((err) => console.log(err))
-  }, [location.search])
-
-  const classes = useStyles()
   return (
-    <>
-      <br />
-      <br />
-      <br />
-      <Box sx={{ width: '100%', typography: 'body1' }}>
-        <TabContext value={tab}>
-          <Box
-            sx={{
-              borderBottom: 1,
-              borderColor: 'divider'
-            }}
-            style={{ position: 'fixed', background: 'white', width: '100%' }}
-          >
-            <TabList onChange={handleTabChange} centered>
-              <Tab className={classes.root} label="Code" value="1" />
-              <Tab className={classes.root} label="Log" value="2" />
-              <Tab className={classes.root} label="Webout" value="3" />
-            </TabList>
-          </Box>
-          <TabPanel value="1">
-            {/* <Toolbar /> */}
-            <Paper
-              sx={{
-                height: '70vh',
-                marginTop: '50px',
-                padding: '10px',
-                overflow: 'auto',
-                position: 'relative'
-              }}
-              elevation={3}
-            >
-              <Editor
-                height="95%"
-                value={fileContent}
-                onMount={handleEditorDidMount}
-                onChange={(val) => {
-                  if (val) setFileContent(val)
-                }}
-              />
-            </Paper>
-            <Stack
-              spacing={3}
-              direction="row"
-              sx={{ justifyContent: 'center', marginTop: '20px' }}
-            >
-              <Button variant="contained" onClick={handleRunBtnClick}>
-                Run SAS Code
-              </Button>
-            </Stack>
-          </TabPanel>
-          <TabPanel value="2">
-            <div
-              id="sas_log"
-              style={{ marginTop: '50px' }}
-              dangerouslySetInnerHTML={{ __html: log }}
-            />
-          </TabPanel>
-          <TabPanel value="3">
-            <div
-              style={{ marginTop: '50px' }}
-              dangerouslySetInnerHTML={{ __html: webout }}
-            />
-          </TabPanel>
-        </TabContext>
-      </Box>
-    </>
+    <Box className="main">
+      <CssBaseline />
+      <h2>This is container for SASjs studio</h2>
+    </Box>
   )
 }
 

web/webpack.common.ts

@@ -1,60 +0,0 @@
-import path from 'path'
-import { Configuration } from 'webpack'
-import HtmlWebpackPlugin from 'html-webpack-plugin'
-import CopyPlugin from 'copy-webpack-plugin'
-import dotenv from 'dotenv-webpack'
-
-const config: Configuration = {
-  entry: path.join(__dirname, 'src', 'index.tsx'),
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js', '.jsx']
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        use: ['babel-loader']
-      },
-      {
-        test: /\.(ts|tsx)$/,
-        exclude: /node_modules/,
-        use: [
-          {
-            loader: 'ts-loader',
-            options: {
-              compilerOptions: {
-                noEmit: false
-              }
-            }
-          }
-        ]
-      },
-      {
-        test: /\.css$/,
-        exclude: ['/node_modules/'],
-        use: ['style-loader', 'css-loader']
-      },
-      {
-        test: /\.scss$/,
-        exclude: ['/node_modules/'],
-        use: ['style-loader', 'css-loader', 'sass-loader']
-      },
-      {
-        test: /\.(jpg|jpeg|png|gif|mp3|svg)$/,
-        use: ['file-loader']
-      }
-    ]
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, 'src', 'index.html')
-    }),
-    new CopyPlugin({
-      patterns: [{ from: 'public' }]
-    }),
-    new dotenv()
-  ]
-}
-
-export default config

web/webpack.dev.ts

@@ -1,28 +0,0 @@
-import path from 'path'
-import { Configuration as WebpackConfiguration } from 'webpack'
-import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server'
-import { merge } from 'webpack-merge'
-
-import common from './webpack.common'
-
-interface Configuration extends WebpackConfiguration {
-  devServer?: WebpackDevServerConfiguration
-}
-
-const devConfig: Configuration = merge(common, {
-  mode: 'development',
-  output: {
-    path: path.join(__dirname, 'build'),
-    filename: 'index.bundle.js',
-    publicPath: '/'
-  },
-  devServer: {
-    static: {
-      directory: path.join(__dirname, 'build')
-    },
-    historyApiFallback: true,
-    port: 3000
-  }
-})
-
-export default devConfig

web/webpack.prod.ts

@@ -1,19 +0,0 @@
-import path from 'path'
-import { Configuration } from 'webpack'
-import { merge } from 'webpack-merge'
-
-import common from './webpack.common'
-
-const prodConfig: Configuration = merge(common, {
-  mode: 'production',
-  output: {
-    path: path.join(__dirname, 'build'),
-    filename: 'index.bundle.js',
-    publicPath: './'
-  },
-  performance: {
-    hints: false
-  }
-})
-
-export default prodConfig