build: axios package dependency changes. Missing type added in Group.ts

build: updated axios and jsonwebtoken versions
2026-07-24 21:52:15 +00:00 · 2025-09-16 15:01:11 +01:00 · 2025-09-16 11:52:06 +01:00
75 changed files with 22417 additions and 8629 deletions
@@ -1 +0,0 @@
-* text=auto eol=lf
@@ -5,7 +5,7 @@ on:

 jobs:
  lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    strategy:
      matrix:
@@ -28,7 +28,7 @@ jobs:
        run: npm run lint-web

  build-api:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    strategy:
      matrix:
@@ -66,7 +66,7 @@ jobs:
          CI: true

  build-web:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    strategy:
      matrix:
@@ -7,7 +7,7 @@ on:

 jobs:
  release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest

    strategy:
      matrix:
@@ -1 +0,0 @@
-ignore-scripts=true
@@ -1,53 +1,3 @@
-## [0.39.7](https://github.com/sasjs/server/compare/v0.39.6...v0.39.7) (2026-07-14)
-
-
-### Bug Fixes
-
-* **jsonwebtoken:** bumped version to avoid vulnerability ([1473925](https://github.com/sasjs/server/commit/1473925896db0e4472c9ef5ba64955527a1be2de))
-
-## [0.39.6](https://github.com/sasjs/server/compare/v0.39.5...v0.39.6) (2026-07-14)
-
-
-### Bug Fixes
-
-* **api:** isolate drive.spec.ts's files folder from the real drive ([dec5191](https://github.com/sasjs/server/commit/dec51914911c10b66b43ebe95f77b0af63e2d03e))
-* **api:** stop overwriting a failed JS/PY/R session back to completed ([4858245](https://github.com/sasjs/server/commit/4858245372fa19929b6e59c28148f5d004239c9d))
-
-## [0.39.5](https://github.com/sasjs/server/compare/v0.39.4...v0.39.5) (2026-07-14)
-
-
-### Bug Fixes
-
-* **api:** harden mock SAS executable and timeouts for CI ([67fce47](https://github.com/sasjs/server/commit/67fce475a3c53b3c20919902edb45dce809dffb9))
-* **api:** return prompt error response instead of hanging when a SAS session fails ([f84af4a](https://github.com/sasjs/server/commit/f84af4ac0639625fee4508e764f0eed07d7b4e8a))
-* fix code.spec.ts failing on a fresh checkout (CI) ([0af6b63](https://github.com/sasjs/server/commit/0af6b63ffa770bfa2b77505d74778be517f8d631))
-
-## [0.39.4](https://github.com/sasjs/server/compare/v0.39.3...v0.39.4) (2025-12-21)
-
-
-### Bug Fixes
-
-* **deps:** bump dependencies and resolve audit issues ([4f78202](https://github.com/sasjs/server/commit/4f782025dbcdfcbae6ca1fabb42ce1bc385e0162))
-
-## [0.39.3](https://github.com/sasjs/server/compare/v0.39.2...v0.39.3) (2025-11-25)
-
-
-### Bug Fixes
-
-* (deps) bump @sasjs/core to 4.59.7 ([ab96653](https://github.com/sasjs/server/commit/ab966535642d08d4e8e984007b98c8fdffbe30f7))
-* (deps) rerun npm i to sync ([225f381](https://github.com/sasjs/server/commit/225f381bdf8ad5aa2af8d75648df1dd5175e12e0))
-
-## [0.39.2](https://github.com/sasjs/server/compare/v0.39.1...v0.39.2) (2025-09-25)
-
-
-### Bug Fixes
-
-* addressing test fail ([e51b204](https://github.com/sasjs/server/commit/e51b20421adc1598ea267c79b1fb4dbc085f97b9))
-* packages missmatch ([379ea60](https://github.com/sasjs/server/commit/379ea604bcb5686b5299fae6a32f759c45b275ea))
-* type libs ([6d123c3](https://github.com/sasjs/server/commit/6d123c3e23628c1d703eaa13142c77f0da970a55))
-* typescript errors ([631e956](https://github.com/sasjs/server/commit/631e95604b64b1a96f2abade659348618f3b00b2))
-* typescript errors ([198cd79](https://github.com/sasjs/server/commit/198cd79354254511c21ac1acfbf7b6bcfdab2af7))
-
 ## [0.39.1](https://github.com/sasjs/server/compare/v0.39.0...v0.39.1) (2025-03-13)


@@ -1,38 +0,0 @@
-# Code execution & session diagrams
-
-Mermaid diagrams describing how `@sasjs/server` executes submitted code
-(SAS/JS/PY/R) against pooled "sessions". Written for fast context-loading by
-an AI coding agent: each diagram is self-contained, node/edge labels carry
-the actual file:line references, and prose is kept to the minimum needed to
-disambiguate the diagram.
-
-| File | Covers |
-|---|---|
-| [session-lifecycle.md](session-lifecycle.md) | `SessionState` state machine; how it differs between the SAS runtime and the JS/PY/R runtimes |
-| [sas-execution-handshake.md](sas-execution-handshake.md) | The SYSIN/AUTOEXEC file-swap mechanism a SAS session uses to turn one long-lived `sas` process into a single-use execution slot |
-| [request-execution-flow.md](request-execution-flow.md) | End-to-end flowchart from HTTP request to response, covering session-pool acquisition and both runtime branches (SAS vs JS/PY/R) |
-
-## Core concept
-
-A "session" is not a request-scoped object. It is a pooled, reusable
-execution slot with a filesystem folder (`session.path`) and a state
-(`SessionState`). For the SAS runtime specifically, a session also owns one
-real OS process, spawned at session-*creation* time and consumed by exactly
-one code submission (see `sas-execution-handshake.md`). For JS/PY/R, a
-session is just an ID + folder; the actual interpreter process is spawned
-fresh per request inside `processProgram`.
-
-## Key source files
-
- `api/src/controllers/internal/Session.ts` — session pool + lifecycle
-  (`SessionController`, `SASSessionController`), `SessionState` transitions.
- `api/src/controllers/internal/processProgram.ts` — writes the submitted
-  code into the session and drives it to completion/failure, per runtime.
- `api/src/controllers/internal/Execution.ts` — `ExecutionController`,
-  the entry point controllers call; acquires a session, calls
-  `processProgram`, reads back `log.log`/`webout.txt`/headers, builds the
-  HTTP response (or a `SessionExecutionError` on failure).
- `api/src/controllers/internal/create{SAS,JS,Python,R}Program.ts` —
-  per-runtime code templating (wraps the user's submitted code with
-  boilerplate: variable injection, `_webout` redirection, etc).
- `api/src/types/Session.ts` — `SessionState` enum and `Session` interface.
@@ -1,64 +0,0 @@
-# Request execution flow (end-to-end)
-
-Full path from an inbound HTTP request to the HTTP response, covering
-session-pool acquisition and the two structurally different runtime
-branches: SAS (reuses a parked long-lived process) vs JS/PY/R (spawns a
-fresh interpreter process per request).
-
-```mermaid
-flowchart TD
-    A["HTTP request<br/>POST /SASjsApi/code/execute<br/>or /SASjsApi/stp/execute"] --> B["Controller<br/>code.ts / stp.ts<br/>try/catch wrapper"]
-    B --> C["ExecutionController.executeProgram<br/>or .executeFile<br/>Execution.ts:58-91"]
-    C --> D{"session already provided?<br/>(e.g. file-upload flow)"}
-    D -- no --> E["getSessionController(runTime).getSession()<br/>Session.ts:59-69"]
-    D -- yes --> F["use provided session"]
-    E --> G{"pending session<br/>available in pool?"}
-    G -- yes --> H["reuse it"]
-    G -- no --> I["createSession()<br/>SAS: spawns a real sas process, see<br/>sas-execution-handshake.md<br/>JS/PY/R: cheap - folder + id only"]
-    H --> J["pre-warm: if pool has fewer<br/>than 3 pending, fire off more<br/>createSession() calls (not awaited)<br/>Session.ts:66"]
-    I --> J
-    F --> K
-    J --> K["session.state = running<br/>Execution.ts:96"]
-    K --> L["write webout.txt (empty),<br/>reqHeaders.txt<br/>Execution.ts:103-107"]
-    L --> M["processProgram(...)<br/>processProgram.ts:16-27"]
-
-    M --> N{"runTime?"}
-
-    N -- SAS --> O["createSASProgram():<br/>wrap user code with _webout<br/>filename, macro vars, autoexec"]
-    O --> P["write code.sas via .bkp + rename<br/>processProgram.ts:48-49"]
-    P --> Q["poll: while session.state !== completed<br/>processProgram.ts:52-58"]
-    Q -- "state becomes completed" --> R["resolve"]
-    Q -- "state becomes failed" --> S["throw Error(session.failureReason)"]
-
-    N -- "JS / PY / R" --> T["createJSProgram / createPythonProgram /<br/>createRProgram: wrap user code similarly"]
-    T --> U["write code file; spawn interpreter<br/>fresh via execFile; pipe stdout/stderr<br/>into a log.log write stream<br/>processProgram.ts:108-134"]
-    U -- "exit 0" --> R
-    U -- "exit non-zero" --> S
-
-    R --> V["read log.log, webout.txt,<br/>stpsrv_header.txt<br/>Execution.ts:128-131"]
-    V --> W["build httpHeaders + result<br/>return ExecuteReturnRaw<br/>Execution.ts:128-151"]
-    W --> X["Controller: res.send(result)<br/>HTTP 200"]
-
-    S --> Y["catch in Execution.ts:109-126:<br/>read whatever log exists,<br/>throw SessionExecutionError(message, log)"]
-    Y --> Z["Controller catch block<br/>rethrow { code: 400, status: 'failure',<br/>message, error, log }"]
-    Z --> AA["res.status(err.code).send(err)<br/>HTTP 400 with complete log"]
-```
-
-## Notes
-
- **Session pool is per-runtime.** SAS sessions and JS/PY/R sessions live in
-  separate controllers/pools (`process.sasSessionController` vs
-  `process.sessionController`, `Session.ts:239-253`) - a pending SAS session
-  is never handed out for a JS request or vice versa.
- **The SAS branch and the JS/PY/R branch converge** on the same
-  success/failure signal shape: `session.state` becomes `completed` or
-  `failed` either way, and both paths flow through the same log/webout
-  reading logic in `Execution.ts` afterward. The mechanics of *how* that
-  state gets set differ substantially (see `session-lifecycle.md`).
- **`includePrintOutput`** (SAS only) additionally appends `output.lst`
-  content to the result when debug mode is on - omitted above for brevity;
-  see `Execution.ts:135-142`.
- **`triggerProgram`/`triggerCode`** (fire-and-forget variants, not shown)
-  call the same `ExecutionController` methods without awaiting them and
-  immediately return `{ sessionId }`; the client polls
-  `GET /SASjsApi/session/{sessionId}/state` separately.
@@ -1,81 +0,0 @@
-# SAS session execution handshake
-
-How one long-lived `sas` process is turned into a single-use execution slot
-via a SYSIN file-swap trick. This is the mechanism specific to
-`RunTimeType.SAS`; JS/PY/R sessions spawn a fresh interpreter process per
-request instead (see `request-execution-flow.md`).
-
-```mermaid
-sequenceDiagram
-    participant Client as HTTP client
-    participant Ctrl as Controller<br/>(code.ts / stp.ts)
-    participant Exec as ExecutionController<br/>(Execution.ts)
-    participant Pool as SASSessionController<br/>(Session.ts)
-    participant FS as Filesystem<br/>(session.path)
-    participant SAS as spawned "sas" process
-
-    Note over Pool,SAS: SESSION CREATION - happens ahead of any request,<br/>pool pre-warms up to 3 sessions (Session.ts:59-69)
-    Pool->>FS: createFile(code.sas, "") - empty dummy SYSIN (Session.ts:117-118)
-    Pool->>FS: readFile(sysInitCompiledPath) - compiled system-init<br/>macros, produced by `npm run compileSysInit` (Session.ts:105)
-    Note over Pool: throws if this file doesn't exist yet -<br/>session creation never reaches execFile below
-    Pool->>FS: createFile(autoexec.sas, autoExecContent) (Session.ts:108-114)
-    Pool->>SAS: execFile(sasLoc, -SYSIN code.sas -AUTOEXEC autoexec.sas -LOG log.log ...) (Session.ts:127-147)
-    activate SAS
-    Note right of SAS: process stays active (this box)<br/>from spawn until it finally exits below
-    SAS->>FS: autoexec step 1: delete code.sas, the dummy SYSIN (Session.ts:257-261)
-    Pool->>FS: waitForSession() polls fileExists(code.sas) (Session.ts:175-192)
-    FS-->>Pool: code.sas no longer exists
-    Pool->>Pool: session.state = pending (Session.ts:190)
-    SAS->>SAS: autoexec step 2: busy-wait for code.sas to reappear,<br/>up to 15 minutes (Session.ts:263-274)
-    Note over SAS: process is now idle, parked mid-autoexec,<br/>waiting on the filesystem.<br/>Counts as "pending" in the pool.
-
-    Note over Client,SAS: REQUEST ARRIVES - reuses the parked process above
-    Client->>Ctrl: POST .../execute { code, runTime: sas }
-    Ctrl->>Exec: executeProgram({ program, runTime: SAS, ... })
-    Exec->>Pool: getSession() returns the pending session (Session.ts:59-69)
-    Exec->>Exec: session.state = running (Execution.ts:96)
-    Exec->>FS: createFile(webout.txt, "") and createFile(reqHeaders.txt, ...) (Execution.ts:103-107)
-    Exec->>Pool: processProgram(program, session, ...) (Execution.ts:110-121)
-    Pool->>FS: createSASProgram() wraps user code with macro vars,<br/>_webout filename, autoexec injection (createSASProgram.ts)
-    Pool->>FS: write code.sas.bkp, then rename to code.sas (processProgram.ts:48-49)
-    Note over FS: write-then-rename, not a direct write,<br/>so SAS never reads a partial file
-
-    FS-->>SAS: code.sas exists again
-    SAS->>SAS: autoexec step 2 loop exits, sleeps 0.01s, autoexec ends (Session.ts:267-271)
-    Note over SAS: -SYSIN has pointed at code.sas from the start,<br/>so SAS now executes ITS CONTENT as the main job
-    SAS->>FS: writes log.log, output.lst, webout.txt while running
-
-    Pool->>Pool: processProgram poll loop:<br/>while session.state !== completed (processProgram.ts:52-58)
-
-    alt program reaches EOF normally
-        SAS->>SAS: exits with code 0
-        SAS-->>Pool: execFilePromise resolves - .then() (Session.ts:148-152)
-        Pool->>Pool: session.state = completed
-        Pool-->>Exec: processProgram() resolves
-    else program aborts (fatal error, license failure, hard STOP)
-        SAS->>SAS: exits with non-zero code
-        SAS-->>Pool: execFilePromise rejects - .catch() (Session.ts:153-163)
-        Pool->>Pool: session.state = failed<br/>session.failureReason = err.toString()
-        Pool-->>Exec: processProgram() throws (processProgram.ts:53-55)
-    end
-    deactivate SAS
-
-    Exec->>FS: read log.log, webout.txt, stpsrv_header.txt (Execution.ts:123, 128-131)
-    Exec-->>Ctrl: { httpHeaders, result }<br/>or throws SessionExecutionError{ message, log } (Execution.ts:109-126)
-    Ctrl-->>Client: 200 + result<br/>or 400 { status, message, error, log }
-```
-
-## Why this design
-
- SAS has meaningful startup cost (loading the engine, running system init
-  macros). Spawning a fresh `sas` process per request would pay that cost
-  every time. Instead, a process is spawned once and parked, ready to run
-  exactly one job the moment code shows up at a path it's already watching.
- The pool (`SessionController.getSession`, `Session.ts:59-69`) keeps up to
-  3 such parked processes ready, so most requests get an instant handoff
-  instead of waiting through the ~15-minute autoexec spin-wait or a cold
-  start.
- A session is single-use: once its process consumes the real SYSIN content
-  and exits (success or failure), that process is gone. The session object
-  itself is deleted later by `scheduleSessionDestroy` (`Session.ts:204-236`),
-  not reused for a second job.
@@ -1,70 +0,0 @@
-# Session lifecycle (`SessionState`)
-
-Enum defined in `api/src/types/Session.ts`. A `Session` is `{ id, state,
-path, creationTimeStamp, deathTimeStamp, expiresAfterMins?, failureReason? }`.
-Sessions live in an in-memory array on a per-runtime singleton controller
-(`process.sasSessionController` for SAS, `process.sessionController` shared
-by JS/PY/R — see `getSessionController()` in `Session.ts:239-253`).
-
-```mermaid
-stateDiagram-v2
-    [*] --> initialising: SAS runtime<br/>SASSessionController.createSession()<br/>Session.ts:77-95
-    [*] --> pending: JS/PY/R runtime, no process yet<br/>SessionController.createSession()<br/>Session.ts:30-57
-
-    initialising --> pending: dummy SYSIN file deleted<br/>by SAS's autoexec<br/>waitForSession(), Session.ts:175-192
-    initialising --> failed: spawned SAS process exits<br/>before handshake completes<br/>Session.ts:153-163, 184-188
-
-    pending --> running: session picked for a request<br/>executeProgram(), Execution.ts:94-96
-
-    running --> completed: process exits 0<br/>SAS: Session.ts:148-152 (original process)<br/>JS/PY/R: processProgram.ts:116-120 (fresh process)
-    running --> failed: process exits non-zero<br/>SAS: Session.ts:153-163<br/>JS/PY/R: processProgram.ts:121-131<br/>failureReason = err.toString()
-
-    completed --> [*]: deleteSession()<br/>scheduleSessionDestroy(), Session.ts:194-236
-    failed --> [*]: deleteSession()<br/>scheduleSessionDestroy()
-
-    note right of initialising
-        SAS only. The real sas
-        executable is already
-        running, spin-waiting
-        inside its AUTOEXEC for
-        real code to arrive.
-        See sas-execution-handshake.md
-    end note
-
-    note right of pending
-        Session sits in the pool,
-        reusable. Pre-warmed up to
-        3 pending sessions per
-        runtime (getSession(),
-        Session.ts:59-69)
-    end note
-
-    note right of running
-        SAS: no new process spawned
-        here, request just feeds
-        code to the already-running
-        process.
-        JS/PY/R: a brand new
-        interpreter process is
-        spawned right now.
-    end note
-```
-
-## Consumers of `state`
-
-| Reader | Location | Watches for |
-|---|---|---|
-| `waitForSession` | `Session.ts:175-192` | `failed` (breaks early) or the dummy SYSIN file disappearing (implies session survived init) |
-| `processProgram` (SAS branch poll loop) | `processProgram.ts:52-58` | `completed` (success exit) or `failed` (throws, carrying `session.failureReason`) |
-| `scheduleSessionDestroy` | `Session.ts:204-236` | `running` (extends death timer instead of destroying) |
-
-## Asymmetry between runtimes
-
- **SAS**: one OS process per session, spawned once at `createSession()`
-  time and reused for exactly one job (see `sas-execution-handshake.md`).
-  `running`/`completed`/`failed` are all driven by that *same* process's
-  eventual exit.
- **JS/PY/R**: a session is cheap (folder + id, no process). The interpreter
-  process is spawned fresh, per request, inside `processProgram.ts:115` and
-  its exit drives `completed`/`failed` directly in the same function - there
-  is no separate poll loop for these runtimes.
@@ -6,9 +6,11 @@
  "scripts": {
    "initial": "npm run swagger && npm run compileSysInit && npm run copySASjsCore && npm run downloadMacros",
    "prestart": "npm run initial",
+    "prebuild": "npm run initial",
    "start": "NODE_ENV=development nodemon ./src/server.ts",
    "start:prod": "node ./build/src/server.js",
-    "build": "npm run initial && rimraf build && tsc && npm run copy:files",
+    "build": "rimraf build && tsc",
+    "postbuild": "npm run copy:files",
    "swagger": "tsoa spec",
    "prepare": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true",
    "test": "mkdir -p tmp && mkdir -p ../web/build && jest --silent --coverage",
@@ -16,10 +18,10 @@
    "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
    "exe": "npm run build && pkg .",
    "copy:files": "npm run public:copy && npm run sasjsbuild:copy && npm run sas:copy && npm run web:copy",
-    "public:copy": "cpr ./public/ ./build/public/",
-    "sasjsbuild:copy": "cpr ./sasjsbuild/ ./build/sasjsbuild/",
-    "sas:copy": "cpr ./sas/ ./build/sas/",
-    "web:copy": "rimraf web && mkdir web && cpr ../web/build/ ./web/build/",
+    "public:copy": "cp -r ./public/ ./build/public/",
+    "sasjsbuild:copy": "cp -r ./sasjsbuild/ ./build/sasjsbuild/",
+    "sas:copy": "cp -r ./sas/ ./build/sas/",
+    "web:copy": "rimraf web && mkdir web && cp -r ../web/build/ ./web/build/",
    "compileSysInit": "ts-node ./scripts/compileSysInit.ts",
    "copySASjsCore": "ts-node ./scripts/copySASjsCore.ts",
    "downloadMacros": "ts-node ./scripts/downloadMacros.ts"
@@ -46,25 +48,25 @@
  },
  "author": "4GL Ltd",
  "dependencies": {
-    "@sasjs/core": "^4.59.10",
-    "@sasjs/utils": "^3.5.6",
+    "@sasjs/core": "^4.40.1",
+    "@sasjs/utils": "3.2.0",
    "bcryptjs": "^2.4.3",
-    "connect-mongo": "^5.1.0",
-    "cookie-parser": "^1.4.7",
+    "connect-mongo": "^4.6.0",
+    "cookie-parser": "^1.4.6",
    "cors": "^2.8.5",
-    "express": "^4.21.2",
-    "express-session": "^1.18.2",
+    "express": "^4.17.1",
+    "express-session": "^1.17.2",
    "helmet": "^5.0.2",
    "joi": "^17.4.2",
-    "jsonwebtoken": "^9.0.3",
+    "jsonwebtoken": "^9.0.2",
    "ldapjs": "2.3.3",
-    "mongoose": "^6.13.8",
-    "morgan": "^1.10.1",
+    "mongoose": "^6.0.12",
+    "morgan": "^1.10.0",
    "multer": "^1.4.5-lts.1",
    "rate-limiter-flexible": "2.4.1",
    "rotating-file-stream": "^3.0.4",
    "swagger-ui-express": "4.3.0",
-    "unzipper": "^0.12.3",
+    "unzipper": "^0.10.11",
    "url": "^0.10.3"
  },
  "devDependencies": {
@@ -74,33 +76,32 @@
    "@types/cors": "^2.8.12",
    "@types/express": "^4.17.12",
    "@types/express-session": "^1.17.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^26.0.24",
    "@types/jsonwebtoken": "^8.5.5",
    "@types/ldapjs": "^2.2.4",
    "@types/morgan": "^1.9.3",
    "@types/multer": "^1.4.7",
-    "@types/node": "^20.0.0",
+    "@types/node": "^15.12.2",
    "@types/supertest": "^2.0.11",
    "@types/swagger-ui-express": "^4.1.3",
    "@types/unzipper": "^0.10.5",
    "adm-zip": "^0.5.9",
-    "axios": "1.12.2",
-    "cpr": "^3.0.1",
+    "axios": "^1.12.2",
    "csrf": "^3.1.0",
    "dotenv": "^16.0.1",
    "http-headers-validation": "^0.0.1",
-    "jest": "^29.7.0",
+    "jest": "^27.0.6",
    "mongodb-memory-server": "8.11.4",
    "nodejs-file-downloader": "4.10.2",
-    "nodemon": "^3.0.0",
+    "nodemon": "^2.0.7",
    "pkg": "5.6.0",
-    "prettier": "^3.0.3",
+    "prettier": "^2.3.1",
    "rimraf": "^3.0.2",
    "supertest": "^6.1.3",
-    "ts-jest": "^29.1.0",
+    "ts-jest": "^27.0.3",
    "ts-node": "^10.0.0",
    "tsoa": "3.14.1",
-    "typescript": "^5.0.0"
+    "typescript": "^4.3.2"
  },
  "nodemonConfig": {
    "ignore": [
@@ -40,7 +40,8 @@ components:
                clientId:
                    type: string
                userId:
-                    type: string
+                    type: number
+                    format: double
            required:
                - clientId
                - userId
@@ -314,8 +315,9 @@ components:
            additionalProperties: false
        UserResponse:
            properties:
-                uid:
-                    type: string
+                id:
+                    type: number
+                    format: double
                username:
                    type: string
                displayName:
@@ -323,7 +325,7 @@ components:
                isAdmin:
                    type: boolean
            required:
-                - uid
+                - id
                - username
                - displayName
                - isAdmin
@@ -331,30 +333,32 @@ components:
            additionalProperties: false
        GroupResponse:
            properties:
-                uid:
-                    type: string
+                groupId:
+                    type: number
+                    format: double
                name:
                    type: string
                description:
                    type: string
            required:
-                - uid
+                - groupId
                - name
                - description
            type: object
            additionalProperties: false
        UserDetailsResponse:
            properties:
-                uid:
+                id:
+                    type: number
+                    format: double
+                displayName:
                    type: string
                username:
                    type: string
-                displayName:
-                    type: string
-                isAdmin:
-                    type: boolean
                isActive:
                    type: boolean
+                isAdmin:
+                    type: boolean
                autoExec:
                    type: string
                groups:
@@ -362,11 +366,11 @@ components:
                        $ref: '#/components/schemas/GroupResponse'
                    type: array
            required:
-                - uid
-                - username
+                - id
                - displayName
-                - isAdmin
+                - username
                - isActive
+                - isAdmin
            type: object
            additionalProperties: false
        UserPayload:
@@ -402,8 +406,9 @@ components:
            additionalProperties: false
        GroupDetailsResponse:
            properties:
-                uid:
-                    type: string
+                groupId:
+                    type: number
+                    format: double
                name:
                    type: string
                description:
@@ -415,7 +420,7 @@ components:
                        $ref: '#/components/schemas/UserResponse'
                    type: array
            required:
-                - uid
+                - groupId
                - name
                - description
                - isActive
@@ -484,8 +489,9 @@ components:
            additionalProperties: false
        PermissionDetailsResponse:
            properties:
-                uid:
-                    type: string
+                permissionId:
+                    type: number
+                    format: double
                path:
                    type: string
                type:
@@ -497,7 +503,7 @@ components:
                group:
                    $ref: '#/components/schemas/GroupDetailsResponse'
            required:
-                - uid
+                - permissionId
                - path
                - type
                - setting
@@ -536,8 +542,10 @@ components:
                    description: 'Indicates the type of principal'
                    example: user
                principalId:
-                    type: string
+                    type: number
+                    format: double
                    description: 'The id of user or group to which a rule is assigned.'
+                    example: 123
            required:
                - path
                - type
@@ -556,37 +564,25 @@ components:
                - setting
            type: object
            additionalProperties: false
-        Pick_UserResponse.Exclude_keyofUserResponse.uid__:
-            properties:
-                username:
-                    type: string
-                displayName:
-                    type: string
-                isAdmin:
-                    type: boolean
-            required:
-                - username
-                - displayName
-                - isAdmin
-            type: object
-            description: 'From T, pick a set of properties whose keys are in the union K'
        SessionResponse:
            properties:
+                id:
+                    type: number
+                    format: double
                username:
                    type: string
                displayName:
                    type: string
                isAdmin:
                    type: boolean
-                id:
-                    type: string
                needsToUpdatePassword:
                    type: boolean
            required:
+                - id
                - username
                - displayName
                - isAdmin
-                - id
+                - needsToUpdatePassword
            type: object
            additionalProperties: false
        SessionState:
@@ -1282,7 +1278,7 @@ paths:
                                type: array
                            examples:
                                'Example 1':
-                                    value: [{uid: userIdString, username: johnusername, displayName: John, isAdmin: false}, {uid: anotherUserIdString, username: starkusername, displayName: Stark, isAdmin: true}]
+                                    value: [{id: 123, username: johnusername, displayName: John, isAdmin: false}, {id: 456, username: starkusername, displayName: Stark, isAdmin: true}]
            summary: 'Get list of all users (username, displayname). All users can request this.'
            tags:
                - User
@@ -1301,7 +1297,7 @@ paths:
                                $ref: '#/components/schemas/UserDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: userIdString, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
+                                    value: {id: 1234, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
            summary: 'Create user with the following attributes: UserId, UserName, Password, isAdmin, isActive. Admin only task.'
            tags:
                - User
@@ -1352,7 +1348,7 @@ paths:
                                $ref: '#/components/schemas/UserDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: userIdString, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
+                                    value: {id: 1234, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
            summary: 'Update user properties - such as displayName. Can be performed either by admins, or the user in question.'
            tags:
                - User
@@ -1403,7 +1399,7 @@ paths:
                                password:
                                    type: string
                            type: object
-    '/SASjsApi/user/{uid}':
+    '/SASjsApi/user/{userId}':
        get:
            operationId: GetUser
            responses:
@@ -1422,12 +1418,14 @@ paths:
                    bearerAuth: []
            parameters:
                -
+                    description: 'The user''s identifier'
                    in: path
-                    name: uid
+                    name: userId
                    required: true
                    schema:
-                        type: string
-    '/SASjsApi/user/{userId}':
+                        format: double
+                        type: number
+                    example: 1234
        patch:
            operationId: UpdateUser
            responses:
@@ -1439,7 +1437,7 @@ paths:
                                $ref: '#/components/schemas/UserDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: userIdString, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
+                                    value: {id: 1234, displayName: 'John Snow', username: johnSnow01, isAdmin: false, isActive: true}
            summary: 'Update user properties - such as displayName. Can be performed either by admins, or the user in question.'
            tags:
                - User
@@ -1453,7 +1451,8 @@ paths:
                    name: userId
                    required: true
                    schema:
-                        type: string
+                        format: double
+                        type: number
                    example: '1234'
            requestBody:
                required: true
@@ -1479,7 +1478,8 @@ paths:
                    name: userId
                    required: true
                    schema:
-                        type: string
+                        format: double
+                        type: number
                    example: 1234
            requestBody:
                required: true
@@ -1504,7 +1504,7 @@ paths:
                                type: array
                            examples:
                                'Example 1':
-                                    value: [{uid: groupIdString, name: DCGroup, description: 'This group represents Data Controller Users'}]
+                                    value: [{groupId: 123, name: DCGroup, description: 'This group represents Data Controller Users'}]
            summary: 'Get list of all groups (groupName and groupDescription). All users can request this.'
            tags:
                - Group
@@ -1523,7 +1523,7 @@ paths:
                                $ref: '#/components/schemas/GroupDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: groupIdString, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
+                                    value: {groupId: 123, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
            summary: 'Create a new group. Admin only.'
            tags:
                - Group
@@ -1539,7 +1539,7 @@ paths:
                            $ref: '#/components/schemas/GroupPayload'
    '/SASjsApi/group/by/groupname/{name}':
        get:
-            operationId: GetGroupByName
+            operationId: GetGroupByGroupName
            responses:
                '200':
                    description: Ok
@@ -1561,7 +1561,7 @@ paths:
                    required: true
                    schema:
                        type: string
-    '/SASjsApi/group/{uid}':
+    '/SASjsApi/group/{groupId}':
        get:
            operationId: GetGroup
            responses:
@@ -1581,11 +1581,12 @@ paths:
                -
                    description: 'The group''s identifier'
                    in: path
-                    name: uid
+                    name: groupId
                    required: true
                    schema:
-                        type: string
-                    example: 12ByteString
+                        format: double
+                        type: number
+                    example: 1234
        delete:
            operationId: DeleteGroup
            responses:
@@ -1607,12 +1608,13 @@ paths:
                -
                    description: 'The group''s identifier'
                    in: path
-                    name: uid
+                    name: groupId
                    required: true
                    schema:
-                        type: string
-                    example: 12ByteString
-    '/SASjsApi/group/{groupUid}/{userUid}':
+                        format: double
+                        type: number
+                    example: 1234
+    '/SASjsApi/group/{groupId}/{userId}':
        post:
            operationId: AddUserToGroup
            responses:
@@ -1624,7 +1626,7 @@ paths:
                                $ref: '#/components/schemas/GroupDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: groupIdString, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
+                                    value: {groupId: 123, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
            summary: 'Add a user to a group. Admin task only.'
            tags:
                - Group
@@ -1635,18 +1637,21 @@ paths:
                -
                    description: 'The group''s identifier'
                    in: path
-                    name: groupUid
+                    name: groupId
                    required: true
                    schema:
-                        type: string
-                    example: 12ByteString
+                        format: double
+                        type: number
+                    example: '1234'
                -
                    description: 'The user''s identifier'
                    in: path
-                    name: userUid
+                    name: userId
                    required: true
                    schema:
-                        type: string
+                        format: double
+                        type: number
+                    example: '6789'
        delete:
            operationId: RemoveUserFromGroup
            responses:
@@ -1658,8 +1663,8 @@ paths:
                                $ref: '#/components/schemas/GroupDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: groupIdString, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
-            summary: 'Remove a user from a group. Admin task only.'
+                                    value: {groupId: 123, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}
+            summary: 'Remove a user to a group. Admin task only.'
            tags:
                - Group
            security:
@@ -1669,19 +1674,21 @@ paths:
                -
                    description: 'The group''s identifier'
                    in: path
-                    name: groupUid
+                    name: groupId
                    required: true
                    schema:
-                        type: string
-                    example: 12ByteString
+                        format: double
+                        type: number
+                    example: '1234'
                -
                    description: 'The user''s identifier'
                    in: path
-                    name: userUid
+                    name: userId
                    required: true
                    schema:
-                        type: string
-                    example: 12ByteString
+                        format: double
+                        type: number
+                    example: '6789'
    /SASjsApi/info:
        get:
            operationId: Info
@@ -1732,7 +1739,7 @@ paths:
                                type: array
                            examples:
                                'Example 1':
-                                    value: [{uid: permissionId1String, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {uid: user1-id, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}, {uid: permissionId2String, path: /SASjsApi/code/execute, type: Route, setting: Grant, group: {uid: group1-id, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}}]
+                                    value: [{permissionId: 123, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {id: 1, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}, {permissionId: 124, path: /SASjsApi/code/execute, type: Route, setting: Grant, group: {groupId: 1, name: DCGroup, description: 'This group represents Data Controller Users', isActive: true, users: []}}]
            description: "Get the list of permission rules applicable the authenticated user.\nIf the user is an admin, all rules are returned."
            summary: 'Get the list of permission rules. If the user is admin, all rules are returned.'
            tags:
@@ -1752,7 +1759,7 @@ paths:
                                $ref: '#/components/schemas/PermissionDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: permissionIdString, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {uid: userIdString, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}
+                                    value: {permissionId: 123, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {id: 1, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}
            summary: 'Create a new permission. Admin only.'
            tags:
                - Permission
@@ -1766,7 +1773,7 @@ paths:
                    application/json:
                        schema:
                            $ref: '#/components/schemas/RegisterPermissionPayload'
-    '/SASjsApi/permission/{uid}':
+    '/SASjsApi/permission/{permissionId}':
        patch:
            operationId: UpdatePermission
            responses:
@@ -1778,7 +1785,7 @@ paths:
                                $ref: '#/components/schemas/PermissionDetailsResponse'
                            examples:
                                'Example 1':
-                                    value: {uid: permissionIdString, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {uid: userIdString, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}
+                                    value: {permissionId: 123, path: /SASjsApi/code/execute, type: Route, setting: Grant, user: {id: 1, username: johnSnow01, displayName: 'John Snow', isAdmin: false}}
            summary: 'Update permission setting. Admin only'
            tags:
                - Permission
@@ -1787,11 +1794,14 @@ paths:
                    bearerAuth: []
            parameters:
                -
+                    description: 'The permission''s identifier'
                    in: path
-                    name: uid
+                    name: permissionId
                    required: true
                    schema:
-                        type: string
+                        format: double
+                        type: number
+                    example: 1234
            requestBody:
                required: true
                content:
@@ -1811,11 +1821,14 @@ paths:
                    bearerAuth: []
            parameters:
                -
+                    description: 'The user''s identifier'
                    in: path
-                    name: uid
+                    name: permissionId
                    required: true
                    schema:
-                        type: string
+                        format: double
+                        type: number
+                    example: 1234
    /SASjsApi/session:
        get:
            operationId: Session
@@ -1828,7 +1841,7 @@ paths:
                                $ref: '#/components/schemas/SessionResponse'
                            examples:
                                'Example 1':
-                                    value: {id: userIdString, username: johnusername, displayName: John, isAdmin: false, needsToUpdatePassword: false}
+                                    value: {id: 123, username: johnusername, displayName: John, isAdmin: false}
            summary: 'Get session info (username).'
            tags:
                - Session
@@ -1999,7 +2012,7 @@ paths:
                        application/json:
                            schema:
                                properties:
-                                    user: {properties: {needsToUpdatePassword: {type: boolean}, isAdmin: {type: boolean}, displayName: {type: string}, username: {type: string}, id: {}}, required: [needsToUpdatePassword, isAdmin, displayName, username, id], type: object}
+                                    user: {properties: {needsToUpdatePassword: {type: boolean}, isAdmin: {type: boolean}, displayName: {type: string}, username: {type: string}, id: {type: number, format: double}}, required: [needsToUpdatePassword, isAdmin, displayName, username, id], type: object}
                                    loggedIn: {type: boolean}
                                required:
                                    - user
@@ -27,14 +27,14 @@ import User from '../model/User'
@Tags('Auth')
 export class AuthController {
  static authCodes: { [key: string]: { [key: string]: string } } = {}
-  static saveCode = (userId: string, clientId: string, code: string) => {
+  static saveCode = (userId: number, clientId: string, code: string) => {
    if (AuthController.authCodes[userId])
      return (AuthController.authCodes[userId][clientId] = code)

    AuthController.authCodes[userId] = { [clientId]: code }
    return AuthController.authCodes[userId][clientId]
  }
-  static deleteCode = (userId: string, clientId: string) =>
+  static deleteCode = (userId: number, clientId: string) =>
    delete AuthController.authCodes[userId][clientId]

  /**
@@ -159,7 +159,7 @@ const updatePassword = async (
 ) => {
  const { currentPassword, newPassword } = data
  const userId = req.user?.userId
-  const dbUser = await User.findOne({ _id: userId })
+  const dbUser = await User.findOne({ id: userId })

  if (!dbUser)
    throw {
@@ -234,10 +234,9 @@ const verifyAuthCode = async (
    jwt.verify(code, process.secrets.AUTH_CODE_SECRET, (err, data) => {
      if (err) return resolve(undefined)

-      const payload = data as InfoJWT
      const clientInfo: InfoJWT = {
-        clientId: payload?.clientId,
-        userId: payload?.userId
+        clientId: data?.clientId,
+        userId: data?.userId
      }
      if (clientInfo.clientId === clientId) {
        return resolve(clientInfo)
@@ -114,8 +114,7 @@ const executeCode = async (
      code: 400,
      status: 'failure',
      message: 'Job execution failed.',
-      error: typeof err === 'object' ? err.toString() : err,
-      log: err?.log
+      error: typeof err === 'object' ? err.toString() : err
    }
  }
 }
@@ -12,29 +12,28 @@ import {

 import Group, { GroupPayload, PUBLIC_GROUP_NAME } from '../model/Group'
 import User from '../model/User'
-import { GetUserBy, UserResponse } from './user'
+import { AuthProviderType } from '../utils'
+import { UserResponse } from './user'

 export interface GroupResponse {
-  uid: string
+  groupId: number
  name: string
  description: string
 }

-export interface GroupDetailsResponse extends GroupResponse {
+export interface GroupDetailsResponse {
+  groupId: number
+  name: string
+  description: string
  isActive: boolean
  users: UserResponse[]
 }

 interface GetGroupBy {
-  _id?: string
+  groupId?: number
  name?: string
 }

-enum GroupAction {
-  AddUser = 'addUser',
-  RemoveUser = 'removeUser'
-}
-
@Security('bearerAuth')
@Route('SASjsApi/group')
@Tags('Group')
@@ -45,7 +44,7 @@ export class GroupController {
   */
  @Example<GroupResponse[]>([
    {
-      uid: 'groupIdString',
+      groupId: 123,
      name: 'DCGroup',
      description: 'This group represents Data Controller Users'
    }
@@ -60,7 +59,7 @@ export class GroupController {
   *
   */
  @Example<GroupDetailsResponse>({
-    uid: 'groupIdString',
+    groupId: 123,
    name: 'DCGroup',
    description: 'This group represents Data Controller Users',
    isActive: true,
@@ -79,7 +78,7 @@ export class GroupController {
   * @example dcgroup
   */
  @Get('by/groupname/{name}')
-  public async getGroupByName(
+  public async getGroupByGroupName(
    @Path() name: string
  ): Promise<GroupDetailsResponse> {
    return getGroup({ name })
@@ -87,66 +86,68 @@ export class GroupController {

  /**
   * @summary Get list of members of a group (userName). All users can request this.
-   * @param uid The group's identifier
-   * @example uid "12ByteString"
+   * @param groupId The group's identifier
+   * @example groupId 1234
   */
-  @Get('{uid}')
-  public async getGroup(@Path() uid: string): Promise<GroupDetailsResponse> {
-    return getGroup({ _id: uid })
+  @Get('{groupId}')
+  public async getGroup(
+    @Path() groupId: number
+  ): Promise<GroupDetailsResponse> {
+    return getGroup({ groupId })
  }

  /**
   * @summary Add a user to a group. Admin task only.
-   * @param groupUid The group's identifier
-   * @example groupUid "12ByteString"
-   * @param userUid The user's identifier
-   * @example userId "12ByteString"
+   * @param groupId The group's identifier
+   * @example groupId "1234"
+   * @param userId The user's identifier
+   * @example userId "6789"
   */
  @Example<GroupDetailsResponse>({
-    uid: 'groupIdString',
+    groupId: 123,
    name: 'DCGroup',
    description: 'This group represents Data Controller Users',
    isActive: true,
    users: []
  })
-  @Post('{groupUid}/{userUid}')
+  @Post('{groupId}/{userId}')
  public async addUserToGroup(
-    @Path() groupUid: string,
-    @Path() userUid: string
+    @Path() groupId: number,
+    @Path() userId: number
  ): Promise<GroupDetailsResponse> {
-    return addUserToGroup(groupUid, userUid)
+    return addUserToGroup(groupId, userId)
  }

  /**
-   * @summary Remove a user from a group. Admin task only.
-   * @param groupUid The group's identifier
-   * @example groupUid "12ByteString"
-   * @param userUid The user's identifier
-   * @example userUid "12ByteString"
+   * @summary Remove a user to a group. Admin task only.
+   * @param groupId The group's identifier
+   * @example groupId "1234"
+   * @param userId The user's identifier
+   * @example userId "6789"
   */
  @Example<GroupDetailsResponse>({
-    uid: 'groupIdString',
+    groupId: 123,
    name: 'DCGroup',
    description: 'This group represents Data Controller Users',
    isActive: true,
    users: []
  })
-  @Delete('{groupUid}/{userUid}')
+  @Delete('{groupId}/{userId}')
  public async removeUserFromGroup(
-    @Path() groupUid: string,
-    @Path() userUid: string
+    @Path() groupId: number,
+    @Path() userId: number
  ): Promise<GroupDetailsResponse> {
-    return removeUserFromGroup(groupUid, userUid)
+    return removeUserFromGroup(groupId, userId)
  }

  /**
   * @summary Delete a group. Admin task only.
-   * @param uid The group's identifier
-   * @example uid "12ByteString"
+   * @param groupId The group's identifier
+   * @example groupId 1234
   */
-  @Delete('{uid}')
-  public async deleteGroup(@Path() uid: string) {
-    const group = await Group.findOne({ _id: uid })
+  @Delete('{groupId}')
+  public async deleteGroup(@Path() groupId: number) {
+    const group = await Group.findOne({ groupId })
    if (!group)
      throw {
        code: 404,
@@ -159,7 +160,9 @@ export class GroupController {
 }

 const getAllGroups = async (): Promise<GroupResponse[]> =>
-  await Group.find({}).select('uid name description').exec()
+  await Group.find({})
+    .select({ _id: 0, groupId: 1, name: 1, description: 1 })
+    .exec()

 const createGroup = async ({
  name,
@@ -184,7 +187,7 @@ const createGroup = async ({
  const savedGroup = await group.save()

  return {
-    uid: savedGroup.uid,
+    groupId: savedGroup.groupId,
    name: savedGroup.name,
    description: savedGroup.description,
    isActive: savedGroup.isActive,
@@ -195,12 +198,11 @@ const createGroup = async ({
 const getGroup = async (findBy: GetGroupBy): Promise<GroupDetailsResponse> => {
  const group = (await Group.findOne(
    findBy,
-    'uid name description isActive users'
+    'groupId name description isActive users -_id'
  ).populate(
    'users',
-    'uid username displayName isAdmin'
+    'id username displayName isAdmin -_id'
  )) as unknown as GroupDetailsResponse
-
  if (!group)
    throw {
      code: 404,
@@ -209,7 +211,7 @@ const getGroup = async (findBy: GetGroupBy): Promise<GroupDetailsResponse> => {
    }

  return {
-    uid: group.uid,
+    groupId: group.groupId,
    name: group.name,
    description: group.description,
    isActive: group.isActive,
@@ -218,23 +220,23 @@ const getGroup = async (findBy: GetGroupBy): Promise<GroupDetailsResponse> => {
 }

 const addUserToGroup = async (
-  groupUid: string,
-  userUid: string
+  groupId: number,
+  userId: number
 ): Promise<GroupDetailsResponse> =>
-  updateUsersListInGroup(groupUid, userUid, GroupAction.AddUser)
+  updateUsersListInGroup(groupId, userId, 'addUser')

 const removeUserFromGroup = async (
-  groupUid: string,
-  userUid: string
+  groupId: number,
+  userId: number
 ): Promise<GroupDetailsResponse> =>
-  updateUsersListInGroup(groupUid, userUid, GroupAction.RemoveUser)
+  updateUsersListInGroup(groupId, userId, 'removeUser')

 const updateUsersListInGroup = async (
-  groupUid: string,
-  userUid: string,
-  action: GroupAction
+  groupId: number,
+  userId: number,
+  action: 'addUser' | 'removeUser'
 ): Promise<GroupDetailsResponse> => {
-  const group = await Group.findOne({ _id: groupUid })
+  const group = await Group.findOne({ groupId })
  if (!group)
    throw {
      code: 404,
@@ -256,7 +258,7 @@ const updateUsersListInGroup = async (
      message: `Can't add/remove user to group created by external auth provider.`
    }

-  const user = await User.findOne({ _id: userUid })
+  const user = await User.findOne({ id: userId })
  if (!user)
    throw {
      code: 404,
@@ -272,7 +274,7 @@ const updateUsersListInGroup = async (
    }

  const updatedGroup =
-    action === GroupAction.AddUser
+    action === 'addUser'
      ? await group.addUser(user)
      : await group.removeUser(user)

@@ -284,7 +286,7 @@ const updateUsersListInGroup = async (
    }

  return {
-    uid: updatedGroup.uid,
+    groupId: updatedGroup.groupId,
    name: updatedGroup.name,
    description: updatedGroup.description,
    isActive: updatedGroup.isActive,
@@ -15,24 +15,6 @@ export interface ExecutionVars {
  [key: string]: string | number | undefined
 }

-// Thrown when the session itself fails (e.g. SAS exits abnormally via
-// %abort;). Carries the complete log - by the time this is thrown, the
-// session's process has already exited, so the log file it wrote is final,
-// not a partial/truncated snapshot.
-export class SessionExecutionError extends Error {
-  constructor(
-    message: string,
-    public log?: string
-  ) {
-    super(message)
-
-    // required for `instanceof` to work when compiling to ES5, since the
-    // default __extends helper does not preserve the prototype chain for
-    // classes extending built-ins like Error
-    Object.setPrototypeOf(this, SessionExecutionError.prototype)
-  }
-}
-
 export interface ExecuteReturnRaw {
  httpHeaders: HTTPHeaders
  result: string | Buffer
@@ -106,7 +88,6 @@ export class ExecutionController {
      preProgramVariables?.httpHeaders.join('\n') ?? ''
    )

-    try {
    await processProgram(
      program,
      preProgramVariables,
@@ -119,11 +100,6 @@ export class ExecutionController {
      logPath,
      otherArgs
    )
-    } catch (err: any) {
-      const log = (await fileExists(logPath)) ? await readFile(logPath) : ''
-
-      throw new SessionExecutionError(err.message, log)
-    }

    const log = (await fileExists(logPath)) ? await readFile(logPath) : ''
    const headersContent = (await fileExists(headersPath))
@@ -144,16 +120,7 @@ export class ExecutionController {
      : ''

    // it should be deleted by scheduleSessionDestroy
-    //
-    // Guarded: for JS/PY/R, processProgram sets state to `failed` itself
-    // (without throwing) when the interpreter process exits non-zero - if
-    // we unconditionally set `completed` here we'd silently overwrite that,
-    // and anything downstream inspecting session.state (e.g.
-    // scheduleSessionDestroy's expiresAfterMins branch in Session.ts) would
-    // see a crashed session mis-reported as successful.
-    if ((session.state as SessionState) !== SessionState.failed) {
    session.state = SessionState.completed
-    }

    const resultParts = []

@@ -50,10 +50,6 @@ export const processProgram = async (

    // we now need to poll the session status
    while (session.state !== SessionState.completed) {
-      if (session.state === SessionState.failed) {
-        throw new Error(session.failureReason || 'SAS session failed')
-      }
-
      await delay(50)
    }
  } else {
@@ -1,117 +0,0 @@
-import path from 'path'
-import os from 'os'
-import { createFile, deleteFolder, generateTimestamp } from '@sasjs/utils'
-import * as ProcessProgramModule from '../processProgram'
-import { ExecutionController, SessionExecutionError } from '../Execution'
-import { Session, SessionState, PreProgramVars } from '../../../types'
-import { RunTimeType } from '../../../utils'
-
-const preProgramVariables: PreProgramVars = {
-  username: 'testUser',
-  userId: '1',
-  displayName: 'Test User',
-  serverUrl: 'http://localhost:5000',
-  httpHeaders: []
-}
-
-describe('ExecutionController.executeProgram', () => {
-  let session: Session
-
-  beforeEach(() => {
-    const sessionId = `test-session-${generateTimestamp()}`
-    session = {
-      id: sessionId,
-      state: SessionState.pending,
-      creationTimeStamp: '0',
-      deathTimeStamp: '0',
-      path: path.join(os.tmpdir(), sessionId)
-    }
-  })
-
-  afterEach(async () => {
-    jest.restoreAllMocks()
-    await deleteFolder(session.path)
-  })
-
-  // Regression coverage: for JS/PY/R, processProgram sets session.state to
-  // `failed` itself (without throwing) on a non-zero interpreter exit.
-  // ExecutionController.executeProgram used to unconditionally overwrite
-  // that back to `completed` right after processProgram returned, silently
-  // losing the failure for anything downstream that inspects session.state.
-  describe('JS/PY/R failure path', () => {
-    it('does not overwrite a failed session state back to completed', async () => {
-      // mirrors processProgram's real JS/PY/R branch on a non-zero exit:
-      // it sets state/failureReason itself and resolves - it does not throw
-      jest
-        .spyOn(ProcessProgramModule, 'processProgram')
-        .mockImplementation(async () => {
-          session.state = SessionState.failed
-          session.failureReason = 'Error: process exited with code 1'
-        })
-
-      const controller = new ExecutionController()
-
-      await controller.executeProgram({
-        program: 'throw new Error("boom")',
-        preProgramVariables,
-        vars: {},
-        session,
-        runTime: RunTimeType.JS
-      })
-
-      expect(session.state).toBe(SessionState.failed)
-    })
-
-    it('still marks a genuinely successful session as completed', async () => {
-      jest
-        .spyOn(ProcessProgramModule, 'processProgram')
-        .mockImplementation(async () => {
-          session.state = SessionState.completed
-        })
-
-      const controller = new ExecutionController()
-
-      await controller.executeProgram({
-        program: 'console.log("hello")',
-        preProgramVariables,
-        vars: {},
-        session,
-        runTime: RunTimeType.JS
-      })
-
-      expect(session.state).toBe(SessionState.completed)
-    })
-  })
-
-  describe('SAS failure path', () => {
-    it('throws a SessionExecutionError carrying the complete log when the session fails', async () => {
-      const logPath = path.join(session.path, 'log.log')
-      const logContent =
-        'NOTE: SAS session\nERROR: SAS session terminated. See log for details.\n'
-
-      await createFile(logPath, logContent)
-
-      jest
-        .spyOn(ProcessProgramModule, 'processProgram')
-        .mockImplementation(async () => {
-          throw new Error('ERROR: SAS session terminated. See log for details.')
-        })
-
-      const controller = new ExecutionController()
-
-      const resultPromise = controller.executeProgram({
-        program: '%abort;',
-        preProgramVariables,
-        vars: {},
-        session,
-        runTime: RunTimeType.SAS
-      })
-
-      await expect(resultPromise).rejects.toBeInstanceOf(SessionExecutionError)
-      await expect(resultPromise).rejects.toMatchObject({
-        log: logContent,
-        message: expect.stringContaining('SAS session terminated')
-      })
-    })
-  })
-})
@@ -1,109 +0,0 @@
-import path from 'path'
-import os from 'os'
-import { createFile, deleteFolder, generateTimestamp } from '@sasjs/utils'
-import { processProgram } from '../processProgram'
-import { Session, SessionState, PreProgramVars } from '../../../types'
-import {
-  RunTimeType,
-  getSessionsFolder,
-  generateUniqueFileName
-} from '../../../utils'
-
-const preProgramVariables: PreProgramVars = {
-  username: 'testUser',
-  userId: '1',
-  displayName: 'Test User',
-  serverUrl: 'http://localhost:5000',
-  httpHeaders: []
-}
-
-const makeSession = (): Session => {
-  const sessionId = generateUniqueFileName(generateTimestamp())
-  const sessionFolder = path.join(getSessionsFolder(), sessionId)
-  const creationTimeStamp = sessionId.split('-').pop() as string
-  const deathTimeStamp = (
-    parseInt(creationTimeStamp) +
-    15 * 60 * 1000 -
-    1000
-  ).toString()
-
-  return {
-    id: sessionId,
-    state: SessionState.running,
-    creationTimeStamp,
-    deathTimeStamp,
-    path: sessionFolder
-  }
-}
-
-describe('processProgram (SAS runtime)', () => {
-  let session: Session
-  let logPath: string
-  let weboutPath: string
-  let headersPath: string
-  let tokenFile: string
-
-  beforeAll(() => {
-    const root = path.join(
-      os.tmpdir(),
-      `sasjs-processProgram-spec-${generateTimestamp()}`
-    )
-    process.sasjsRoot = root
-    process.driveLoc = path.join(root, 'drive')
-  })
-
-  beforeEach(async () => {
-    session = makeSession()
-    logPath = path.join(session.path, 'log.log')
-    weboutPath = path.join(session.path, 'webout.txt')
-    headersPath = path.join(session.path, 'stpsrv_header.txt')
-    tokenFile = path.join(session.path, 'reqHeaders.txt')
-    await createFile(weboutPath, '')
-  })
-
-  afterEach(async () => {
-    await deleteFolder(session.path)
-  })
-
-  it('rejects instead of hanging when the session fails (e.g. %abort;)', async () => {
-    setTimeout(() => {
-      session.state = SessionState.failed
-      session.failureReason =
-        'ERROR: SAS session terminated. See log for details.'
-    }, 100)
-
-    await expect(
-      processProgram(
-        '%abort;',
-        preProgramVariables,
-        {},
-        session,
-        weboutPath,
-        headersPath,
-        tokenFile,
-        RunTimeType.SAS,
-        logPath
-      )
-    ).rejects.toThrow(/SAS session terminated/)
-  }, 3000)
-
-  it('resolves without throwing when the session completes normally', async () => {
-    setTimeout(() => {
-      session.state = SessionState.completed
-    }, 100)
-
-    await expect(
-      processProgram(
-        '%put hello world;',
-        preProgramVariables,
-        {},
-        session,
-        weboutPath,
-        headersPath,
-        tokenFile,
-        RunTimeType.SAS,
-        logPath
-      )
-    ).resolves.toBeUndefined()
-  }, 3000)
-})
@@ -56,9 +56,9 @@ interface RegisterPermissionPayload {
  principalType: PrincipalType
  /**
   * The id of user or group to which a rule is assigned.
-   * @example 'groupIdString'
+   * @example 123
   */
-  principalId: string
+  principalId: number
 }

 interface UpdatePermissionPayload {
@@ -70,7 +70,7 @@ interface UpdatePermissionPayload {
 }

 export interface PermissionDetailsResponse {
-  uid: string
+  permissionId: number
  path: string
  type: string
  setting: string
@@ -91,24 +91,24 @@ export class PermissionController {
   */
  @Example<PermissionDetailsResponse[]>([
    {
-      uid: 'permissionId1String',
+      permissionId: 123,
      path: '/SASjsApi/code/execute',
      type: 'Route',
      setting: 'Grant',
      user: {
-        uid: 'user1-id',
+        id: 1,
        username: 'johnSnow01',
        displayName: 'John Snow',
        isAdmin: false
      }
    },
    {
-      uid: 'permissionId2String',
+      permissionId: 124,
      path: '/SASjsApi/code/execute',
      type: 'Route',
      setting: 'Grant',
      group: {
-        uid: 'group1-id',
+        groupId: 1,
        name: 'DCGroup',
        description: 'This group represents Data Controller Users',
        isActive: true,
@@ -128,12 +128,12 @@ export class PermissionController {
   *
   */
  @Example<PermissionDetailsResponse>({
-    uid: 'permissionIdString',
+    permissionId: 123,
    path: '/SASjsApi/code/execute',
    type: 'Route',
    setting: 'Grant',
    user: {
-      uid: 'userIdString',
+      id: 1,
      username: 'johnSnow01',
      displayName: 'John Snow',
      isAdmin: false
@@ -149,36 +149,36 @@ export class PermissionController {
  /**
   * @summary Update permission setting. Admin only
   * @param permissionId The permission's identifier
-   * @example permissionId "permissionIdString"
+   * @example permissionId 1234
   */
  @Example<PermissionDetailsResponse>({
-    uid: 'permissionIdString',
+    permissionId: 123,
    path: '/SASjsApi/code/execute',
    type: 'Route',
    setting: 'Grant',
    user: {
-      uid: 'userIdString',
+      id: 1,
      username: 'johnSnow01',
      displayName: 'John Snow',
      isAdmin: false
    }
  })
-  @Patch('{uid}')
+  @Patch('{permissionId}')
  public async updatePermission(
-    @Path() uid: string,
+    @Path() permissionId: number,
    @Body() body: UpdatePermissionPayload
  ): Promise<PermissionDetailsResponse> {
-    return updatePermission(uid, body)
+    return updatePermission(permissionId, body)
  }

  /**
   * @summary Delete a permission. Admin only.
   * @param permissionId The user's identifier
-   * @example permissionId "permissionIdString"
+   * @example permissionId 1234
   */
-  @Delete('{uid}')
-  public async deletePermission(@Path() uid: string) {
-    return deletePermission(uid)
+  @Delete('{permissionId}')
+  public async deletePermission(@Path() permissionId: number) {
+    return deletePermission(permissionId)
  }
 }

@@ -191,7 +191,7 @@ const getAllPermissions = async (
  else {
    const permissions: PermissionDetailsResponse[] = []

-    const dbUser = await User.findOne({ _id: user?.userId })
+    const dbUser = await User.findOne({ id: user?.userId })
    if (!dbUser)
      throw {
        code: 404,
@@ -227,7 +227,7 @@ const createPermission = async ({

  switch (principalType) {
    case PrincipalType.user: {
-      const userInDB = await User.findOne({ _id: principalId })
+      const userInDB = await User.findOne({ id: principalId })
      if (!userInDB)
        throw {
          code: 404,
@@ -259,7 +259,7 @@ const createPermission = async ({
      permission.user = userInDB._id

      user = {
-        uid: userInDB.uid,
+        id: userInDB.id,
        username: userInDB.username,
        displayName: userInDB.displayName,
        isAdmin: userInDB.isAdmin
@@ -267,7 +267,7 @@ const createPermission = async ({
      break
    }
    case PrincipalType.group: {
-      const groupInDB = await Group.findOne({ _id: principalId })
+      const groupInDB = await Group.findOne({ groupId: principalId })
      if (!groupInDB)
        throw {
          code: 404,
@@ -291,13 +291,13 @@ const createPermission = async ({
      permission.group = groupInDB._id

      group = {
-        uid: groupInDB.uid,
+        groupId: groupInDB.groupId,
        name: groupInDB.name,
        description: groupInDB.description,
        isActive: groupInDB.isActive,
        users: groupInDB.populate({
          path: 'users',
-          select: 'uid username displayName isAdmin -_id',
+          select: 'id username displayName isAdmin -_id',
          options: { limit: 15 }
        }) as unknown as UserResponse[]
      }
@@ -314,7 +314,7 @@ const createPermission = async ({
  const savedPermission = await permission.save()

  return {
-    uid: savedPermission.uid,
+    permissionId: savedPermission.permissionId,
    path: savedPermission.path,
    type: savedPermission.type,
    setting: savedPermission.setting,
@@ -324,21 +324,27 @@ const createPermission = async ({
 }

 const updatePermission = async (
-  uid: string,
+  id: number,
  data: UpdatePermissionPayload
 ): Promise<PermissionDetailsResponse> => {
  const { setting } = data

  const updatedPermission = (await Permission.findOneAndUpdate(
-    { _id: uid },
+    { permissionId: id },
    { setting },
    { new: true }
  )
-    .select('uid path type setting')
-    .populate({ path: 'user', select: 'uid username displayName isAdmin' })
+    .select({
+      _id: 0,
+      permissionId: 1,
+      path: 1,
+      type: 1,
+      setting: 1
+    })
+    .populate({ path: 'user', select: 'id username displayName isAdmin -_id' })
    .populate({
      path: 'group',
-      select: 'groupId name description'
+      select: 'groupId name description -_id'
    })) as unknown as PermissionDetailsResponse
  if (!updatedPermission)
    throw {
@@ -350,13 +356,13 @@ const updatePermission = async (
  return updatedPermission
 }

-const deletePermission = async (uid: string) => {
-  const permission = await Permission.findOne({ _id: uid })
+const deletePermission = async (id: number) => {
+  const permission = await Permission.findOne({ permissionId: id })
  if (!permission)
    throw {
      code: 404,
      status: 'Not Found',
      message: 'Permission not found.'
    }
-  await Permission.deleteOne({ _id: uid })
+  await Permission.deleteOne({ permissionId: id })
 }
@@ -5,7 +5,7 @@ import { getSessionController } from './internal'
 import { SessionState } from '../types'

 interface SessionResponse extends UserResponse {
-  needsToUpdatePassword?: boolean
+  needsToUpdatePassword: boolean
 }

@Security('bearerAuth')
@@ -16,12 +16,11 @@ export class SessionController {
   * @summary Get session info (username).
   *
   */
-  @Example<SessionResponse>({
-    uid: 'userIdString',
+  @Example<UserResponse>({
+    id: 123,
    username: 'johnusername',
    displayName: 'John',
-    isAdmin: false,
-    needsToUpdatePassword: false
+    isAdmin: false
  })
  @Get('/')
  public async session(
@@ -44,7 +43,7 @@ export class SessionController {
 }

 const session = (req: express.Request) => ({
-  uid: req.user!.userId,
+  id: req.user!.userId,
  username: req.user!.username,
  displayName: req.user!.displayName,
  isAdmin: req.user!.isAdmin,
@@ -166,8 +166,7 @@ const execute = async (
      code: 400,
      status: 'failure',
      message: 'Job execution failed.',
-      error: typeof err === 'object' ? err.toString() : err,
-      log: err?.log
+      error: typeof err === 'object' ? err.toString() : err
    }
  }
 }
@@ -26,14 +26,18 @@ import {
 import { GroupController, GroupResponse } from './group'

 export interface UserResponse {
-  uid: string
+  id: number
  username: string
  displayName: string
  isAdmin: boolean
 }

-export interface UserDetailsResponse extends UserResponse {
+export interface UserDetailsResponse {
+  id: number
+  displayName: string
+  username: string
  isActive: boolean
+  isAdmin: boolean
  autoExec?: string
  groups?: GroupResponse[]
 }
@@ -48,13 +52,13 @@ export class UserController {
   */
  @Example<UserResponse[]>([
    {
-      uid: 'userIdString',
+      id: 123,
      username: 'johnusername',
      displayName: 'John',
      isAdmin: false
    },
    {
-      uid: 'anotherUserIdString',
+      id: 456,
      username: 'starkusername',
      displayName: 'Stark',
      isAdmin: true
@@ -70,7 +74,7 @@ export class UserController {
   *
   */
  @Example<UserDetailsResponse>({
-    uid: 'userIdString',
+    id: 1234,
    displayName: 'John Snow',
    username: 'johnSnow01',
    isAdmin: false,
@@ -107,20 +111,20 @@ export class UserController {
   * Only Admin or user itself will get user autoExec code.
   * @summary Get user properties - such as group memberships, userName, displayName.
   * @param userId The user's identifier
-   * @example userId "userIdString"
+   * @example userId 1234
   */
-  @Get('{uid}')
+  @Get('{userId}')
  public async getUser(
    @Request() req: express.Request,
-    @Path() uid: string
+    @Path() userId: number
  ): Promise<UserDetailsResponse> {
    const { MODE } = process.env

    if (MODE === ModeType.Desktop) return getDesktopAutoExec()

    const { user } = req
-    const getAutoExec = user!.isAdmin || user!.userId === uid
-    return getUser({ _id: uid }, getAutoExec)
+    const getAutoExec = user!.isAdmin || user!.userId == userId
+    return getUser({ id: userId }, getAutoExec)
  }

  /**
@@ -129,7 +133,7 @@ export class UserController {
   * @example username "johnSnow01"
   */
  @Example<UserDetailsResponse>({
-    uid: 'userIdString',
+    id: 1234,
    displayName: 'John Snow',
    username: 'johnSnow01',
    isAdmin: false,
@@ -154,7 +158,7 @@ export class UserController {
   * @example userId "1234"
   */
  @Example<UserDetailsResponse>({
-    uid: 'userIdString',
+    id: 1234,
    displayName: 'John Snow',
    username: 'johnSnow01',
    isAdmin: false,
@@ -162,7 +166,7 @@ export class UserController {
  })
  @Patch('{userId}')
  public async updateUser(
-    @Path() userId: string,
+    @Path() userId: number,
    @Body() body: UserPayload
  ): Promise<UserDetailsResponse> {
    const { MODE } = process.env
@@ -170,7 +174,7 @@ export class UserController {
    if (MODE === ModeType.Desktop)
      return updateDesktopAutoExec(body.autoExec ?? '')

-    return updateUser({ _id: userId }, body)
+    return updateUser({ id: userId }, body)
  }

  /**
@@ -194,16 +198,18 @@ export class UserController {
   */
  @Delete('{userId}')
  public async deleteUser(
-    @Path() userId: string,
+    @Path() userId: number,
    @Body() body: { password?: string },
    @Query() @Hidden() isAdmin: boolean = false
  ) {
-    return deleteUser({ _id: userId }, isAdmin, body)
+    return deleteUser({ id: userId }, isAdmin, body)
  }
 }

 const getAllUsers = async (): Promise<UserResponse[]> =>
-  await User.find({}).select('uid username displayName isAdmin').exec()
+  await User.find({})
+    .select({ _id: 0, id: 1, username: 1, displayName: 1, isAdmin: 1 })
+    .exec()

 const createUser = async (data: UserPayload): Promise<UserDetailsResponse> => {
  const { displayName, username, password, isAdmin, isActive, autoExec } = data
@@ -233,15 +239,15 @@ const createUser = async (data: UserPayload): Promise<UserDetailsResponse> => {

  const groupController = new GroupController()
  const allUsersGroup = await groupController
-    .getGroupByName(ALL_USERS_GROUP.name)
+    .getGroupByGroupName(ALL_USERS_GROUP.name)
    .catch(() => {})

  if (allUsersGroup) {
-    await groupController.addUserToGroup(allUsersGroup.uid, savedUser.uid)
+    await groupController.addUserToGroup(allUsersGroup.groupId, savedUser.id)
  }

  return {
-    uid: savedUser.uid,
+    id: savedUser.id,
    displayName: savedUser.displayName,
    username: savedUser.username,
    isActive: savedUser.isActive,
@@ -250,8 +256,8 @@ const createUser = async (data: UserPayload): Promise<UserDetailsResponse> => {
  }
 }

-export interface GetUserBy {
-  _id?: string
+interface GetUserBy {
+  id?: number
  username?: string
 }

@@ -261,10 +267,10 @@ const getUser = async (
 ): Promise<UserDetailsResponse> => {
  const user = (await User.findOne(
    findBy,
-    `uid displayName username isActive isAdmin autoExec`
+    `id displayName username isActive isAdmin autoExec -_id`
  ).populate(
    'groups',
-    'uid name description'
+    'groupId name description -_id'
  )) as unknown as UserDetailsResponse

  if (!user)
@@ -274,7 +280,7 @@ const getUser = async (
    }

  return {
-    uid: user.uid,
+    id: user.id,
    displayName: user.displayName,
    username: user.username,
    isActive: user.isActive,
@@ -287,7 +293,7 @@ const getUser = async (
 const getDesktopAutoExec = async () => {
  return {
    ...desktopUser,
-    uid: desktopUser.userId,
+    id: desktopUser.userId,
    autoExec: await getUserAutoExec()
  }
 }
@@ -323,8 +329,8 @@ const updateUser = async (
    const usernameExist = await User.findOne({ username })
    if (usernameExist) {
      if (
-        (findBy._id && usernameExist.uid !== findBy._id) ||
-        (findBy.username && usernameExist.username !== findBy.username)
+        (findBy.id && usernameExist.id != findBy.id) ||
+        (findBy.username && usernameExist.username != findBy.username)
      )
        throw {
          code: 409,
@@ -344,11 +350,11 @@ const updateUser = async (
  if (!updatedUser)
    throw {
      code: 404,
-      message: `Unable to find user with ${findBy._id || findBy.username}`
+      message: `Unable to find user with ${findBy.id || findBy.username}`
    }

  return {
-    uid: updatedUser.uid,
+    id: updatedUser.id,
    username: updatedUser.username,
    displayName: updatedUser.displayName,
    isAdmin: updatedUser.isAdmin,
@@ -361,7 +367,7 @@ const updateDesktopAutoExec = async (autoExec: string) => {
  await updateUserAutoExec(autoExec)
  return {
    ...desktopUser,
-    uid: desktopUser.userId,
+    id: desktopUser.userId,
    autoExec
  }
 }
@@ -106,10 +106,7 @@ const login = async (
  const rateLimiter = RateLimiter.getInstance()

  if (!validPass) {
-    const retrySecs = await rateLimiter.consume(
-      req.ip || 'unknown',
-      user?.username
-    )
+    const retrySecs = await rateLimiter.consume(req.ip, user?.username)
    if (retrySecs > 0) throw errors.tooManyRequests(retrySecs)
  }

@@ -117,11 +114,11 @@ const login = async (
  if (!validPass) throw errors.invalidPassword

  // Reset on successful authorization
-  rateLimiter.resetOnSuccess(req.ip || 'unknown', user.username)
+  rateLimiter.resetOnSuccess(req.ip, user.username)

  req.session.loggedIn = true
  req.session.user = {
-    userId: user.uid,
+    userId: user.id,
    clientId: 'web_app',
    username: user.username,
    displayName: user.displayName,
@@ -134,7 +131,7 @@ const login = async (
  return {
    loggedIn: true,
    user: {
-      uid: user.uid,
+      id: user.id,
      username: user.username,
      displayName: user.displayName,
      isAdmin: user.isAdmin,
@@ -37,10 +37,10 @@ export const authenticateAccessToken: RequestHandler = async (
        if (user.isActive) {
          req.user = user
          return csrfProtection(req, res, nextFunction)
-        } else return res.status(401).send('Unauthorized')
+        } else return res.sendStatus(401)
      }
    }
-    return res.status(401).send('Unauthorized')
+    return res.sendStatus(401)
  }

  await authenticateToken(
@@ -76,7 +76,7 @@ const authenticateToken = async (
  const { MODE } = process.env
  if (MODE === ModeType.Desktop) {
    req.user = {
-      userId: '1234',
+      userId: 1234,
      clientId: 'desktopModeClientId',
      username: 'desktopModeUsername',
      displayName: 'desktopModeDisplayName',
@@ -118,6 +118,6 @@ const authenticateToken = async (
      return next()
    }

-    res.status(401).send('Unauthorized')
+    res.sendStatus(401)
  }
 }
@@ -18,7 +18,7 @@ export const authorize: RequestHandler = async (req, res, next) => {
  // no need to check for permissions when route is Public
  if (await isPublicRoute(req)) return next()

-  const dbUser = await User.findOne({ _id: user.userId })
+  const dbUser = await User.findOne({ id: user.userId })
  if (!dbUser) return res.sendStatus(401)

  const path = getPath(req)
@@ -3,7 +3,7 @@ import { convertSecondsToHms } from '@sasjs/utils'
 import { RateLimiter } from '../utils'

 export const bruteForceProtection: RequestHandler = async (req, res, next) => {
-  const ip = req.ip || 'unknown'
+  const ip = req.ip
  const username = req.body.username

  const rateLimiter = RateLimiter.getInstance()
@@ -28,7 +28,7 @@ export const desktopRestrict: RequestHandler = (req, res, next) => {
 }

 export const desktopUser: RequestUser = {
-  userId: '12345',
+  userId: 12345,
  clientId: 'desktop_app',
  username: userInfo().username,
  displayName: userInfo().username,
@@ -8,8 +8,8 @@ export const verifyAdminIfNeeded: RequestHandler = (req, res, next) => {
  if (!user?.isAdmin) {
    let adminAccountRequired: boolean = true

-    if (req.params.uid) {
-      adminAccountRequired = user?.userId !== req.params.uid
+    if (req.params.userId) {
+      adminAccountRequired = user?.userId !== parseInt(req.params.userId)
    } else if (req.params.username) {
      adminAccountRequired = user?.username !== req.params.username
    }
@@ -0,0 +1,15 @@
+import mongoose, { Schema } from 'mongoose'
+
+const CounterSchema = new Schema({
+  id: {
+    type: String,
+    required: true,
+    unique: true
+  },
+  seq: {
+    type: Number,
+    required: true
+  }
+})
+
+export default mongoose.model('Counter', CounterSchema)
@@ -1,9 +1,9 @@
 import { Schema, model, Document, Model } from 'mongoose'
 import { GroupDetailsResponse } from '../controllers'
 import User, { IUser } from './User'
-import { AuthProviderType } from '../utils'
+import { AuthProviderType, getSequenceNextValue } from '../utils'

-export const PUBLIC_GROUP_NAME = 'public'
+export const PUBLIC_GROUP_NAME = 'Public'

 export interface GroupPayload {
  /**
@@ -24,12 +24,10 @@ export interface GroupPayload {
 }

 interface IGroupDocument extends GroupPayload, Document {
+  groupId: number
  isActive: boolean
  users: Schema.Types.ObjectId[]
  authProvider?: AuthProviderType
-
-  // Declare virtual properties as read-only properties
-  readonly uid: string
 }

 interface IGroup extends IGroupDocument {
@@ -39,23 +37,16 @@ interface IGroup extends IGroupDocument {
 }
 interface IGroupModel extends Model<IGroup> {}

-const opts = {
-  toJSON: {
-    virtuals: true,
-    transform: function (doc: any, ret: any, options: any) {
-      delete ret._id
-      delete ret.id
-      return ret
-    }
-  }
-}
-const groupSchema = new Schema<IGroupDocument>(
-  {
+const groupSchema = new Schema<IGroupDocument>({
  name: {
    type: String,
    required: true,
    unique: true
  },
+  groupId: {
+    type: Number,
+    unique: true
+  },
  description: {
    type: String,
    default: 'Group description.'
@@ -69,16 +60,17 @@ const groupSchema = new Schema<IGroupDocument>(
    default: true
  },
  users: [{ type: Schema.Types.ObjectId, ref: 'User' }]
-  },
-  opts
-)
+})

-groupSchema.virtual('uid').get(function () {
-  return this._id.toString()
+// Hooks
+groupSchema.pre('save', async function () {
+  if (this.isNew) {
+    this.groupId = await getSequenceNextValue('groupId')
+  }
 })

 groupSchema.post('save', function (group: IGroup, next: Function) {
-  group.populate('users', 'uid username displayName').then(function () {
+  group.populate('users', 'id username displayName -_id').then(function () {
    next()
  })
 })
@@ -1,5 +1,6 @@
 import { Schema, model, Document, Model } from 'mongoose'
 import { PermissionDetailsResponse } from '../controllers'
+import { getSequenceNextValue } from '../utils'

 interface GetPermissionBy {
  user?: Schema.Types.ObjectId
@@ -10,11 +11,9 @@ interface IPermissionDocument extends Document {
  path: string
  type: string
  setting: string
+  permissionId: number
  user: Schema.Types.ObjectId
  group: Schema.Types.ObjectId
-
-  // Declare virtual properties as read-only properties
-  readonly uid: string
 }

 interface IPermission extends IPermissionDocument {}
@@ -23,19 +22,11 @@ interface IPermissionModel extends Model<IPermission> {
  get(getBy: GetPermissionBy): Promise<PermissionDetailsResponse[]>
 }

-const opts = {
-  toJSON: {
-    virtuals: true,
-    transform: function (doc: any, ret: any, options: any) {
-      delete ret._id
-      delete ret.id
-      return ret
-    }
-  }
-}
-
-const permissionSchema = new Schema<IPermissionDocument>(
-  {
+const permissionSchema = new Schema<IPermissionDocument>({
+  permissionId: {
+    type: Number,
+    unique: true
+  },
  path: {
    type: String,
    required: true
@@ -50,12 +41,13 @@ const permissionSchema = new Schema<IPermissionDocument>(
  },
  user: { type: Schema.Types.ObjectId, ref: 'User' },
  group: { type: Schema.Types.ObjectId, ref: 'Group' }
-  },
-  opts
-)
+})

-permissionSchema.virtual('uid').get(function () {
-  return this._id.toString()
+// Hooks
+permissionSchema.pre('save', async function () {
+  if (this.isNew) {
+    this.permissionId = await getSequenceNextValue('permissionId')
+  }
 })

 // Static Methods
@@ -63,14 +55,20 @@ permissionSchema.static('get', async function (getBy: GetPermissionBy): Promise<
  PermissionDetailsResponse[]
 > {
  return (await this.find(getBy)
-    .select('uid path type setting')
-    .populate({ path: 'user', select: 'uid username displayName isAdmin' })
+    .select({
+      _id: 0,
+      permissionId: 1,
+      path: 1,
+      type: 1,
+      setting: 1
+    })
+    .populate({ path: 'user', select: 'id username displayName isAdmin -_id' })
    .populate({
      path: 'group',
-      select: 'uid name description',
+      select: 'groupId name description -_id',
      populate: {
        path: 'users',
-        select: 'uid username displayName isAdmin',
+        select: 'id username displayName isAdmin -_id',
        options: { limit: 15 }
      }
    })) as unknown as PermissionDetailsResponse[]
@@ -1,6 +1,6 @@
-import { Schema, model, Document, Model, ObjectId } from 'mongoose'
+import { Schema, model, Document, Model } from 'mongoose'
 import bcrypt from 'bcryptjs'
-import { AuthProviderType } from '../utils'
+import { AuthProviderType, getSequenceNextValue } from '../utils'

 export interface UserPayload {
  /**
@@ -36,6 +36,7 @@ export interface UserPayload {

 interface IUserDocument extends UserPayload, Document {
  _id: Schema.Types.ObjectId
+  id: number
  isAdmin: boolean
  isActive: boolean
  needsToUpdatePassword: boolean
@@ -43,9 +44,6 @@ interface IUserDocument extends UserPayload, Document {
  groups: Schema.Types.ObjectId[]
  tokens: [{ [key: string]: string }]
  authProvider?: AuthProviderType
-
-  // Declare virtual properties as read-only properties
-  readonly uid: string
 }

 export interface IUser extends IUserDocument {
@@ -56,19 +54,8 @@ export interface IUser extends IUserDocument {
 interface IUserModel extends Model<IUser> {
  hashPassword(password: string): string
 }
-const opts = {
-  toJSON: {
-    virtuals: true,
-    transform: function (doc: any, ret: any, options: any) {
-      delete ret._id
-      delete ret.id
-      return ret
-    }
-  }
-}

-const userSchema = new Schema<IUserDocument>(
-  {
+const userSchema = new Schema<IUserDocument>({
  displayName: {
    type: String,
    required: true
@@ -78,6 +65,10 @@ const userSchema = new Schema<IUserDocument>(
    required: true,
    unique: true
  },
+  id: {
+    type: Number,
+    unique: true
+  },
  password: {
    type: String,
    required: true
@@ -118,12 +109,15 @@ const userSchema = new Schema<IUserDocument>(
      }
    }
  ]
-  },
-  opts
-)
+})

-userSchema.virtual('uid').get(function () {
-  return this._id.toString()
+// Hooks
+userSchema.pre('save', async function (next) {
+  if (this.isNew) {
+    this.id = await getSequenceNextValue('id')
+  }
+
+  next()
 })

 // Static Methods
@@ -1,11 +1,7 @@
 import express from 'express'
 import { GroupController } from '../../controllers/'
 import { authenticateAccessToken, verifyAdmin } from '../../middlewares'
-import {
-  getGroupValidation,
-  registerGroupValidation,
-  uidValidation
-} from '../../utils'
+import { getGroupValidation, registerGroupValidation } from '../../utils'

 const groupRouter = express.Router()

@@ -37,15 +33,12 @@ groupRouter.get('/', authenticateAccessToken, async (req, res) => {
  }
 })

-groupRouter.get('/:uid', authenticateAccessToken, async (req, res) => {
-  const { error: uidError, value: params } = uidValidation(req.params)
-  if (uidError) return res.status(400).send(uidError.details[0].message)
-
-  const { uid } = params
+groupRouter.get('/:groupId', authenticateAccessToken, async (req, res) => {
+  const { groupId } = req.params

  const controller = new GroupController()
  try {
-    const response = await controller.getGroup(uid)
+    const response = await controller.getGroup(parseInt(groupId))
    res.send(response)
  } catch (err: any) {
    res.status(err.code).send(err.message)
@@ -63,7 +56,7 @@ groupRouter.get(

    const controller = new GroupController()
    try {
-      const response = await controller.getGroupByName(name)
+      const response = await controller.getGroupByGroupName(name)
      res.send(response)
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -72,15 +65,18 @@ groupRouter.get(
 )

 groupRouter.post(
-  '/:groupUid/:userUid',
+  '/:groupId/:userId',
  authenticateAccessToken,
  verifyAdmin,
  async (req, res) => {
-    const { groupUid, userUid } = req.params
+    const { groupId, userId } = req.params

    const controller = new GroupController()
    try {
-      const response = await controller.addUserToGroup(groupUid, userUid)
+      const response = await controller.addUserToGroup(
+        parseInt(groupId),
+        parseInt(userId)
+      )
      res.send(response)
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -89,15 +85,18 @@ groupRouter.post(
 )

 groupRouter.delete(
-  '/:groupUid/:userUid',
+  '/:groupId/:userId',
  authenticateAccessToken,
  verifyAdmin,
  async (req, res) => {
-    const { groupUid, userUid } = req.params
+    const { groupId, userId } = req.params

    const controller = new GroupController()
    try {
-      const response = await controller.removeUserFromGroup(groupUid, userUid)
+      const response = await controller.removeUserFromGroup(
+        parseInt(groupId),
+        parseInt(userId)
+      )
      res.send(response)
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -106,18 +105,15 @@ groupRouter.delete(
 )

 groupRouter.delete(
-  '/:uid',
+  '/:groupId',
  authenticateAccessToken,
  verifyAdmin,
  async (req, res) => {
-    const { error: uidError, value: params } = uidValidation(req.params)
-    if (uidError) return res.status(400).send(uidError.details[0].message)
-
-    const { uid } = params
+    const { groupId } = req.params

    const controller = new GroupController()
    try {
-      await controller.deleteGroup(uid)
+      await controller.deleteGroup(parseInt(groupId))
      res.status(200).send('Group Deleted!')
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -3,7 +3,6 @@ import { PermissionController } from '../../controllers/'
 import { verifyAdmin } from '../../middlewares'
 import {
  registerPermissionValidation,
-  uidValidation,
  updatePermissionValidation
 } from '../../utils'

@@ -35,17 +34,14 @@ permissionRouter.post('/', verifyAdmin, async (req, res) => {
  }
 })

-permissionRouter.patch('/:uid', verifyAdmin, async (req: any, res) => {
-  const { error: uidError, value: params } = uidValidation(req.params)
-  if (uidError) return res.status(400).send(uidError.details[0].message)
-
-  const { uid } = params
+permissionRouter.patch('/:permissionId', verifyAdmin, async (req: any, res) => {
+  const { permissionId } = req.params

  const { error, value: body } = updatePermissionValidation(req.body)
  if (error) return res.status(400).send(error.details[0].message)

  try {
-    const response = await controller.updatePermission(uid, body)
+    const response = await controller.updatePermission(permissionId, body)
    res.send(response)
  } catch (err: any) {
    const statusCode = err.code
@@ -54,18 +50,20 @@ permissionRouter.patch('/:uid', verifyAdmin, async (req: any, res) => {
  }
 })

-permissionRouter.delete('/:uid', verifyAdmin, async (req: any, res) => {
-  const { error: uidError, value: params } = uidValidation(req.params)
-  if (uidError) return res.status(400).send(uidError.details[0].message)
+permissionRouter.delete(
+  '/:permissionId',
+  verifyAdmin,
+  async (req: any, res) => {
+    const { permissionId } = req.params

-  const { uid } = params
    try {
-    await controller.deletePermission(uid)
+      await controller.deletePermission(permissionId)
      res.status(200).send('Permission Deleted!')
    } catch (err: any) {
      const statusCode = err.code
      delete err.code
      res.status(statusCode).send(err.message)
    }
-})
+  }
+)
 export default permissionRouter
@@ -13,7 +13,6 @@ import {
  generateAccessToken,
  generateAuthCode,
  generateRefreshToken,
-  randomBytesHexString,
  saveTokensInDB,
  verifyTokenInDB
 } from '../../../utils'
@@ -21,6 +20,7 @@ import {
 const clientId = 'someclientID'
 const clientSecret = 'someclientSecret'
 const user = {
+  id: 1234,
  displayName: 'Test User',
  username: 'testUsername',
  password: '87654321',
@@ -52,7 +52,7 @@ describe('auth', () => {
  describe('token', () => {
    const userInfo: InfoJWT = {
      clientId,
-      userId: randomBytesHexString(12)
+      userId: user.id
    }
    beforeAll(async () => {
      await userController.createUser(user)
@@ -151,10 +151,10 @@ describe('auth', () => {
      currentUser = await userController.createUser(user)
      refreshToken = generateRefreshToken({
        clientId,
-        userId: currentUser.uid
+        userId: currentUser.id
      })
      await saveTokensInDB(
-        currentUser.uid,
+        currentUser.id,
        clientId,
        'accessToken',
        refreshToken
@@ -202,11 +202,11 @@ describe('auth', () => {
      currentUser = await userController.createUser(user)
      accessToken = generateAccessToken({
        clientId,
-        userId: currentUser.uid
+        userId: currentUser.id
      })

      await saveTokensInDB(
-        currentUser.uid,
+        currentUser.id,
        clientId,
        accessToken,
        'refreshToken'
@@ -40,10 +40,10 @@ describe('client', () => {
    const dbUser = await userController.createUser(adminUser)
    adminAccessToken = generateAccessToken({
      clientId: client.clientId,
-      userId: dbUser.uid
+      userId: dbUser.id
    })
    await saveTokensInDB(
-      dbUser.uid,
+      dbUser.id,
      client.clientId,
      adminAccessToken,
      'refreshToken'
@@ -95,10 +95,10 @@ describe('client', () => {
      const dbUser = await userController.createUser(user)
      const accessToken = generateAccessToken({
        clientId: client.clientId,
-        userId: dbUser.uid
+        userId: dbUser.id
      })
      await saveTokensInDB(
-        dbUser.uid,
+        dbUser.id,
        client.clientId,
        accessToken,
        'refreshToken'
@@ -212,10 +212,10 @@ describe('client', () => {
      const dbUser = await userController.createUser(user)
      const accessToken = generateAccessToken({
        clientId: client.clientId,
-        userId: dbUser.uid
+        userId: dbUser.id
      })
      await saveTokensInDB(
-        dbUser.uid,
+        dbUser.id,
        client.clientId,
        accessToken,
        'refreshToken'
@@ -1,132 +0,0 @@
-import path from 'path'
-import { createFile, fileExists } from '@sasjs/utils'
-import { Express } from 'express'
-import mongoose, { Mongoose } from 'mongoose'
-import { MongoMemoryServer } from 'mongodb-memory-server'
-import request from 'supertest'
-import {
-  UserController,
-  PermissionController,
-  PermissionType,
-  PermissionSettingForRoute,
-  PrincipalType
-} from '../../../controllers/'
-import {
-  generateAccessToken,
-  saveTokensInDB,
-  RunTimeType,
-  sysInitCompiledPath
-} from '../../../utils'
-
-// Real, unmocked end-to-end test of the SAS execution pipeline (session
-// spawn -> autoexec handshake -> exit code -> HTTP response), using a fake
-// "SAS executable" (mockSas.js) in place of a real SAS install. This is the
-// regression test for issue #388: SAS code that aborts (%abort;) used to
-// hang the request forever instead of returning an error response.
-const mockSasPath = path.join(__dirname, 'files', 'mockSas.js')
-
-const clientId = 'codeSpecClientID'
-
-const user = {
-  displayName: 'Code Spec User',
-  username: 'codeSpecUsername',
-  password: '87654321',
-  isAdmin: false,
-  isActive: true
-}
-
-let app: Express
-let accessToken: string
-
-describe('code', () => {
-  let con: Mongoose
-  let mongoServer: MongoMemoryServer
-  let userController: UserController
-  let permissionController: PermissionController
-
-  beforeAll(async () => {
-    // SASSessionController.createSession() unconditionally reads this file
-    // (Session.ts:105) before it ever spawns the SAS process. It's normally
-    // produced by `npm run compileSysInit` (part of the `initial`/`build`
-    // scripts), which `npm test` does not run - so on a fresh checkout
-    // (e.g. CI, where "Run Unit Tests" happens before "Build Package") it
-    // doesn't exist yet. Content is irrelevant here since mockSas.js never
-    // interprets it; it just needs to exist and be readable.
-    if (!(await fileExists(sysInitCompiledPath))) {
-      await createFile(sysInitCompiledPath, '')
-    }
-
-    mongoServer = await MongoMemoryServer.create()
-    process.env.DB_CONNECT = mongoServer.getUri()
-    process.env.MODE = 'server'
-    process.env.RUN_TIMES = 'sas'
-    process.env.SAS_PATH = mockSasPath
-
-    const appPromise = (await import('../../../app')).default
-    app = await appPromise
-
-    con = await mongoose.connect(mongoServer.getUri())
-
-    userController = new UserController()
-    permissionController = new PermissionController()
-
-    const dbUser = await userController.createUser(user)
-    accessToken = await generateAndSaveToken(dbUser.uid)
-
-    await permissionController.createPermission({
-      path: '/SASjsApi/code/execute',
-      type: PermissionType.route,
-      principalType: PrincipalType.user,
-      principalId: dbUser.uid,
-      setting: PermissionSettingForRoute.grant
-    })
-
-    process.runTimes = [RunTimeType.SAS]
-    process.sasLoc = mockSasPath
-  }, 30000)
-
-  afterAll(async () => {
-    await con.connection.dropDatabase()
-    await con.connection.close()
-    await mongoServer.stop()
-  })
-
-  describe('execute', () => {
-    it('returns 200 with the mock log when the SAS program completes normally', async () => {
-      const response = await request(app)
-        .post('/SASjsApi/code/execute')
-        .auth(accessToken, { type: 'bearer' })
-        .send({ code: '%put hello world;', runTime: 'sas' })
-        .expect(200)
-
-      expect(response.text).toEqual(
-        expect.stringContaining('mock SAS execution')
-      )
-    }, 30000)
-
-    it('returns a prompt 400 (not a hang) with the complete log when the SAS session fails (%abort;)', async () => {
-      const response = await request(app)
-        .post('/SASjsApi/code/execute')
-        .auth(accessToken, { type: 'bearer' })
-        .send({ code: '%abort;', runTime: 'sas' })
-        .expect(400)
-
-      expect(response.body).toMatchObject({
-        status: 'failure',
-        message: 'Job execution failed.'
-      })
-      expect(response.body.log).toEqual(
-        expect.stringContaining('mock SAS execution')
-      )
-    }, 30000)
-  })
-})
-
-const generateAndSaveToken = async (userId: string) => {
-  const accessToken = generateAccessToken({
-    clientId,
-    userId
-  })
-  await saveTokensInDB(userId, clientId, accessToken, 'refreshToken')
-  return accessToken
-}
@@ -28,15 +28,6 @@ jest
  .spyOn(fileUtilModules, 'getUploadsFolder')
  .mockImplementation(() => path.join(tmpFolder, 'uploads'))

-// getFilesFolder() resolves via getSasjsDriveFolder()/process.driveLoc, a
-// separate root from getSasjsRootFolder()/process.sasjsRoot above - without
-// this, every test in this file that creates content under the drive (e.g.
-// 'level1', 'my/path/...') writes into the real, shared sasjs_root/drive
-// instead of this run's isolated tmpFolder, leaking state into later runs.
-jest
-  .spyOn(fileUtilModules, 'getFilesFolder')
-  .mockImplementation(() => path.join(tmpFolder, 'drive', 'files'))
-
 import appPromise from '../../../app'
 import {
  UserController,
@@ -80,31 +71,31 @@ describe('drive', () => {
    con = await mongoose.connect(mongoServer.getUri())

    const dbUser = await controller.createUser(user)
-    accessToken = await generateAndSaveToken(dbUser.uid)
+    accessToken = await generateAndSaveToken(dbUser.id)
    await permissionController.createPermission({
      ...permission,
      path: '/SASjsApi/drive/deploy',
-      principalId: dbUser.uid
+      principalId: dbUser.id
    })
    await permissionController.createPermission({
      ...permission,
      path: '/SASjsApi/drive/deploy/upload',
-      principalId: dbUser.uid
+      principalId: dbUser.id
    })
    await permissionController.createPermission({
      ...permission,
      path: '/SASjsApi/drive/file',
-      principalId: dbUser.uid
+      principalId: dbUser.id
    })
    await permissionController.createPermission({
      ...permission,
      path: '/SASjsApi/drive/folder',
-      principalId: dbUser.uid
+      principalId: dbUser.id
    })
    await permissionController.createPermission({
      ...permission,
      path: '/SASjsApi/drive/rename',
-      principalId: dbUser.uid
+      principalId: dbUser.id
    })
  })

@@ -1206,7 +1197,7 @@ const getExampleService = (): ServiceMember =>
  ((getTreeExample().members[0] as FolderMember).members[0] as FolderMember)
    .members[0] as ServiceMember

-const generateAndSaveToken = async (userId: string) => {
+const generateAndSaveToken = async (userId: number) => {
  const adminAccessToken = generateAccessToken({
    clientId,
    userId
@@ -1,105 +0,0 @@
-#!/usr/bin/env node
-
-// Minimal fake "SAS executable" used by tests in place of a real SAS
-// install. It only fulfils the CLI/filesystem handshake contract that
-// Session.ts / processProgram.ts rely on:
-//
-//   -SYSIN <path>   the file used as a signal channel: it starts out
-//                    containing a dummy (empty) placeholder, we delete it
-//                    to signal "session ready", then wait for it to be
-//                    rewritten with the real submitted program.
-//   -LOG <path>     where we write a fake log so downstream fileExists()/
-//                    readFile() calls have something to find.
-//
-// It does NOT interpret real SAS syntax. Exit code is the only thing that
-// matters to the Node side: 0 mimics a normal SAS termination, non-zero
-// mimics an abnormal one (e.g. %abort;).
-
-const fs = require('fs')
-
-const arg = (flag) => {
-  const idx = process.argv.indexOf(flag)
-
-  return idx === -1 ? undefined : process.argv[idx + 1]
-}
-
-const sysin = arg('-SYSIN')
-const logPath = arg('-LOG')
-
-// Give up waiting for the real program after this long, so an unused
-// pre-warmed session (sasjs pools up to 3 ready sessions) doesn't linger
-// forever and keep a test process alive. Generous rather than tight: CI
-// runners are frequently slower/more contended than a local dev machine
-// (shared CPU, coverage instrumentation on the Node side slowing down the
-// round trip this process is waiting on), and this cost is only ever paid
-// by sessions nothing is actually waiting on - the session actually used
-// by a request gets its real code written far sooner than this in practice.
-const GIVE_UP_AFTER_MS = 8000
-
-const sleepSync = (ms) => {
-  const until = Date.now() + ms
-
-  while (Date.now() < until) {
-    /* busy-wait, mirroring the real autoexec's SAS-side sleep() loop */
-  }
-}
-
-// Any of the filesystem calls below can legitimately race against
-// processProgram's own write-then-rename (e.g. existsSync sees the file,
-// then a rename mid-flight makes the following read miss). Treat that as
-// "not ready yet" and retry a few times, rather than letting an uncaught
-// exception crash this process with a non-zero exit - which would be
-// indistinguishable, to the Node side, from a genuine SAS failure.
-const retry = (fn, attempts = 5, delayMs = 20) => {
-  for (let i = 0; i < attempts; i++) {
-    try {
-      return { ok: true, value: fn() }
-    } catch (err) {
-      if (i === attempts - 1) return { ok: false, error: err }
-
-      sleepSync(delayMs)
-    }
-  }
-}
-
-// 1. remove the dummy SYSIN, signalling "session ready" to waitForSession()
-if (sysin) {
-  retry(() => {
-    if (fs.existsSync(sysin)) fs.unlinkSync(sysin)
-  })
-}
-
-// 2. wait for the real program to be written back to the same path
-const deadline = Date.now() + GIVE_UP_AFTER_MS
-
-while (!sysin || !fs.existsSync(sysin)) {
-  if (Date.now() > deadline) process.exit(0)
-
-  sleepSync(10)
-}
-
-// small settle delay, mirroring the real autoexec's sleep(0.01,1) after
-// detecting the file, so a fast-moving rename isn't read mid-write
-sleepSync(50)
-
-const readResult = retry(() => fs.readFileSync(sysin, 'utf-8'))
-
-if (!readResult.ok) {
-  process.stderr.write(
-    `mockSas.js: failed to read ${sysin}: ${readResult.error}\n`
-  )
-  process.exit(1)
-}
-
-const code = readResult.value
-
-if (logPath) {
-  retry(() => fs.writeFileSync(logPath, `NOTE: mock SAS execution\n${code}\n`))
-}
-
-if (code.includes('%abort;')) {
-  process.stderr.write('ERROR: SAS session terminated. See log for details.\n')
-  process.exit(1)
-}
-
-process.exit(0)
@@ -11,7 +11,6 @@ import {
 } from '../../../utils'
 import Group, { PUBLIC_GROUP_NAME } from '../../../model/Group'
 import User from '../../../model/User'
-import { randomBytes } from 'crypto'

 const clientId = 'someclientID'
 const adminUser = {
@@ -76,7 +75,7 @@ describe('group', () => {
        .send(group)
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
@@ -156,7 +155,7 @@ describe('group', () => {
      const dbGroup = await groupController.createGroup(group)

      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -175,17 +174,17 @@ describe('group', () => {
        username: 'deletegroup2'
      })

-      await groupController.addUserToGroup(dbGroup.uid, dbUser1.uid)
-      await groupController.addUserToGroup(dbGroup.uid, dbUser2.uid)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser1.id)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser2.id)

      await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

      const res1 = await request(app)
-        .get(`/SASjsApi/user/${dbUser1.uid}`)
+        .get(`/SASjsApi/user/${dbUser1.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -193,7 +192,7 @@ describe('group', () => {
      expect(res1.body.groups).toEqual([])

      const res2 = await request(app)
-        .get(`/SASjsApi/user/${dbUser2.uid}`)
+        .get(`/SASjsApi/user/${dbUser2.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -202,10 +201,8 @@ describe('group', () => {
    })

    it('should respond with Not Found if groupId is incorrect', async () => {
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .delete(`/SASjsApi/group/${hexValue}`)
+        .delete(`/SASjsApi/group/1234`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -232,7 +229,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}`)
        .auth(accessToken, { type: 'bearer' })
        .send()
        .expect(401)
@@ -248,15 +245,15 @@ describe('group', () => {
    })

    it('should respond with group', async () => {
-      const { uid } = await groupController.createGroup(group)
+      const { groupId } = await groupController.createGroup(group)

      const res = await request(app)
-        .get(`/SASjsApi/group/${uid}`)
+        .get(`/SASjsApi/group/${groupId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
@@ -269,15 +266,15 @@ describe('group', () => {
        username: 'get' + user.username
      })

-      const { uid } = await groupController.createGroup(group)
+      const { groupId } = await groupController.createGroup(group)

      const res = await request(app)
-        .get(`/SASjsApi/group/${uid}`)
+        .get(`/SASjsApi/group/${groupId}`)
        .auth(accessToken, { type: 'bearer' })
        .send()
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
@@ -295,10 +292,8 @@ describe('group', () => {
    })

    it('should respond with Not Found if groupId is incorrect', async () => {
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .get(`/SASjsApi/group/${hexValue}`)
+        .get('/SASjsApi/group/1234')
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -317,7 +312,7 @@ describe('group', () => {
          .send()
          .expect(200)

-        expect(res.body.uid).toBeTruthy()
+        expect(res.body.groupId).toBeTruthy()
        expect(res.body.name).toEqual(group.name)
        expect(res.body.description).toEqual(group.description)
        expect(res.body.isActive).toEqual(true)
@@ -338,7 +333,7 @@ describe('group', () => {
          .send()
          .expect(200)

-        expect(res.body.uid).toBeTruthy()
+        expect(res.body.groupId).toBeTruthy()
        expect(res.body.name).toEqual(group.name)
        expect(res.body.description).toEqual(group.description)
        expect(res.body.isActive).toEqual(true)
@@ -384,7 +379,7 @@ describe('group', () => {

      expect(res.body).toEqual([
        {
-          uid: expect.anything(),
+          groupId: expect.anything(),
          name: group.name,
          description: group.description
        }
@@ -406,7 +401,7 @@ describe('group', () => {

      expect(res.body).toEqual([
        {
-          uid: expect.anything(),
+          groupId: expect.anything(),
          name: group.name,
          description: group.description
        }
@@ -431,18 +426,18 @@ describe('group', () => {
      const dbUser = await userController.createUser(user)

      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
      expect(res.body.users).toEqual([
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: user.username,
          displayName: user.displayName
        }
@@ -457,20 +452,20 @@ describe('group', () => {
      })

      await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

      const res = await request(app)
-        .get(`/SASjsApi/user/${dbUser.uid}`)
+        .get(`/SASjsApi/user/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

      expect(res.body.groups).toEqual([
        {
-          uid: expect.anything(),
+          groupId: expect.anything(),
          name: group.name,
          description: group.description
        }
@@ -483,21 +478,21 @@ describe('group', () => {
        ...user,
        username: 'addUserRandomUser'
      })
-      await groupController.addUserToGroup(dbGroup.uid, dbUser.uid)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser.id)

      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
      expect(res.body.users).toEqual([
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: 'addUserRandomUser',
          displayName: user.displayName
        }
@@ -531,10 +526,8 @@ describe('group', () => {
    })

    it('should respond with Not Found if groupId is incorrect', async () => {
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .post(`/SASjsApi/group/${hexValue}/123`)
+        .post('/SASjsApi/group/123/123')
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -545,10 +538,8 @@ describe('group', () => {

    it('should respond with Not Found if userId is incorrect', async () => {
      const dbGroup = await groupController.createGroup(group)
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${hexValue}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/123`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -565,7 +556,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(400)
@@ -586,7 +577,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(405)
@@ -605,7 +596,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(405)
@@ -627,15 +618,15 @@ describe('group', () => {
        ...user,
        username: 'removeUserRandomUser'
      })
-      await groupController.addUserToGroup(dbGroup.uid, dbUser.uid)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser.id)

      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.groupId).toBeTruthy()
      expect(res.body.name).toEqual(group.name)
      expect(res.body.description).toEqual(group.description)
      expect(res.body.isActive).toEqual(true)
@@ -648,16 +639,16 @@ describe('group', () => {
        ...user,
        username: 'removeGroupFromUser'
      })
-      await groupController.addUserToGroup(dbGroup.uid, dbUser.uid)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser.id)

      await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)

      const res = await request(app)
-        .get(`/SASjsApi/user/${dbUser.uid}`)
+        .get(`/SASjsApi/user/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -676,7 +667,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(405)
@@ -695,7 +686,7 @@ describe('group', () => {
      })

      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(405)
@@ -732,10 +723,8 @@ describe('group', () => {
    })

    it('should respond with Not Found if groupId is incorrect', async () => {
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .delete(`/SASjsApi/group/${hexValue}/123`)
+        .delete('/SASjsApi/group/123/123')
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -746,10 +735,8 @@ describe('group', () => {

    it('should respond with Not Found if userId is incorrect', async () => {
      const dbGroup = await groupController.createGroup(group)
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .delete(`/SASjsApi/group/${dbGroup.uid}/${hexValue}`)
+        .delete(`/SASjsApi/group/${dbGroup.groupId}/123`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -765,10 +752,10 @@ const generateSaveTokenAndCreateUser = async (
 ): Promise<string> => {
  const dbUser = await userController.createUser(someUser ?? adminUser)

-  return generateAndSaveToken(dbUser.uid)
+  return generateAndSaveToken(dbUser.id)
 }

-const generateAndSaveToken = async (userId: string) => {
+const generateAndSaveToken = async (userId: number) => {
  const adminAccessToken = generateAccessToken({
    clientId,
    userId
@@ -17,7 +17,6 @@ import {
  PermissionDetailsResponse
 } from '../../../controllers'
 import { generateAccessToken, saveTokensInDB } from '../../../utils'
-import { randomBytes } from 'crypto'

 const deployPayload = {
  appLoc: 'string',
@@ -104,10 +103,10 @@ describe('permission', () => {
      const res = await request(app)
        .post('/SASjsApi/permission')
        .auth(adminAccessToken, { type: 'bearer' })
-        .send({ ...permission, principalId: dbUser.uid })
+        .send({ ...permission, principalId: dbUser.id })
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.permissionId).toBeTruthy()
      expect(res.body.path).toEqual(permission.path)
      expect(res.body.type).toEqual(permission.type)
      expect(res.body.setting).toEqual(permission.setting)
@@ -123,11 +122,11 @@ describe('permission', () => {
        .send({
          ...permission,
          principalType: 'group',
-          principalId: dbGroup.uid
+          principalId: dbGroup.groupId
        })
        .expect(200)

-      expect(res.body.uid).toBeTruthy()
+      expect(res.body.permissionId).toBeTruthy()
      expect(res.body.path).toEqual(permission.path)
      expect(res.body.type).toEqual(permission.type)
      expect(res.body.setting).toEqual(permission.setting)
@@ -145,7 +144,7 @@ describe('permission', () => {
    })

    it('should respond with Unauthorized if access token is not of an admin account', async () => {
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      const res = await request(app)
        .post('/SASjsApi/permission')
@@ -282,19 +281,17 @@ describe('permission', () => {
      expect(res.body).toEqual({})
    })

-    it('should respond with Bad Request if principalId is not a string of 24 hex characters', async () => {
+    it('should respond with Bad Request if principalId is not a number', async () => {
      const res = await request(app)
        .post('/SASjsApi/permission')
        .auth(adminAccessToken, { type: 'bearer' })
        .send({
          ...permission,
-          principalId: randomBytes(10).toString('hex')
+          principalId: 'someCharacters'
        })
        .expect(400)

-      expect(res.text).toEqual(
-        '"principalId" length must be 24 characters long'
-      )
+      expect(res.text).toEqual('"principalId" must be a number')
      expect(res.body).toEqual({})
    })

@@ -310,7 +307,7 @@ describe('permission', () => {
        .auth(adminAccessToken, { type: 'bearer' })
        .send({
          ...permission,
-          principalId: adminUser.uid
+          principalId: adminUser.id
        })
        .expect(400)

@@ -324,7 +321,7 @@ describe('permission', () => {
        .auth(adminAccessToken, { type: 'bearer' })
        .send({
          ...permission,
-          principalId: randomBytes(12).toString('hex')
+          principalId: 123
        })
        .expect(404)

@@ -339,7 +336,7 @@ describe('permission', () => {
        .send({
          ...permission,
          principalType: 'group',
-          principalId: randomBytes(12).toString('hex')
+          principalId: 123
        })
        .expect(404)

@@ -350,13 +347,13 @@ describe('permission', () => {
    it('should respond with Conflict (409) if permission already exists', async () => {
      await permissionController.createPermission({
        ...permission,
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })

      const res = await request(app)
        .post('/SASjsApi/permission')
        .auth(adminAccessToken, { type: 'bearer' })
-        .send({ ...permission, principalId: dbUser.uid })
+        .send({ ...permission, principalId: dbUser.id })
        .expect(409)

      expect(res.text).toEqual(
@@ -371,7 +368,7 @@ describe('permission', () => {
    beforeAll(async () => {
      dbPermission = await permissionController.createPermission({
        ...permission,
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })
    })

@@ -381,7 +378,7 @@ describe('permission', () => {

    it('should respond with updated permission', async () => {
      const res = await request(app)
-        .patch(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send({ setting: PermissionSettingForRoute.deny })
        .expect(200)
@@ -391,7 +388,7 @@ describe('permission', () => {

    it('should respond with Unauthorized if access token is not present', async () => {
      const res = await request(app)
-        .patch(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .send()
        .expect(401)

@@ -406,7 +403,7 @@ describe('permission', () => {
      })

      const res = await request(app)
-        .patch(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .auth(accessToken, { type: 'bearer' })
        .send()
        .expect(401)
@@ -417,7 +414,7 @@ describe('permission', () => {

    it('should respond with Bad Request if setting is missing', async () => {
      const res = await request(app)
-        .patch(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(400)
@@ -428,7 +425,7 @@ describe('permission', () => {

    it('should respond with Bad Request if setting is  invalid', async () => {
      const res = await request(app)
-        .patch(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send({
          setting: 'invalid'
@@ -440,9 +437,8 @@ describe('permission', () => {
    })

    it('should respond with not found (404) if permission with provided id does not exist', async () => {
-      const hexValue = randomBytes(12).toString('hex')
      const res = await request(app)
-        .patch(`/SASjsApi/permission/${hexValue}`)
+        .patch('/SASjsApi/permission/123')
        .auth(adminAccessToken, { type: 'bearer' })
        .send({
          setting: PermissionSettingForRoute.deny
@@ -458,10 +454,10 @@ describe('permission', () => {
    it('should delete permission', async () => {
      const dbPermission = await permissionController.createPermission({
        ...permission,
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })
      const res = await request(app)
-        .delete(`/SASjsApi/permission/${dbPermission?.uid}`)
+        .delete(`/SASjsApi/permission/${dbPermission?.permissionId}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -470,10 +466,8 @@ describe('permission', () => {
    })

    it('should respond with not found (404) if permission with provided id does not exists', async () => {
-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .delete(`/SASjsApi/permission/${hexValue}`)
+        .delete('/SASjsApi/permission/123')
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -487,12 +481,12 @@ describe('permission', () => {
      await permissionController.createPermission({
        ...permission,
        path: '/test-1',
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })
      await permissionController.createPermission({
        ...permission,
        path: '/test-2',
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })
    })

@@ -511,12 +505,12 @@ describe('permission', () => {
        ...user,
        username: 'get' + user.username
      })
-      const accessToken = await generateAndSaveToken(nonAdminUser.uid)
+      const accessToken = await generateAndSaveToken(nonAdminUser.id)
      await permissionController.createPermission({
        path: '/test-1',
        type: PermissionType.route,
        principalType: PrincipalType.user,
-        principalId: nonAdminUser.uid,
+        principalId: nonAdminUser.id,
        setting: PermissionSettingForRoute.grant
      })

@@ -537,7 +531,7 @@ describe('permission', () => {
      await permissionController.createPermission({
        ...permission,
        path: '/SASjsApi/drive/deploy',
-        principalId: dbUser.uid
+        principalId: dbUser.id
      })
    })

@@ -557,7 +551,7 @@ describe('permission', () => {
    })

    it('should create files in SASJS drive', async () => {
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      await request(app)
        .get('/SASjsApi/drive/deploy')
@@ -567,7 +561,7 @@ describe('permission', () => {
    })

    it('should respond unauthorized', async () => {
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      await request(app)
        .get('/SASjsApi/drive/deploy/upload')
@@ -583,10 +577,10 @@ const generateSaveTokenAndCreateUser = async (
 ): Promise<string> => {
  const dbUser = await userController.createUser(someUser ?? adminUser)

-  return generateAndSaveToken(dbUser.uid)
+  return generateAndSaveToken(dbUser.id)
 }

-const generateAndSaveToken = async (userId: string) => {
+const generateAndSaveToken = async (userId: number) => {
  const adminAccessToken = generateAccessToken({
    clientId,
    userId
@@ -58,12 +58,12 @@ describe('stp', () => {
    mongoServer = await MongoMemoryServer.create()
    con = await mongoose.connect(mongoServer.getUri())
    const dbUser = await userController.createUser(user)
-    accessToken = await generateAndSaveToken(dbUser.uid)
+    accessToken = await generateAndSaveToken(dbUser.id)
    await permissionController.createPermission({
      path: '/SASjsApi/stp/execute',
      type: PermissionType.route,
      principalType: PrincipalType.user,
-      principalId: dbUser.uid,
+      principalId: dbUser.id,
      setting: PermissionSettingForRoute.grant
    })
  })
@@ -456,7 +456,7 @@ const makeRequestAndAssert = async (
    )
 }

-const generateAndSaveToken = async (userId: string) => {
+const generateAndSaveToken = async (userId: number) => {
  const accessToken = generateAccessToken({
    clientId,
    userId
@@ -1,4 +1,3 @@
-import { randomBytes } from 'crypto'
 import { Express } from 'express'
 import mongoose, { Mongoose } from 'mongoose'
 import { MongoMemoryServer } from 'mongodb-memory-server'
@@ -102,9 +101,9 @@ describe('user', () => {
      const dbUser = await controller.createUser(user)
      const accessToken = generateAccessToken({
        clientId,
-        userId: dbUser.uid
+        userId: dbUser.id
      })
-      await saveTokensInDB(dbUser.uid, clientId, accessToken, 'refreshToken')
+      await saveTokensInDB(dbUser.id, clientId, accessToken, 'refreshToken')

      const res = await request(app)
        .post('/SASjsApi/user')
@@ -188,7 +187,7 @@ describe('user', () => {
      const newDisplayName = 'My new display Name'

      const res = await request(app)
-        .patch(`/SASjsApi/user/${dbUser.uid}`)
+        .patch(`/SASjsApi/user/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send({ ...user, displayName: newDisplayName })
        .expect(200)
@@ -201,11 +200,11 @@ describe('user', () => {

    it('should respond with updated user when user himself requests', async () => {
      const dbUser = await controller.createUser(user)
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)
      const newDisplayName = 'My new display Name'

      const res = await request(app)
-        .patch(`/SASjsApi/user/${dbUser.uid}`)
+        .patch(`/SASjsApi/user/${dbUser.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send({
          displayName: newDisplayName,
@@ -222,11 +221,11 @@ describe('user', () => {

    it('should respond with Bad Request, only admin can update isAdmin/isActive', async () => {
      const dbUser = await controller.createUser(user)
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)
      const newDisplayName = 'My new display Name'

      await request(app)
-        .patch(`/SASjsApi/user/${dbUser.uid}`)
+        .patch(`/SASjsApi/user/${dbUser.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send({ ...user, displayName: newDisplayName })
        .expect(400)
@@ -278,10 +277,10 @@ describe('user', () => {
        ...user,
        username: 'randomUser'
      })
-      const accessToken = await generateAndSaveToken(dbUser2.uid)
+      const accessToken = await generateAndSaveToken(dbUser2.id)

      const res = await request(app)
-        .patch(`/SASjsApi/user/${dbUser1.uid}`)
+        .patch(`/SASjsApi/user/${dbUser1.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send(user)
        .expect(401)
@@ -298,7 +297,7 @@ describe('user', () => {
      })

      const res = await request(app)
-        .patch(`/SASjsApi/user/${dbUser1.uid}`)
+        .patch(`/SASjsApi/user/${dbUser1.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send({ username: dbUser2.username })
        .expect(409)
@@ -326,7 +325,7 @@ describe('user', () => {

      it('should respond with updated user when user himself requests', async () => {
        const dbUser = await controller.createUser(user)
-        const accessToken = await generateAndSaveToken(dbUser.uid)
+        const accessToken = await generateAndSaveToken(dbUser.id)
        const newDisplayName = 'My new display Name'

        const res = await request(app)
@@ -347,7 +346,7 @@ describe('user', () => {

      it('should respond with Bad Request, only admin can update isAdmin/isActive', async () => {
        const dbUser = await controller.createUser(user)
-        const accessToken = await generateAndSaveToken(dbUser.uid)
+        const accessToken = await generateAndSaveToken(dbUser.id)
        const newDisplayName = 'My new display Name'

        await request(app)
@@ -373,10 +372,10 @@ describe('user', () => {
          ...user,
          username: 'randomUser'
        })
-        const accessToken = await generateAndSaveToken(dbUser2.uid)
+        const accessToken = await generateAndSaveToken(dbUser2.id)

        const res = await request(app)
-          .patch(`/SASjsApi/user/${dbUser1.uid}`)
+          .patch(`/SASjsApi/user/${dbUser1.id}`)
          .auth(accessToken, { type: 'bearer' })
          .send(user)
          .expect(401)
@@ -419,7 +418,7 @@ describe('user', () => {
      const dbUser = await controller.createUser(user)

      const res = await request(app)
-        .delete(`/SASjsApi/user/${dbUser.uid}`)
+        .delete(`/SASjsApi/user/${dbUser.id}`)
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(200)
@@ -429,10 +428,10 @@ describe('user', () => {

    it('should respond with OK when user himself requests', async () => {
      const dbUser = await controller.createUser(user)
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      const res = await request(app)
-        .delete(`/SASjsApi/user/${dbUser.uid}`)
+        .delete(`/SASjsApi/user/${dbUser.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send({ password: user.password })
        .expect(200)
@@ -442,10 +441,10 @@ describe('user', () => {

    it('should respond with Bad Request when user himself requests and password is missing', async () => {
      const dbUser = await controller.createUser(user)
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      const res = await request(app)
-        .delete(`/SASjsApi/user/${dbUser.uid}`)
+        .delete(`/SASjsApi/user/${dbUser.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send()
        .expect(400)
@@ -470,10 +469,10 @@ describe('user', () => {
        ...user,
        username: 'randomUser'
      })
-      const accessToken = await generateAndSaveToken(dbUser2.uid)
+      const accessToken = await generateAndSaveToken(dbUser2.id)

      const res = await request(app)
-        .delete(`/SASjsApi/user/${dbUser1.uid}`)
+        .delete(`/SASjsApi/user/${dbUser1.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send(user)
        .expect(401)
@@ -484,10 +483,10 @@ describe('user', () => {

    it('should respond with Unauthorized when user himself requests and password is incorrect', async () => {
      const dbUser = await controller.createUser(user)
-      const accessToken = await generateAndSaveToken(dbUser.uid)
+      const accessToken = await generateAndSaveToken(dbUser.id)

      const res = await request(app)
-        .delete(`/SASjsApi/user/${dbUser.uid}`)
+        .delete(`/SASjsApi/user/${dbUser.id}`)
        .auth(accessToken, { type: 'bearer' })
        .send({ password: 'incorrectpassword' })
        .expect(401)
@@ -511,7 +510,7 @@ describe('user', () => {

      it('should respond with OK when user himself requests', async () => {
        const dbUser = await controller.createUser(user)
-        const accessToken = await generateAndSaveToken(dbUser.uid)
+        const accessToken = await generateAndSaveToken(dbUser.id)

        const res = await request(app)
          .delete(`/SASjsApi/user/by/username/${dbUser.username}`)
@@ -524,7 +523,7 @@ describe('user', () => {

      it('should respond with Bad Request when user himself requests and password is missing', async () => {
        const dbUser = await controller.createUser(user)
-        const accessToken = await generateAndSaveToken(dbUser.uid)
+        const accessToken = await generateAndSaveToken(dbUser.id)

        const res = await request(app)
          .delete(`/SASjsApi/user/by/username/${dbUser.username}`)
@@ -552,7 +551,7 @@ describe('user', () => {
          ...user,
          username: 'randomUser'
        })
-        const accessToken = await generateAndSaveToken(dbUser2.uid)
+        const accessToken = await generateAndSaveToken(dbUser2.id)

        const res = await request(app)
          .delete(`/SASjsApi/user/by/username/${dbUser1.username}`)
@@ -566,7 +565,7 @@ describe('user', () => {

      it('should respond with Unauthorized when user himself requests and password is incorrect', async () => {
        const dbUser = await controller.createUser(user)
-        const accessToken = await generateAndSaveToken(dbUser.uid)
+        const accessToken = await generateAndSaveToken(dbUser.id)

        const res = await request(app)
          .delete(`/SASjsApi/user/by/username/${dbUser.username}`)
@@ -593,7 +592,7 @@ describe('user', () => {

    it('should respond with user autoExec when same user requests', async () => {
      const dbUser = await controller.createUser(user)
-      const userId = dbUser.uid
+      const userId = dbUser.id
      const accessToken = await generateAndSaveToken(userId)

      const res = await request(app)
@@ -612,7 +611,7 @@ describe('user', () => {

    it('should respond with user autoExec when admin user requests', async () => {
      const dbUser = await controller.createUser(user)
-      const userId = dbUser.uid
+      const userId = dbUser.id

      const res = await request(app)
        .get(`/SASjsApi/user/${userId}`)
@@ -635,7 +634,7 @@ describe('user', () => {
      })

      const dbUser = await controller.createUser(user)
-      const userId = dbUser.uid
+      const userId = dbUser.id

      const res = await request(app)
        .get(`/SASjsApi/user/${userId}`)
@@ -653,7 +652,7 @@ describe('user', () => {

    it('should respond with user along with associated groups', async () => {
      const dbUser = await controller.createUser(user)
-      const userId = dbUser.uid
+      const userId = dbUser.id
      const accessToken = await generateAndSaveToken(userId)

      const group = {
@@ -662,7 +661,7 @@ describe('user', () => {
      }
      const groupController = new GroupController()
      const dbGroup = await groupController.createGroup(group)
-      await groupController.addUserToGroup(dbGroup.uid, dbUser.uid)
+      await groupController.addUserToGroup(dbGroup.groupId, dbUser.id)

      const res = await request(app)
        .get(`/SASjsApi/user/${userId}`)
@@ -691,10 +690,8 @@ describe('user', () => {
    it('should respond with Not Found if userId is incorrect', async () => {
      await controller.createUser(user)

-      const hexValue = randomBytes(12).toString('hex')
-
      const res = await request(app)
-        .get(`/SASjsApi/user/${hexValue}`)
+        .get('/SASjsApi/user/1234')
        .auth(adminAccessToken, { type: 'bearer' })
        .send()
        .expect(404)
@@ -706,7 +703,7 @@ describe('user', () => {
    describe('by username', () => {
      it('should respond with user autoExec when same user requests', async () => {
        const dbUser = await controller.createUser(user)
-        const userId = dbUser.uid
+        const userId = dbUser.id
        const accessToken = await generateAndSaveToken(userId)

        const res = await request(app)
@@ -806,13 +803,13 @@ describe('user', () => {

      expect(res.body).toEqual([
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: adminUser.username,
          displayName: adminUser.displayName,
          isAdmin: adminUser.isAdmin
        },
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: user.username,
          displayName: user.displayName,
          isAdmin: user.isAdmin
@@ -834,13 +831,13 @@ describe('user', () => {

      expect(res.body).toEqual([
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: adminUser.username,
          displayName: adminUser.displayName,
          isAdmin: adminUser.isAdmin
        },
        {
-          uid: expect.anything(),
+          id: expect.anything(),
          username: 'randomUser',
          displayName: user.displayName,
          isAdmin: user.isAdmin
@@ -862,10 +859,10 @@ const generateSaveTokenAndCreateUser = async (
 ): Promise<string> => {
  const dbUser = await controller.createUser(someUser ?? adminUser)

-  return generateAndSaveToken(dbUser.uid)
+  return generateAndSaveToken(dbUser.id)
 }

-const generateAndSaveToken = async (userId: string) => {
+const generateAndSaveToken = async (userId: number) => {
  const adminAccessToken = generateAccessToken({
    clientId,
    userId
@@ -145,7 +145,7 @@ describe('web', () => {

      expect(res.body.loggedIn).toBeTruthy()
      expect(res.body.user).toEqual({
-        uid: expect.any(String),
+        id: expect.any(Number),
        username: user.username,
        displayName: user.displayName,
        isAdmin: user.isAdmin,
@@ -277,10 +277,7 @@ const performLogin = async (
    .set('x-xsrf-token', csrfToken)
    .send(credentials)

-  return {
-    authCookies:
-      (header['set-cookie'] as unknown as string[] | undefined)?.join() || ''
-  }
+  return { authCookies: header['set-cookie'].join() }
 }

 const extractCSRF = (text: string) =>
@@ -9,7 +9,6 @@ import {
  deleteUserValidation,
  getUserValidation,
  registerUserValidation,
-  uidValidation,
  updateUserValidation
 } from '../../utils'

@@ -57,15 +56,12 @@ userRouter.get(
  }
 )

-userRouter.get('/:uid', authenticateAccessToken, async (req, res) => {
-  const { error, value: params } = uidValidation(req.params)
-  if (error) return res.status(400).send(error.details[0].message)
-
-  const { uid } = params
+userRouter.get('/:userId', authenticateAccessToken, async (req, res) => {
+  const { userId } = req.params

  const controller = new UserController()
  try {
-    const response = await controller.getUser(req, uid)
+    const response = await controller.getUser(req, parseInt(userId))
    res.send(response)
  } catch (err: any) {
    res.status(err.code).send(err.message)
@@ -101,16 +97,12 @@ userRouter.patch(
 )

 userRouter.patch(
-  '/:uid',
+  '/:userId',
  authenticateAccessToken,
  verifyAdminIfNeeded,
  async (req, res) => {
    const { user } = req
-
-    const { error: uidError, value: params } = uidValidation(req.params)
-    if (uidError) return res.status(400).send(uidError.details[0].message)
-
-    const { uid } = params
+    const { userId } = req.params

    // only an admin can update `isActive` and `isAdmin` fields
    const { error, value: body } = updateUserValidation(req.body, user!.isAdmin)
@@ -118,7 +110,7 @@ userRouter.patch(

    const controller = new UserController()
    try {
-      const response = await controller.updateUser(uid, body)
+      const response = await controller.updateUser(parseInt(userId), body)
      res.send(response)
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -155,16 +147,12 @@ userRouter.delete(
 )

 userRouter.delete(
-  '/:uid',
+  '/:userId',
  authenticateAccessToken,
  verifyAdminIfNeeded,
  async (req, res) => {
    const { user } = req
-
-    const { error: uidError, value: params } = uidValidation(req.params)
-    if (uidError) return res.status(400).send(uidError.details[0].message)
-
-    const { uid } = params
+    const { userId } = req.params

    // only an admin can delete user without providing password
    const { error, value: data } = deleteUserValidation(req.body, user!.isAdmin)
@@ -172,7 +160,7 @@ userRouter.delete(

    const controller = new UserController()
    try {
-      await controller.deleteUser(uid, data, user!.isAdmin)
+      await controller.deleteUser(parseInt(userId), data, user!.isAdmin)
      res.status(200).send('Account Deleted!')
    } catch (err: any) {
      res.status(err.code).send(err.message)
@@ -1,4 +1,4 @@
 export interface InfoJWT {
  clientId: string
-  userId: string
+  userId: number
 }
@@ -1,6 +1,6 @@
 export interface PreProgramVars {
  username: string
-  userId: string
+  userId: number
  displayName: string
  serverUrl: string
  httpHeaders: string[]
@@ -1,5 +1,5 @@
 export interface RequestUser {
-  userId: string
+  userId: number
  clientId: string
  username: string
  displayName: string
@@ -1,4 +0,0 @@
-import { randomBytes } from 'crypto'
-
-export const randomBytesHexString = (bytesCount: number) =>
-  randomBytes(bytesCount).toString('hex')
@@ -22,7 +22,7 @@ export const getPreProgramVariables = (req: Request): PreProgramVars => {
  //So this is workaround.
  return {
    username: user ? user.username : 'demo',
-    userId: user ? user.userId : 'demoId',
+    userId: user ? user.userId : 0,
    displayName: user ? user.displayName : 'demo',
    serverUrl: protocol + host,
    httpHeaders
@@ -0,0 +1,15 @@
+import Counter from '../model/Counter'
+
+export const getSequenceNextValue = async (seqName: string) => {
+  const seqDoc = await Counter.findOne({ id: seqName })
+  if (!seqDoc) {
+    await Counter.create({ id: seqName, seq: 1 })
+    return 1
+  }
+
+  seqDoc.seq += 1
+
+  await seqDoc.save()
+
+  return seqDoc.seq
+}
@@ -1,19 +1,17 @@
 import jwt from 'jsonwebtoken'
 import User from '../model/User'
-import { InfoJWT } from '../types/InfoJWT'

 const isValidToken = async (
  token: string,
  key: string,
-  userId: string,
+  userId: number,
  clientId: string
 ) => {
  const promise = new Promise<boolean>((resolve, reject) =>
    jwt.verify(token, key, (err, decoded) => {
      if (err) return reject(false)

-      const payload = decoded as InfoJWT
-      if (payload?.userId === userId && payload?.clientId === clientId) {
+      if (decoded?.userId === userId && decoded?.clientId === clientId) {
        return resolve(true)
      }

@@ -24,8 +22,8 @@ const isValidToken = async (
  return await promise.then(() => true).catch(() => false)
 }

-export const getTokensFromDB = async (userId: string, clientId: string) => {
-  const user = await User.findOne({ _id: userId })
+export const getTokensFromDB = async (userId: number, clientId: string) => {
+  const user = await User.findOne({ id: userId })
  if (!user) return

  const currentTokenObj = user.tokens.find(
@@ -2,7 +2,6 @@ export * from './appStreamConfig'
 export * from './connectDB'
 export * from './copySASjsCore'
 export * from './createWeboutSasFile'
-export * from './crypto'
 export * from './desktopAutoExec'
 export * from './extractHeaders'
 export * from './extractName'
@@ -15,6 +14,7 @@ export * from './getCertificates'
 export * from './getDesktopFields'
 export * from './getPreProgramVariables'
 export * from './getRunTimeAndFilePath'
+export * from './getSequenceNextValue'
 export * from './getServerUrl'
 export * from './getTokensFromDB'
 export * from './instantiateLogger'
@@ -22,7 +22,7 @@ export const isPublicRoute = async (req: Request): Promise<boolean> => {
 }

 export const publicUser: RequestUser = {
-  userId: 'public_user_id',
+  userId: 0,
  clientId: 'public_app',
  username: 'publicUser',
  displayName: 'Public User',
@@ -1,7 +1,7 @@
 import User from '../model/User'

-export const removeTokensInDB = async (userId: string, clientId: string) => {
-  const user = await User.findOne({ _id: userId })
+export const removeTokensInDB = async (userId: number, clientId: string) => {
+  const user = await User.findOne({ id: userId })
  if (!user) return

  const tokenObjIndex = user.tokens.findIndex(
@@ -1,12 +1,12 @@
 import User from '../model/User'

 export const saveTokensInDB = async (
-  userId: string,
+  userId: number,
  clientId: string,
  accessToken: string,
  refreshToken: string
 ) => {
-  const user = await User.findOne({ _id: userId })
+  const user = await User.findOne({ id: userId })
  if (!user) return

  const currentTokenObj = user.tokens.find(
@@ -82,7 +82,7 @@ export const seedDB = async (): Promise<ConfigurationType> => {
 }

 export const ALL_USERS_GROUP = {
-  name: 'all-users',
+  name: 'AllUsers',
  description: 'Group contains all users'
 }

@@ -12,11 +12,6 @@ const groupnameSchema = Joi.string().lowercase().alphanum().min(3).max(16)

 export const blockFileRegex = /\.(exe|sh|htaccess)$/i

-export const uidValidation = (data: any) =>
-  Joi.object({
-    uid: Joi.string().length(24).hex().required()
-  }).validate(data)
-
 export const getUserValidation = (data: any): Joi.ValidationResult =>
  Joi.object({
    username: usernameSchema.required()
@@ -118,7 +113,7 @@ export const registerPermissionValidation = (data: any): Joi.ValidationResult =>
    principalType: Joi.string()
      .required()
      .valid(...Object.values(PrincipalType)),
-    principalId: Joi.string().length(24).hex().required()
+    principalId: Joi.number().required()
  }).validate(data)

 export const updatePermissionValidation = (data: any): Joi.ValidationResult =>
@@ -4,7 +4,7 @@ import { RequestUser } from '../types'
 export const fetchLatestAutoExec = async (
  reqUser: RequestUser
 ): Promise<RequestUser | undefined> => {
-  const dbUser = await User.findOne({ _id: reqUser.userId })
+  const dbUser = await User.findOne({ id: reqUser.userId })

  if (!dbUser) return undefined

@@ -21,12 +21,12 @@ export const fetchLatestAutoExec = async (
 }

 export const verifyTokenInDB = async (
-  userId: string,
+  userId: number,
  clientId: string,
  token: string,
  tokenType: 'accessToken' | 'refreshToken'
 ): Promise<RequestUser | undefined> => {
-  const dbUser = await User.findOne({ _id: userId })
+  const dbUser = await User.findOne({ id: userId })

  if (!dbUser) return undefined

@@ -36,7 +36,7 @@ export const verifyTokenInDB = async (

  return currentTokenObj?.[tokenType] === token
    ? {
-        userId: dbUser.uid,
+        userId: dbUser.id,
        clientId,
        username: dbUser.username,
        displayName: dbUser.displayName,
@@ -4,9 +4,7 @@
  "private": true,
  "scripts": {
    "start": "webpack-dev-server --config webpack.dev.ts --hot",
-    "build": "webpack --config webpack.prod.ts",
-    "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
-    "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\""
+    "build": "webpack --config webpack.prod.ts"
  },
  "dependencies": {
    "@emotion/react": "^11.4.1",
@@ -21,8 +19,9 @@
    "@types/jest": "^26.0.24",
    "@types/node": "^12.20.28",
    "@types/react": "^17.0.27",
-    "axios": "1.12.2",
+    "axios": "^1.12.2",
    "monaco-editor": "^0.33.0",
+    "monaco-editor-webpack-plugin": "^7.0.1",
    "react": "^17.0.2",
    "react-copy-to-clipboard": "^5.1.0",
    "react-dom": "^17.0.2",
@@ -55,16 +54,15 @@
    "eslint-webpack-plugin": "^3.1.1",
    "file-loader": "^6.2.0",
    "html-webpack-plugin": "5.5.0",
-    "monaco-editor-webpack-plugin": "^7.0.1",
    "path": "0.12.7",
-    "prettier": "^3.0.3",
+    "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",
    "typescript-plugin-css-modules": "^5.0.1",
-    "webpack": "5.64.3",
+    "webpack": "^5.101.3",
    "webpack-cli": "^4.9.2",
    "webpack-dev-server": "4.7.4"
  },
@@ -40,7 +40,7 @@ const Login = () => {
      })

    if (loggedIn) {
-      appContext.setUserId?.(user.uid)
+      appContext.setUserId?.(user.id)
      appContext.setUsername?.(user.username)
      appContext.setDisplayName?.(user.displayName)
      appContext.setIsAdmin?.(user.isAdmin)
@@ -99,8 +99,8 @@ const AddPermissionModal = ({
        principalType: principalType.toLowerCase(),
        principalId:
          principalType.toLowerCase() === 'user'
-            ? userPrincipal?.uid
-            : groupPrincipal?.uid
+            ? userPrincipal?.id
+            : groupPrincipal?.groupId
      }

      permissions.push(addPermissionPayload)
@@ -61,7 +61,7 @@ const PermissionTable = ({
        </TableHead>
        <TableBody>
          {permissions.map((permission) => (
-            <TableRow key={permission.uid}>
+            <TableRow key={permission.permissionId}>
              <BootstrapTableCell>{permission.path}</BootstrapTableCell>
              <BootstrapTableCell>{permission.type}</BootstrapTableCell>
              <BootstrapTableCell>
@@ -69,7 +69,7 @@ const useAddPermission = () => {

    for (const permission of updatingPermissions) {
      await axios
-        .patch(`/SASjsApi/permission/${permission.uid}`, {
+        .patch(`/SASjsApi/permission/${permission.permissionId}`, {
          setting: permission.setting === 'Grant' ? 'Deny' : 'Grant'
        })
        .then((res) => {
@@ -24,7 +24,7 @@ const useDeletePermissionModal = () => {
    setDeleteConfirmationModalOpen(false)
    setIsLoading(true)
    axios
-      .delete(`/SASjsApi/permission/${selectedPermission?.uid}`)
+      .delete(`/SASjsApi/permission/${selectedPermission?.permissionId}`)
      .then((res: any) => {
        fetchPermissions()
        setSnackbarMessage('Permission deleted!')
@@ -62,17 +62,21 @@ const useFilterPermissions = () => {
        : permissions

    let filteredArray = uriFilteredPermissions.filter((permission) =>
-      principalFilteredPermissions.some((item) => item.uid === permission.uid)
+      principalFilteredPermissions.some(
+        (item) => item.permissionId === permission.permissionId
+      )
    )

    filteredArray = filteredArray.filter((permission) =>
      principalTypeFilteredPermissions.some(
-        (item) => item.uid === permission.uid
+        (item) => item.permissionId === permission.permissionId
      )
    )

    filteredArray = filteredArray.filter((permission) =>
-      settingFilteredPermissions.some((item) => item.uid === permission.uid)
+      settingFilteredPermissions.some(
+        (item) => item.permissionId === permission.permissionId
+      )
    )

    setFilteredPermissions(filteredArray)
@@ -24,7 +24,7 @@ const useUpdatePermissionModal = () => {
    setUpdatePermissionModalOpen(false)
    setIsLoading(true)
    axios
-      .patch(`/SASjsApi/permission/${selectedPermission?.uid}`, {
+      .patch(`/SASjsApi/permission/${selectedPermission?.permissionId}`, {
        setting
      })
      .then((res: any) => {
@@ -26,7 +26,6 @@ const Profile = () => {
  const [isPasswordModalOpen, setIsPasswordModalOpen] = useState(false)

  useEffect(() => {
-    if (appContext.userId) {
    setIsLoading(true)
    axios
      .get(`/SASjsApi/user/${appContext.userId}`)
@@ -39,7 +38,6 @@ const Profile = () => {
      .finally(() => {
        setIsLoading(false)
      })
-    }
  }, [appContext.userId])

  const handleChange = (event: any) => {
@@ -24,32 +24,39 @@ export enum RunTimeType {
 interface AppContextProps {
  checkingSession: boolean
  loggedIn: boolean
-  setLoggedIn?: Dispatch<SetStateAction<boolean>>
+  setLoggedIn: Dispatch<SetStateAction<boolean>> | null
  needsToUpdatePassword: boolean
-  setNeedsToUpdatePassword?: Dispatch<SetStateAction<boolean>>
-  userId?: string
-  setUserId?: Dispatch<SetStateAction<string | undefined>>
+  setNeedsToUpdatePassword: Dispatch<SetStateAction<boolean>> | null
+  userId: number
+  setUserId: Dispatch<SetStateAction<number>> | null
  username: string
-  setUsername?: Dispatch<SetStateAction<string>>
+  setUsername: Dispatch<SetStateAction<string>> | null
  displayName: string
-  setDisplayName?: Dispatch<SetStateAction<string>>
+  setDisplayName: Dispatch<SetStateAction<string>> | null
  isAdmin: boolean
-  setIsAdmin?: Dispatch<SetStateAction<boolean>>
+  setIsAdmin: Dispatch<SetStateAction<boolean>> | null
  mode: ModeType
  runTimes: RunTimeType[]
-  logout?: () => void
+  logout: (() => void) | null
 }

 export const AppContext = createContext<AppContextProps>({
  checkingSession: false,
  loggedIn: false,
+  setLoggedIn: null,
  needsToUpdatePassword: false,
-  userId: '',
+  setNeedsToUpdatePassword: null,
+  userId: 0,
+  setUserId: null,
  username: '',
+  setUsername: null,
  displayName: '',
+  setDisplayName: null,
  isAdmin: false,
+  setIsAdmin: null,
  mode: ModeType.Server,
-  runTimes: []
+  runTimes: [],
+  logout: null
 })

 const AppContextProvider = (props: { children: ReactNode }) => {
@@ -57,7 +64,7 @@ const AppContextProvider = (props: { children: ReactNode }) => {
  const [checkingSession, setCheckingSession] = useState(false)
  const [loggedIn, setLoggedIn] = useState(false)
  const [needsToUpdatePassword, setNeedsToUpdatePassword] = useState(false)
-  const [userId, setUserId] = useState<string>()
+  const [userId, setUserId] = useState(0)
  const [username, setUsername] = useState('')
  const [displayName, setDisplayName] = useState('')
  const [isAdmin, setIsAdmin] = useState(false)
@@ -72,7 +79,7 @@ const AppContextProvider = (props: { children: ReactNode }) => {
      .then((res) => res.data)
      .then((data: any) => {
        setCheckingSession(false)
-        setUserId(data.uid)
+        setUserId(data.id)
        setUsername(data.username)
        setDisplayName(data.displayName)
        setIsAdmin(data.isAdmin)
@@ -6,13 +6,13 @@ export const findExistingPermission = (
 ) => {
  for (const permission of existingPermissions) {
    if (
-      permission.user?.uid === newPermission.principalId &&
+      permission.user?.id === newPermission.principalId &&
      hasSameCombination(permission, newPermission)
    )
      return permission

    if (
-      permission.group?.uid === newPermission.principalId &&
+      permission.group?.groupId === newPermission.principalId &&
      hasSameCombination(permission, newPermission)
    )
      return permission
@@ -27,13 +27,13 @@ export const findUpdatingPermission = (
 ) => {
  for (const permission of existingPermissions) {
    if (
-      permission.user?.uid === newPermission.principalId &&
+      permission.user?.id === newPermission.principalId &&
      hasDifferentSetting(permission, newPermission)
    )
      return permission

    if (
-      permission.group?.uid === newPermission.principalId &&
+      permission.group?.groupId === newPermission.principalId &&
      hasDifferentSetting(permission, newPermission)
    )
      return permission
@@ -1,12 +1,12 @@
 export interface UserResponse {
-  uid: string
+  id: number
  username: string
  displayName: string
  isAdmin: boolean
 }

 export interface GroupResponse {
-  uid: string
+  groupId: number
  name: string
  description: string
 }
@@ -17,7 +17,7 @@ export interface GroupDetailsResponse extends GroupResponse {
 }

 export interface PermissionResponse {
-  uid: string
+  permissionId: number
  path: string
  type: string
  setting: string
@@ -30,7 +30,7 @@ export interface RegisterPermissionPayload {
  type: string
  setting: string
  principalType: string
-  principalId: string
+  principalId: number
 }

 export interface TreeNode {
Author	SHA1	Message	Date
Trevor Moody	2f5421600e	build: axios package dependency changes. Missing type added in Group.ts	2025-09-16 15:01:11 +01:00
Trevor Moody	1c4f5fc421	build: updated axios and jsonwebtoken versions	2025-09-16 11:52:06 +01:00