chore(release): 0.0.20

fix: fixing versioning blooper
chore(release): 0.0.2
2025-12-10 19:34:34 +00:00 · 2022-01-20 14:03:05 +01:00 · 2022-01-20 14:03:00 +01:00 · 2022-01-20 13:57:35 +01:00 · 2022-01-20 13:57:31 +01:00 · 2022-01-20 10:39:34 +01:00
39 changed files with 2269 additions and 204 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,10 +32,17 @@ 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/api-linux
-            ./executables/api-macos
-            ./executables/api-win.exe
+            ./executables/linux.zip
+            ./executables/macos.zip
+            ./executables/windows.zip
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,91 @@

 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.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)


--- a/1
+++ b/1
@@ -1,5 +1,4 @@
 FROM node:lts-alpine
-RUN npm install -g @sasjs/cli
 WORKDIR /usr/server/api
 COPY ["package.json","package-lock.json", "./"]
 RUN npm ci
--- a/README.md
+++ b/README.md
@@ -8,6 +8,23 @@ 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).

+## Installation
+
+First, download the relevant package from the [releases](https://github.com/sasjs/server/releases) page - either manually, or with commandline, eg as follow:
+
+```bash
+curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
+unzip linux.zip
+./api-linux
+```
+
+Second, trigger by double clicking (windows) or executing from commandline.
+
+You are presented with two prompts:
+
+* Location of your `sas.exe` / `sas.sh` executable
+* Path to a filesystem location for Stored Programs and temporary files
+
 ## Configuration

 Configuration is made in the `configuration` section of `package.json`:
--- a/api/.env.example
+++ b/api/.env.example
@@ -6,3 +6,6 @@ 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
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -1,14 +1,14 @@
 {
  "name": "api",
-  "version": "0.0.1",
+  "version": "0.0.2",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "api",
-      "version": "0.0.1",
+      "version": "0.0.2",
      "dependencies": {
-        "@sasjs/core": "^2.48.6",
+        "@sasjs/core": "3.11.1",
        "@sasjs/utils": "2.34.1",
        "bcryptjs": "^2.4.3",
        "cors": "^2.8.5",
@@ -1551,9 +1551,9 @@
      }
    },
    "node_modules/@sasjs/core": {
-      "version": "2.48.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.48.6.tgz",
-      "integrity": "sha512-5kCf4TdCVOYve4wSHVTi+db34hknDwvY2C/JVEPHT6T3CkQ5cnwRVPSFz/1WzXzcVvdUi4ag5xd9SDOsU12oWA=="
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-3.11.1.tgz",
+      "integrity": "sha512-knS+FLBFy2TsDOSZy+8wNcydHXA/OIOgrc6Gcj3JfE3B4W+nkypGCMVAWywBrSUdeWlVpolMkFg12TKBfJvZ1A=="
    },
    "node_modules/@sasjs/utils": {
      "version": "2.34.1",
@@ -2607,9 +2607,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
      "dev": true,
      "bin": {
        "acorn": "bin/acorn"
@@ -13408,9 +13408,9 @@
      }
    },
    "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "dependencies": {
        "buffer-from": "^1.0.0",
@@ -13918,16 +13918,16 @@
      }
    },
    "node_modules/swagger-ui-dist": {
-      "version": "3.52.5",
-      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz",
-      "integrity": "sha512-8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.1.3.tgz",
+      "integrity": "sha512-WvfPSfAAMlE/sKS6YkW47nX/hA7StmhYnAHc6wWCXNL0oclwLj6UXv0hQCkLnDgvebi0MEV40SJJpVjKUgH1IQ=="
    },
    "node_modules/swagger-ui-express": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.1.6.tgz",
-      "integrity": "sha512-Xs2BGGudvDBtL7RXcYtNvHsFtP1DBFPMJFRxHe5ez/VG/rzVOEjazJOOSc/kSCyxreCTKfJrII6MJlL9a6t8vw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.2.0.tgz",
+      "integrity": "sha512-znrHTwh9UpvsjqgWopA4noIet7mi7UGuIYZ465YfUDKQ5Dpas0jxnkfUKCo+0aB17YCBv26AhIjiQYDV4uvJFA==",
      "dependencies": {
-        "swagger-ui-dist": "^3.18.1"
+        "swagger-ui-dist": ">3.52.5"
      },
      "engines": {
        "node": ">= v0.10.32"
@@ -16102,9 +16102,9 @@
      }
    },
    "@sasjs/core": {
-      "version": "2.48.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.48.6.tgz",
-      "integrity": "sha512-5kCf4TdCVOYve4wSHVTi+db34hknDwvY2C/JVEPHT6T3CkQ5cnwRVPSFz/1WzXzcVvdUi4ag5xd9SDOsU12oWA=="
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-3.11.1.tgz",
+      "integrity": "sha512-knS+FLBFy2TsDOSZy+8wNcydHXA/OIOgrc6Gcj3JfE3B4W+nkypGCMVAWywBrSUdeWlVpolMkFg12TKBfJvZ1A=="
    },
    "@sasjs/utils": {
      "version": "2.34.1",
@@ -17009,9 +17009,9 @@
      }
    },
    "acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
      "dev": true
    },
    "acorn-globals": {
@@ -25115,9 +25115,9 @@
      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
    },
    "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
@@ -25531,16 +25531,16 @@
      }
    },
    "swagger-ui-dist": {
-      "version": "3.52.5",
-      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz",
-      "integrity": "sha512-8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.1.3.tgz",
+      "integrity": "sha512-WvfPSfAAMlE/sKS6YkW47nX/hA7StmhYnAHc6wWCXNL0oclwLj6UXv0hQCkLnDgvebi0MEV40SJJpVjKUgH1IQ=="
    },
    "swagger-ui-express": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.1.6.tgz",
-      "integrity": "sha512-Xs2BGGudvDBtL7RXcYtNvHsFtP1DBFPMJFRxHe5ez/VG/rzVOEjazJOOSc/kSCyxreCTKfJrII6MJlL9a6t8vw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.2.0.tgz",
+      "integrity": "sha512-znrHTwh9UpvsjqgWopA4noIet7mi7UGuIYZ465YfUDKQ5Dpas0jxnkfUKCo+0aB17YCBv26AhIjiQYDV4uvJFA==",
      "requires": {
-        "swagger-ui-dist": "^3.18.1"
+        "swagger-ui-dist": ">3.52.5"
      }
    },
    "symbol-tree": {
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "api",
-  "version": "0.0.1",
+  "version": "0.0.2",
  "description": "Api of SASjs server",
  "main": "./src/server.ts",
  "scripts": {
@@ -41,12 +41,12 @@
  },
  "release": {
    "branches": [
-      "master"
+      "main"
    ]
  },
-  "author": "Analytium Ltd",
+  "author": "4GL Ltd",
  "dependencies": {
-    "@sasjs/core": "^2.48.6",
+    "@sasjs/core": "3.11.1",
    "@sasjs/utils": "2.34.1",
    "bcryptjs": "^2.4.3",
    "cors": "^2.8.5",
@@ -86,6 +86,6 @@
    "typescript": "^4.3.2"
  },
  "configuration": {
-    "sasPath": "/opt/sas/sas9/SASHome/SASFoundation/9.4"
+    "sasPath": "/opt/sas/sas9/SASHome/SASFoundation/9.4/sas"
  }
 }
--- a/api/public/swagger.yaml
+++ b/api/public/swagger.yaml
@@ -92,6 +92,16 @@ components:
                - clientSecret
            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
@@ -362,14 +372,15 @@ components:
            properties:
                status:
                    type: string
-                log:
-                    type: string
                _webout:
                    type: string
+                log:
+                    type: string
                message:
                    type: string
            required:
                - status
+                - _webout
            type: object
            additionalProperties: false
        ExecuteReturnJsonPayload:
@@ -390,7 +401,7 @@ info:
    version: 0.0.1
    description: 'Api of SASjs server'
    contact:
-        name: 'Analytium Ltd'
+        name: '4GL Ltd'
 openapi: 3.0.0
 paths:
    /SASjsApi/auth/authorize:
@@ -500,6 +511,30 @@ paths:
                    application/json:
                        schema:
                            $ref: '#/components/schemas/ClientPayload'
+    /SASjsApi/code/execute:
+        post:
+            operationId: ExecuteSASCode
+            responses:
+                '200':
+                    description: Ok
+                    content:
+                        application/json:
+                            schema:
+                                type: string
+            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
@@ -971,6 +1006,26 @@ paths:
                        format: double
                        type: number
                    example: '6789'
+    /SASjsApi/session:
+        get:
+            operationId: Session
+            responses:
+                '200':
+                    description: Ok
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/UserResponse'
+                            examples:
+                                'Example 1':
+                                    value: {id: 123, username: johnusername, displayName: John}
+            summary: 'Get session info (username).'
+            tags:
+                - Session
+            security:
+                -
+                    bearerAuth: []
+            parameters: []
    /SASjsApi/stp/execute:
        get:
            operationId: ExecuteReturnRaw
@@ -981,7 +1036,7 @@ paths:
                        application/json:
                            schema:
                                type: string
-            description: "Trigger a SAS program using it's location in the _program parameter.\r\nEnable debugging using the _debug parameter.\r\nAdditional URL parameters are turned into SAS macro variables.\r\nAny files provided are placed into the session and\r\ncorresponding _WEBIN_XXX variables are created."
+            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
@@ -1005,7 +1060,7 @@ paths:
                        application/json:
                            schema:
                                $ref: '#/components/schemas/ExecuteReturnJsonResponse'
-            description: "Trigger a SAS program using it's location in the _program parameter.\r\nEnable debugging using the _debug parameter.\r\nAdditional URL parameters are turned into SAS macro variables.\r\nAny files provided are placed into the session and\r\ncorresponding _WEBIN_XXX variables are created."
+            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
@@ -1030,6 +1085,9 @@ servers:
    -
        url: /
 tags:
+    -
+        name: Session
+        description: 'Get Session information'
    -
        name: User
        description: 'Operations about users'
@@ -1048,3 +1106,6 @@ tags:
    -
        name: STP
        description: 'Operations about STP'
+    -
+        name: CODE
+        description: 'Operations on SAS code'
--- a/api/src/app.ts
+++ b/api/src/app.ts
@@ -13,11 +13,14 @@ 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: `http://localhost:${PORT_WEB ?? 3000}` })
-  )
+  app.use(cors({ credentials: true, origin: whiteList }))
 }

 app.use(express.json({ limit: '50mb' }))
--- a/api/src/controllers/code.ts
+++ b/api/src/controllers/code.ts
@@ -0,0 +1,63 @@
+import express from 'express'
+import { Request, Security, Route, Tags, Post, Body } from 'tsoa'
+import { ExecutionController } from './internal'
+import { PreProgramVars } from '../types'
+
+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<string> {
+    return executeSASCode(request, body)
+  }
+}
+
+const executeSASCode = async (req: any, { code }: ExecuteSASCodePayload) => {
+  try {
+    const result = await new ExecutionController().executeProgram(
+      code,
+      getPreProgramVariables(req),
+      { ...req.query, _debug: 131 },
+      undefined,
+      true
+    )
+
+    return result as string
+  } 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
+  }
+}
--- a/api/src/controllers/index.ts
+++ b/api/src/controllers/index.ts
@@ -1,6 +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'
--- a/api/src/controllers/internal/Execution.ts
+++ b/api/src/controllers/internal/Execution.ts
@@ -6,7 +6,7 @@ import { PreProgramVars, TreeNode } from '../../types'
 import { generateFileUploadSasCode, getTmpFilesFolderPath } from '../../utils'

 export class ExecutionController {
-  async execute(
+  async executeFile(
    programPath: string,
    preProgramVariables: PreProgramVars,
    vars: { [key: string]: string | number | undefined },
@@ -16,12 +16,28 @@ export class ExecutionController {
    if (!(await fileExists(programPath)))
      throw 'ExecutionController: SAS file does not exist.'

-    let program = await readFile(programPath)
+    const program = await readFile(programPath)

+    return this.executeProgram(
+      program,
+      preProgramVariables,
+      vars,
+      otherArgs,
+      returnJson
+    )
+  }
+  async executeProgram(
+    program: string,
+    preProgramVariables: PreProgramVars,
+    vars: { [key: string]: string | number | undefined },
+    otherArgs?: any,
+    returnJson?: boolean
+  ) {
    const sessionController = getSessionController()

    const session = await sessionController.getSession()
    session.inUse = true
+    session.consumed = true

    const logPath = path.join(session.path, 'log.log')

@@ -85,14 +101,12 @@ ${program}`
    await createFile(codePath + '.bkp', program)
    await moveFile(codePath + '.bkp', codePath)

-    // we now need to poll the session array
+    // we now need to poll the session status
    while (!session.completed) {
      await delay(50)
    }

-    const log =
-      ((await fileExists(logPath)) ? await readFile(logPath) : '') +
-      session.crashed
+    const log = (await fileExists(logPath)) ? await readFile(logPath) : ''
    const webout = (await fileExists(weboutPath))
      ? await readFile(weboutPath)
      : ''
@@ -100,26 +114,20 @@ ${program}`
    const debugValue =
      typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug

-    let debugResponse: string | undefined
-
-    if ((debugValue && debugValue >= 131) || session.crashed) {
-      debugResponse = `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
-    }
-
+    // it should be deleted by scheduleSessionDestroy
    session.inUse = false
-    sessionController.deleteSession(session)

    if (returnJson) {
-      const response: any = {
-        webout: webout
+      return {
+        webout,
+        log:
+          (debugValue && debugValue >= 131) || session.crashed ? log : undefined
      }
-      if ((debugValue && debugValue >= 131) || session.crashed) {
-        response.log = log
    }

-      return response
-    }
-    return debugResponse ?? webout
+    return (debugValue && debugValue >= 131) || session.crashed
+      ? `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
+      : webout
  }

  buildDirectorytree() {
--- a/api/src/controllers/internal/Session.ts
+++ b/api/src/controllers/internal/Session.ts
@@ -12,7 +12,8 @@ import {
  createFile,
  fileExists,
  generateTimestamp,
-  readFile
+  readFile,
+  moveFile
 } from '@sasjs/utils'

 const execFilePromise = promisify(execFile)
@@ -20,8 +21,11 @@ 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.sessions.filter((sess: Session) => sess.ready)
+    const readySessions = this.getReadySessions()

    const session = readySessions.length
      ? readySessions[0]
@@ -32,8 +36,9 @@ export class SessionController {
    return session
  }

-  private async createSession() {
+  private async createSession(): Promise<Session> {
    const sessionId = generateUniqueFileName(generateTimestamp())
+    console.log('creating session', sessionId)
    const sessionFolder = path.join(getTmpSessionsFolderPath(), sessionId)

    const creationTimeStamp = sessionId.split('-').pop() as string
@@ -47,6 +52,7 @@ export class SessionController {
      id: sessionId,
      ready: false,
      inUse: false,
+      consumed: false,
      completed: false,
      creationTimeStamp,
      deathTimeStamp,
@@ -92,7 +98,7 @@ export class SessionController {
      .catch((err) => {
        session.completed = true
        session.crashed = err.toString()
-        console.log('session crashed', session.id)
+        console.log('session crashed', session.id, session.crashed)
      })

    // we have a triggered session - add to array
@@ -105,15 +111,16 @@ export class SessionController {
    return session
  }

-  public async waitForSession(session: Session) {
+  private async waitForSession(session: Session) {
    const codeFilePath = path.join(session.path, 'code.sas')

    // TODO: don't wait forever
    while ((await fileExists(codeFilePath)) && !session.crashed) {}
-    console.log('session crashed?', !!session.crashed, session.crashed)
+
+    if (session.crashed)
+      console.log('session crashed! while waiting to be ready', session.crashed)

    session.ready = true
-    return Promise.resolve(session)
  }

  public async deleteSession(session: Session) {
@@ -121,12 +128,10 @@ export class SessionController {
    await deleteFolder(session.path)

    // remove the session from the session array
-    if (session.ready) {
    this.sessions = this.sessions.filter(
      (sess: Session) => sess.id !== session.id
    )
  }
-  }

  private scheduleSessionDestroy(session: Session) {
    setTimeout(async () => {
--- a/api/src/controllers/session.ts
+++ b/api/src/controllers/session.ts
@@ -0,0 +1,30 @@
+import express from 'express'
+import { Request, Security, Route, Tags, Example, Get } from 'tsoa'
+import { UserResponse } from './user'
+
+@Security('bearerAuth')
+@Route('SASjsApi/session')
+@Tags('Session')
+export class SessionController {
+  /**
+   * @summary Get session info (username).
+   *
+   */
+  @Example<UserResponse>({
+    id: 123,
+    username: 'johnusername',
+    displayName: 'John'
+  })
+  @Get('/')
+  public async session(
+    @Request() request: express.Request
+  ): Promise<UserResponse> {
+    return session(request)
+  }
+}
+
+const session = (req: any) => ({
+  id: req.user.id,
+  username: req.user.username,
+  displayName: req.user.displayName
+})
--- a/api/src/controllers/stp.ts
+++ b/api/src/controllers/stp.ts
@@ -1,16 +1,6 @@
-import express, { response } from 'express'
+import express from 'express'
 import path from 'path'
-import {
-  Request,
-  Security,
-  Route,
-  Tags,
-  Example,
-  Post,
-  Body,
-  Get,
-  Query
-} from 'tsoa'
+import { Request, Security, Route, Tags, Post, Body, Get, Query } from 'tsoa'
 import { ExecutionController } from './internal'
 import { PreProgramVars } from '../types'
 import { getTmpFilesFolderPath, makeFilesNamesMap } from '../utils'
@@ -24,8 +14,8 @@ interface ExecuteReturnJsonPayload {
 }
 interface ExecuteReturnJsonResponse {
  status: string
+  _webout: string
  log?: string
-  _webout?: string
  message?: string
 }

@@ -50,6 +40,7 @@ export class STPController {
  ): Promise<string> {
    return executeReturnRaw(request, _program)
  }
+
  /**
   * Trigger a SAS program using it's location in the _program parameter.
   * Enable debugging using the _debug parameter.
@@ -82,7 +73,7 @@ const executeReturnRaw = async (
      .replace(new RegExp('/', 'g'), path.sep) + '.sas'

  try {
-    const result = await new ExecutionController().execute(
+    const result = await new ExecutionController().executeFile(
      sasCodePath,
      getPreProgramVariables(req),
      query
@@ -111,17 +102,17 @@ const executeReturnJson = async (
  const filesNamesMap = req.files?.length ? makeFilesNamesMap(req.files) : null

  try {
-    const jsonResult: any = await new ExecutionController().execute(
+    const { webout, log } = (await new ExecutionController().executeFile(
      sasCodePath,
      getPreProgramVariables(req),
      { ...req.query, ...req.body },
      { filesNamesMap: filesNamesMap },
      true
-    )
+    )) as { webout: string; log: string }
    return {
      status: 'success',
-      _webout: jsonResult.webout,
-      log: jsonResult.log
+      _webout: webout,
+      log
    }
  } catch (err: any) {
    throw {
--- a/api/src/middlewares/authenticateToken.ts
+++ b/api/src/middlewares/authenticateToken.ts
@@ -26,7 +26,7 @@ const authenticateToken = (
  res: any,
  next: any,
  key: string,
-  tokenType: 'accessToken' | 'refreshToken' = 'accessToken'
+  tokenType: 'accessToken' | 'refreshToken'
 ) => {
  const { MODE } = process.env
  if (MODE?.trim() !== 'server') {
--- a/api/src/middlewares/desktop.ts
+++ b/api/src/middlewares/desktop.ts
@@ -0,0 +1,18 @@
+export const desktopRestrict = (req: any, res: any, next: any) => {
+  const { MODE } = process.env
+  if (MODE?.trim() !== 'server')
+    return res.status(403).send('Not Allowed while in Desktop Mode.')
+
+  next()
+}
+export const desktopUsername = (req: any, res: any, next: any) => {
+  const { MODE } = process.env
+  if (MODE?.trim() !== 'server')
+    return res.status(200).send({
+      userId: 12345,
+      username: 'DESKTOPusername',
+      displayName: 'DESKTOP User'
+    })
+
+  next()
+}
--- a/api/src/middlewares/desktopRestrict.ts
+++ b/api/src/middlewares/desktopRestrict.ts
@@ -1,7 +0,0 @@
-export const desktopRestrict = (req: any, res: any, next: any) => {
-  const { MODE } = process.env
-  if (MODE?.trim() !== 'server')
-    return res.status(403).send('Not Allowed while in Desktop Mode.')
-
-  next()
-}
--- a/api/src/middlewares/index.ts
+++ b/api/src/middlewares/index.ts
@@ -1,4 +1,4 @@
 export * from './authenticateToken'
-export * from './desktopRestrict'
+export * from './desktop'
 export * from './verifyAdmin'
 export * from './verifyAdminIfNeeded'
--- a/api/src/routes/api/code.ts
+++ b/api/src/routes/api/code.ts
@@ -0,0 +1,25 @@
+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)
+    res.send(response)
+  } catch (err: any) {
+    const statusCode = err.code
+
+    delete err.code
+
+    res.status(statusCode).send(err)
+  }
+})
+
+export default runRouter
--- a/api/src/routes/api/index.ts
+++ b/api/src/routes/api/index.ts
@@ -5,18 +5,22 @@ import swaggerUi from 'swagger-ui-express'
 import {
  authenticateAccessToken,
  desktopRestrict,
+  desktopUsername,
  verifyAdmin
 } from '../../middlewares'

 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'

 const router = express.Router()

+router.use('/session', desktopUsername, authenticateAccessToken, sessionRouter)
 router.use('/auth', desktopRestrict, authRouter)
 router.use(
  '/client',
@@ -28,6 +32,7 @@ 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(
  '/',
--- a/api/src/routes/api/session.ts
+++ b/api/src/routes/api/session.ts
@@ -0,0 +1,17 @@
+import express from 'express'
+import { SessionController } from '../../controllers'
+import { authenticateAccessToken } from '../../middlewares'
+
+const sessionRouter = express.Router()
+
+sessionRouter.get('/', async (req, res) => {
+  const controller = new SessionController()
+  try {
+    const response = await controller.session(req)
+    res.send(response)
+  } catch (err: any) {
+    res.status(403).send(err.toString())
+  }
+})
+
+export default sessionRouter
--- a/api/src/routes/api/stp.ts
+++ b/api/src/routes/api/stp.ts
@@ -1,5 +1,5 @@
 import express from 'express'
-import { executeProgramRawValidation } from '../../utils'
+import { executeProgramRawValidation, runSASValidation } from '../../utils'
 import { STPController } from '../../controllers/'
 import { FileUploadController } from '../../controllers/internal'

--- a/api/src/types/Process.d.ts
+++ b/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
  }
 }
--- a/api/src/types/Session.ts
+++ b/api/src/types/Session.ts
@@ -5,6 +5,7 @@ export interface Session {
  deathTimeStamp: string
  path: string
  inUse: boolean
+  consumed: boolean
  completed: boolean
  crashed?: string
 }
--- a/api/src/utils/connectDB.ts
+++ b/api/src/utils/connectDB.ts
@@ -3,12 +3,17 @@ import mongoose from 'mongoose'
 import { configuration } from '../../package.json'
 import { getDesktopFields } from '.'
 import { populateClients } from '../routes/api/auth'
+import { getRealPath } from '@sasjs/utils'

 export const connectDB = async () => {
  // NOTE: when exporting app.js as agent for supertest
  // we should exlcude connecting to the real database
-  if (process.env.NODE_ENV !== 'test') {
+  if (process.env.NODE_ENV === 'test') {
+    process.driveLoc = path.join(process.cwd(), 'tmp')
+    return
+  } else {
    const { MODE } = process.env
+
    if (MODE?.trim() !== 'server') {
      console.log('Running in Destop Mode, no DB to connect.')

@@ -16,16 +21,19 @@ export const connectDB = async () => {

      process.sasLoc = sasLoc
      process.driveLoc = driveLoc
-
-      return
    } else {
-      const { SAS_PATH } = process.env
-      const sasDir = SAS_PATH ?? configuration.sasPath
+      const { SAS_PATH, DRIVE_PATH } = process.env

-      process.sasLoc = path.join(sasDir, 'sas')
+      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)
+
+    if (MODE?.trim() !== 'server') return

    mongoose.connect(process.env.DB_CONNECT as string, async (err) => {
      if (err) throw err
--- a/api/src/utils/file.ts
+++ b/api/src/utils/file.ts
@@ -1,5 +1,4 @@
 import path from 'path'
-import { getRealPath } from '@sasjs/utils'

 export const apiRoot = path.join(__dirname, '..', '..')
 export const codebaseRoot = path.join(apiRoot, '..')
@@ -12,8 +11,7 @@ export const sysInitCompiledPath = path.join(
 export const getWebBuildFolderPath = () =>
  path.join(codebaseRoot, 'web', 'build')

-export const getTmpFolderPath = () =>
-  process.driveLoc ?? getRealPath(path.join(process.cwd(), 'tmp'))
+export const getTmpFolderPath = () => process.driveLoc

 export const getTmpFilesFolderPath = () =>
  path.join(getTmpFolderPath(), 'files')
--- a/api/src/utils/getDesktopFields.ts
+++ b/api/src/utils/getDesktopFields.ts
@@ -5,8 +5,10 @@ import { createFolder, fileExists, folderExists } from '@sasjs/utils'
 const isWindows = () => process.platform === 'win32'

 export const getDesktopFields = async () => {
-  const sasLoc = await getSASLocation()
-  const driveLoc = await getDriveLocation()
+  const { SAS_PATH, DRIVE_PATH } = process.env
+
+  const sasLoc = SAS_PATH ?? (await getSASLocation())
+  const driveLoc = DRIVE_PATH ?? (await getDriveLocation())

  return { sasLoc, driveLoc }
 }
--- a/api/src/utils/validation.ts
+++ b/api/src/utils/validation.ts
@@ -77,6 +77,11 @@ export const updateFileDriveValidation = (data: any): Joi.ValidationResult =>
    fileContent: Joi.string().required()
  }).validate(data)

+export const runSASValidation = (data: any): Joi.ValidationResult =>
+  Joi.object({
+    code: Joi.string().required()
+  }).validate(data)
+
 export const executeProgramRawValidation = (data: any): Joi.ValidationResult =>
  Joi.object({
    _program: Joi.string().required()
--- a/api/tsoa.json
+++ b/api/tsoa.json
@@ -11,6 +11,10 @@
      }
    },
    "tags": [
+      {
+        "name": "Session",
+        "description": "Get Session information"
+      },
      {
        "name": "User",
        "description": "Operations about users"
@@ -34,6 +38,10 @@
      {
        "name": "STP",
        "description": "Operations about STP"
+      },
+      {
+        "name": "CODE",
+        "description": "Operations on SAS code"
      }
    ],
    "yaml": true,
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
      context: .
      dockerfile: DockerfileApi
    environment:
-      MODE: ${MODE}
+      MODE: 'server'
      CORS: ${CORS}
      PORT: ${PORT_API}
      PORT_WEB: ${PORT_WEB}
@@ -43,7 +43,7 @@ services:
      - ./web:/usr/server/web

  mongodb:
-    image: mongo:latest
+    image: mongo:5.0.4
    ports:
      - 27017:27017
    volumes:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
  "name": "server",
-  "version": "0.0.9",
+  "version": "0.0.20",
  "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 ..",
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -19,7 +19,14 @@ function App() {
      <ThemeProvider theme={theme}>
        <HashRouter>
          <Header />
+          <Switch>
+            <Route exact path="/SASjsLogon">
+              <Login getCodeOnly />
+            </Route>
+            <Route path="/">
              <Login setTokens={setTokens} />
+            </Route>
+          </Switch>
        </HashRouter>
      </ThemeProvider>
    )
@@ -39,6 +46,9 @@ function App() {
          <Route exact path="/SASjsStudio">
            <Studio />
          </Route>
+          <Route exact path="/SASjsLogon">
+            <Login getCodeOnly />
+          </Route>
        </Switch>
      </HashRouter>
    </ThemeProvider>
--- a/web/src/components/home.tsx
+++ b/web/src/components/home.tsx
@@ -23,7 +23,7 @@ const Home = () => {
        and contributions are welcomed.
      </p>
      <p>
-        SASjs Server is maintained by the SASjs Apps team -{' '}
+        SASjs Server is maintained by the SAS Apps team -{' '}
        <a
          href="https://sasapps.io/contact-us"
          target="_blank"
--- a/web/src/components/login.tsx
+++ b/web/src/components/login.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from 'react'
+import { useLocation } from 'react-router-dom'
 import PropTypes from 'prop-types'

-import { CssBaseline, Box, TextField, Button } from '@mui/material'
+import { CssBaseline, Box, TextField, Button, Typography } from '@mui/material'

 const headers = {
  Accept: 'application/json',
@@ -18,7 +19,12 @@ const getAuthCode = async (credentials: any) => {
    method: 'POST',
    headers,
    body: JSON.stringify(credentials)
-  }).then((data) => data.json())
+  }).then(async (response) => {
+    const resText = await response.text()
+    if (response.status !== 200) throw resText
+
+    return JSON.parse(resText)
+  })
 }
 const getTokens = async (payload: any) => {
  return fetch(`${baseUrl}/SASjsApi/auth/token`, {
@@ -28,20 +34,40 @@ const getTokens = async (payload: any) => {
  }).then((data) => data.json())
 }

-const Login = ({ setTokens }: any) => {
-  const [username, setUserName] = useState()
-  const [password, setPassword] = useState()
+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 handleSubmit = async (e: any) => {
+    error = false
+    setErrorMessage('')
    e.preventDefault()
-    const { REACT_APP_CLIENT_ID: clientId } = process.env
+    let { REACT_APP_CLIENT_ID: clientId } = process.env
+
+    if (getCodeOnly) {
+      const params = new URLSearchParams(location.search)
+      const responseType = params.get('response_type')
+      if (responseType === 'code')
+        clientId = params.get('client_id') ?? undefined
+    }

    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
@@ -49,6 +75,22 @@ const Login = ({ setTokens }: any) => {

      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>
+    )
+  }

  return (
    <Box
@@ -61,7 +103,12 @@ const Login = ({ setTokens }: any) => {
    >
      <CssBaseline />
      <br />
-      <h2>Welcome to SASjs Server!</h2>
+      <h2 style={{ width: 'auto' }}>Welcome to SASjs Server!</h2>
+      {getCodeOnly && (
+        <p style={{ width: 'auto' }}>
+          Provide credentials to get authorization code.
+        </p>
+      )}
      <br />

      <TextField
@@ -80,6 +127,7 @@ const Login = ({ setTokens }: any) => {
        onChange={(e: any) => setPassword(e.target.value)}
        required
      />
+      {errorMessage && <span>{errorMessage}</span>}
      <Button type="submit" variant="outlined">
        Submit
      </Button>
@@ -88,7 +136,8 @@ const Login = ({ setTokens }: any) => {
 }

 Login.propTypes = {
-  setTokens: PropTypes.func.isRequired
+  setTokens: PropTypes.func,
+  getCodeOnly: PropTypes.bool
 }

 export default Login
--- a/web/src/components/useTokens.ts
+++ b/web/src/components/useTokens.ts
@@ -3,15 +3,8 @@ import { useEffect, useState } from 'react'

 export default function useTokens() {
  const getTokens = () => {
-    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
+    const accessToken = localStorage.getItem('accessToken')
+    const refreshToken = localStorage.getItem('refreshToken')

    if (accessToken && refreshToken) {
      setAxiosRequestHeader(accessToken)
@@ -31,8 +24,8 @@ export default function useTokens() {
  setAxiosResponse(setTokens)

  const saveTokens = (accessToken: string, refreshToken: string) => {
-    localStorage.setItem('accessToken', JSON.stringify(accessToken))
-    localStorage.setItem('refreshToken', JSON.stringify(refreshToken))
+    localStorage.setItem('accessToken', accessToken)
+    localStorage.setItem('refreshToken', refreshToken)
    setAxiosRequestHeader(accessToken)
    setTokens({ accessToken, refreshToken })
  }
--- a/web/src/containers/Drive/main.tsx
+++ b/web/src/containers/Drive/main.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react'
+import { Link } from 'react-router-dom'
 import axios from 'axios'

 import Editor from '@monaco-editor/react'
@@ -89,10 +90,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}
@@ -110,17 +111,26 @@ const Main = (props: any) => {
        <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>
  )
--- a/web/src/containers/Studio/index.tsx
+++ b/web/src/containers/Studio/index.tsx
@@ -1,14 +1,165 @@
-import React from 'react'
+import React, { useEffect, useRef, useState } from 'react'
+import axios from 'axios'

-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) => {
+        setLog(`<div><h2>SAS Log</h2><pre>${res?.data?.log}</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 (
-    <Box className="main">
-      <CssBaseline />
-      <h2>This is container for SASjs studio</h2>
+    <>
+      <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>
+    </>
  )
 }
Author	SHA1	Message	Date
munja	083355fdba	chore(release): 0.0.20	2022-01-20 14:03:05 +01:00
munja	a3b57f6e28	fix: fixing versioning blooper	2022-01-20 14:03:00 +01:00
munja	b0ffa145bc	chore(release): 0.0.2	2022-01-20 13:57:35 +01:00
munja	a8df5f4afd	fix: bumping core version	2022-01-20 13:57:31 +01:00
munja	62de960e86	chore(release): 0.0.19	2022-01-20 10:39:34 +01:00
munja	31532c0efa	fix: bumping sasjs/core and updating descriptions	2022-01-20 10:37:22 +01:00
Allan Bowe	732230524d	Merge pull request #46 from sasjs/allanbowe-patch-1 Update README.md	2022-01-20 11:06:25 +02:00
Allan Bowe	6dc281313e	Update README.md	2022-01-19 22:34:41 +00:00
munja	92db3c7c82	chore(release): 0.0.18	2022-01-08 20:24:57 +01:00
munja	d8b75a47d3	fix: compressing release files for faster download times	2022-01-08 20:22:22 +01:00
Saad Jutt	d70fc1032f	chore(release): 0.0.17	2022-01-08 02:15:38 +05:00
Muhammad Saad	794ee8f6e0	Merge pull request #45 from sasjs/hot-fix fix: bug removed, log is clean now	2022-01-08 01:11:04 +04:00
Saad Jutt	43769e711d	fix: bug removed, log is clean now	2022-01-08 00:42:32 +05:00
Saad Jutt	30528a1528	chore(release): 0.0.16	2022-01-07 16:47:01 +05:00
Muhammad Saad	b7e1753d25	Merge pull request #44 from sasjs/cors-update Cors update	2022-01-07 15:46:24 +04:00
Saad Jutt	9c5772a303	chore: clean up	2022-01-07 16:42:38 +05:00
Saad Jutt	7a3d710153	fix: session should be marked as consumed	2022-01-07 16:34:46 +05:00
Saad Jutt	0a6ebe6e62	chore: debugging	2022-01-07 15:38:11 +05:00
Saad Jutt	6cbc657da3	fix: recreate crashed session	2022-01-06 23:12:44 +05:00
Saad Jutt	cd838915fd	fix: added sas9 server address	2022-01-06 18:40:23 +05:00
Saad Jutt	4e486fda69	chore(release): 0.0.15	2022-01-06 17:23:29 +05:00
Muhammad Saad	79cac53fdb	Merge pull request #42 from sasjs/run-sas-code-route Run sas code route	2022-01-06 16:23:07 +04:00
Saad Jutt	450d99f06e	fix(web): sticky tabs on Studio + extra run code button removed	2022-01-05 17:41:17 +05:00
Saad Jutt	51ee8c0825	fix(web): autosave and autofocus	2021-12-30 12:56:23 +05:00
Saad Jutt	a1151606f2	fix(web): parsing of webout	2021-12-30 12:18:48 +05:00
Saad Jutt	38193c83dd	chore: Merge branch 'main' into run-sas-code-route	2021-12-30 12:18:16 +05:00
Muhammad Saad	59ecc36f2b	Merge pull request #43 from sasjs/allanbowe-patch-1 Update home.tsx	2021-12-30 12:07:14 +05:00
Allan Bowe	8bc459c9a7	Update home.tsx	2021-12-29 19:15:21 +00:00
Saad Jutt	f1f1e47f76	chore(web): display webout as well	2021-12-29 01:00:53 +05:00
Saad Jutt	679e9de245	chore: return webout and log seperately	2021-12-29 00:27:54 +05:00
Saad Jutt	f0ac996b3c	chore(web): build fix	2021-12-28 22:18:18 +05:00
Saad Jutt	2d77222ae8	fix(studio): web component updated	2021-12-28 22:02:11 +05:00
Saad Jutt	e6e5a5fd64	chore(code): updated route to code/execute	2021-12-21 14:24:27 +05:00
Saad Jutt	e1eb04494a	fix: updated route for sas code	2021-12-21 12:36:58 +05:00
Allan Bowe	b7fa8e5f80	Merge pull request #40 from sasjs/fix-specs chore: added driveLoc for specs	2021-12-20 11:39:55 +02:00
Saad Jutt	ef4fae4496	chore: added driveLoc for specs	2021-12-20 10:47:47 +05:00
munja	3e5a4e0555	chore(release): 0.0.14	2021-12-19 11:35:08 +00:00
Allan Bowe	cf9a8091ea	Merge pull request #39 from sasjs/master chore: updating package.json	2021-12-19 13:33:41 +02:00
munja	0edc45dd0a	chore: updating package.json	2021-12-19 11:32:48 +00:00
munja	ceca370e27	fix: switch to main branch	2021-12-19 11:30:27 +00:00
Allan Bowe	f235b9c2f9	Merge pull request #38 from sasjs/weboutfix fix: actually a README change, the fix was in the previous commit (up…	2021-12-18 23:24:57 +02:00
Allan Bowe	d86c841f1f	fix: actually a README change, the fix was in the previous commit (updating ms_webout) that should have been a PR, to trigger a release	2021-12-18 20:31:40 +00:00
Allan Bowe	076b866c02	fix: bumping sasjs/core with adjustment to ms_webout()	2021-12-18 20:26:07 +00:00
Saad Jutt	19d4430b31	chore(release): 0.0.13	2021-12-16 16:13:05 +05:00
Saad Jutt	e5be0e6789	fix: output for Studio	2021-12-16 12:44:57 +05:00
Saad Jutt	27129a8921	feat(studio): run selected code + open in studio	2021-12-16 12:14:32 +05:00
Saad Jutt	da11c03d55	chore: sasjs/core version bumped	2021-12-15 19:57:09 +05:00
Saad Jutt	4fbdda0365	chore: .env.example updated	2021-12-15 18:58:04 +05:00
Saad Jutt	efacb1e916	chore(release): 0.0.12	2021-12-15 18:24:17 +05:00
Saad Jutt	d19ce253b4	fix: use env if provided for desktop mode	2021-12-15 18:24:04 +05:00
Saad Jutt	e11a4b66e7	chore(release): 0.0.11	2021-12-15 17:51:42 +05:00
Muhammad Saad	d0a1457f44	feat: added authorization route for web (#37 )	2021-12-15 17:51:19 +05:00
Saad Jutt	34e54934fd	chore(release): 0.0.10	2021-12-07 16:04:07 +05:00
Allan Bowe	4873e6054f	Merge pull request #36 from sasjs/check-session-token-validity chore: added check session + code refactor	2021-12-07 08:49:00 +00:00
Saad Jutt	b00aa4e17b	chore: additional info on SAS session crash	2021-12-07 10:37:36 +05:00
Saad Jutt	9fccfe6f35	chore: Merge branch 'master' into check-session-token-validity	2021-12-07 10:37:02 +05:00
Saad Jutt	43545fa04b	chore: added check session + code refactor	2021-12-05 08:17:54 +05:00