Merge branch 'master' into files-notes

User refresh token

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Accounts/Dockerfile .
+          command: sudo docker build --no-cache -f ./Accounts/Dockerfile .
 
   docker-build-isolated-vm:
     runs-on: ubuntu-latest
@@ -54,7 +54,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./IsolatedVM/Dockerfile .
+          command: sudo docker build --no-cache -f ./IsolatedVM/Dockerfile .
 
   docker-build-home:
     runs-on: ubuntu-latest
@@ -77,7 +77,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Home/Dockerfile .
+          command: sudo docker build --no-cache -f ./Home/Dockerfile .
 
   docker-build-worker:
     runs-on: ubuntu-latest
@@ -100,7 +100,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Worker/Dockerfile .
+          command: sudo docker build --no-cache -f ./Worker/Dockerfile .
 
   docker-build-workflow:
     runs-on: ubuntu-latest
@@ -123,7 +123,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Workflow/Dockerfile .
+          command: sudo docker build --no-cache -f ./Workflow/Dockerfile .
 
   docker-build-api-reference:
     runs-on: ubuntu-latest
@@ -146,7 +146,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./APIReference/Dockerfile .
+          command: sudo docker build --no-cache -f ./APIReference/Dockerfile .
 
   docker-build-docs:
     runs-on: ubuntu-latest
@@ -169,7 +169,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Docs/Dockerfile .
+          command: sudo docker build --no-cache -f ./Docs/Dockerfile .
 
 
   docker-build-otel-collector:
@@ -193,7 +193,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./OTelCollector/Dockerfile .
+          command: sudo docker build --no-cache -f ./OTelCollector/Dockerfile .
 
   docker-build-app:
     runs-on: ubuntu-latest
@@ -217,7 +217,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./App/Dockerfile .
+          command: sudo docker build --no-cache -f ./App/Dockerfile .
 
 
   docker-build-copilot:
@@ -241,7 +241,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Copilot/Dockerfile .
+          command: sudo docker build --no-cache -f ./Copilot/Dockerfile .
 
   docker-build-e2e:
     runs-on: ubuntu-latest
@@ -265,7 +265,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./E2E/Dockerfile .
+          command: sudo docker build --no-cache -f ./E2E/Dockerfile .
 
   docker-build-admin-dashboard:
     runs-on: ubuntu-latest
@@ -288,7 +288,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./AdminDashboard/Dockerfile .
+          command: sudo docker build --no-cache -f ./AdminDashboard/Dockerfile .
 
   docker-build-dashboard:
     runs-on: ubuntu-latest
@@ -311,7 +311,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Dashboard/Dockerfile .
+          command: sudo docker build --no-cache -f ./Dashboard/Dockerfile .
 
   docker-build-probe:
     runs-on: ubuntu-latest
@@ -334,7 +334,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./Probe/Dockerfile .
+          command: sudo docker build --no-cache -f ./Probe/Dockerfile .
 
   docker-build-probe-ingest:
     runs-on: ubuntu-latest
@@ -357,7 +357,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./ProbeIngest/Dockerfile .
+          command: sudo docker build --no-cache -f ./ProbeIngest/Dockerfile .
 
   docker-build-server-monitor-ingest:
     runs-on: ubuntu-latest
@@ -380,9 +380,9 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./ServerMonitorIngest/Dockerfile .
+          command: sudo docker build --no-cache -f ./ServerMonitorIngest/Dockerfile .
 
-  docker-build-open-telemetry-ingest:
+  docker-build-telemetry:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -403,7 +403,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./OpenTelemetryIngest/Dockerfile .
+          command: sudo docker build --no-cache -f ./Telemetry/Dockerfile .
 
   docker-build-incoming-request-ingest:
     runs-on: ubuntu-latest
@@ -426,30 +426,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./IncomingRequestIngest/Dockerfile .
-
-  docker-build-fluent-ingest:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-      
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-        
-      # build image probe api
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build -f ./FluentIngest/Dockerfile .
+          command: sudo docker build --no-cache -f ./IncomingRequestIngest/Dockerfile .
 
   docker-build-status-page:
     runs-on: ubuntu-latest
@@ -472,7 +449,7 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./StatusPage/Dockerfile .
+          command: sudo docker build --no-cache -f ./StatusPage/Dockerfile .
 
   docker-build-test-server:
     runs-on: ubuntu-latest
@@ -495,4 +472,4 @@ jobs:
         with:
           timeout_minutes: 45
           max_attempts: 3
-          command: sudo docker build -f ./TestServer/Dockerfile .
+          command: sudo docker build --no-cache -f ./TestServer/Dockerfile .

.github/workflows/compile.yml

@@ -319,7 +319,7 @@ jobs:
           max_attempts: 3
           command: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check
 
-  compile-open-telemetry-ingest:
+  compile-telemetry:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -329,12 +329,12 @@ jobs:
         with:
           node-version: latest
       - run: cd Common && npm install
-      - name: Compile Open Telemetry Ingest
+      - name: Compile Telemetry
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd OpenTelemetryIngest && npm install && npm run compile && npm run dep-check
+          command: cd Telemetry && npm install && npm run compile && npm run dep-check
 
 
   compile-incoming-request-ingest: 
@@ -354,24 +354,6 @@ jobs:
           max_attempts: 3
           command: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check
 
-  compile-fluent-ingest:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-      - run: cd Common && npm install
-      - name: Compile Fluent Ingest
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd FluentIngest && npm install && npm run compile && npm run dep-check
-  
-
   compile-status-page:
     runs-on: ubuntu-latest
     env:

.github/workflows/npm-audit-fix.yml

@@ -0,0 +1,49 @@
+name: NPM Audit Fix
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  npm-audit-fix:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Run npm audit fix across packages
+        run: npm run audit-fix
+
+      - name: Detect changes
+        id: changes
+        run: |
+          if git status --porcelain | grep .; then
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create pull request
+        if: steps.changes.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: "chore: npm audit fix"
+          title: "chore: npm audit fix"
+          body: |
+            Automated npm audit fix run.
+            Workflow: ${{ github.workflow }}
+            Run ID: ${{ github.run_id }}
+          branch: chore/npm-audit-fix
+          delete-branch: true

.github/workflows/test.fluent-ingest.yaml

@@ -1,20 +0,0 @@
-name: Fluent Ingest Test
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-      - run: cd FluentIngest && npm install && npm run test

.github/workflows/test.telemetry.yaml

@@ -1,4 +1,4 @@
-name: OpenTelemetryIngest Test
+name: Telemetry Test
 
 on:
   pull_request: 
@@ -17,5 +17,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: latest
-      - run: cd OpenTelemetryIngest && npm install && npm run test
+      - run: cd Common && npm install
+      - run: cd Telemetry && npm install && npm run test
   

.vscode/launch.json

@@ -205,8 +205,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/OpenTelemetryIngest",
-            "name": "OpenTelemetryIngest: Debug with Docker",
+            "localRoot": "${workspaceFolder}/Telemetry",
+            "name": "Telemetry: Debug with Docker",
             "port": 9938,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -217,20 +217,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/FluentIngest",
-            "name": "Fluent Ingest: Debug with Docker",
-            "port": 9937,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/IsolatedVM",

APIReference/Dockerfile.tpl

@@ -14,9 +14,12 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
 # IF APP_VERSION is not set, set it to 1.0.0

APIReference/package-lock.json

@@ -31,7 +31,7 @@
         "@elastic/elasticsearch": "^8.12.1",
         "@monaco-editor/react": "^4.4.6",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/api-logs": "^0.52.1",
+        "@opentelemetry/api-logs": "^0.206.0",
         "@opentelemetry/context-zone": "^1.25.1",
         "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
         "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
@@ -49,7 +49,9 @@
         "@opentelemetry/sdk-trace-web": "^1.25.1",
         "@opentelemetry/semantic-conventions": "^1.26.0",
         "@remixicon/react": "^4.2.0",
+        "@simplewebauthn/server": "^13.2.2",
         "@tippyjs/react": "^4.2.6",
+        "@types/archiver": "^6.0.3",
         "@types/crypto-js": "^4.2.2",
         "@types/qrcode": "^1.5.5",
         "@types/react-highlight": "^0.12.8",
@@ -58,8 +60,10 @@
         "@types/web-push": "^3.6.4",
         "acme-client": "^5.3.0",
         "airtable": "^0.12.2",
-        "axios": "^1.7.2",
-        "bullmq": "^5.3.3",
+        "archiver": "^7.0.1",
+        "axios": "^1.12.0",
+        "botbuilder": "^4.23.3",
+        "bullmq": "^5.61.0",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "cron-parser": "^4.8.1",
@@ -80,11 +84,11 @@
         "moment": "^2.30.1",
         "moment-timezone": "^0.5.45",
         "node-cron": "^3.0.3",
-        "nodemailer": "^6.9.10",
+        "nodemailer": "^7.0.7",
         "otpauth": "^9.3.1",
         "pg": "^8.7.3",
-        "playwright": "^1.50.0",
-        "posthog-js": "^1.139.6",
+        "playwright": "^1.56.0",
+        "posthog-js": "^1.275.3",
         "prop-types": "^15.8.1",
         "qrcode": "^1.5.3",
         "react": "^18.3.1",
@@ -99,7 +103,7 @@
         "react-router-dom": "^6.24.1",
         "react-select": "^5.4.0",
         "react-spinners": "^0.14.1",
-        "react-syntax-highlighter": "^15.5.0",
+        "react-syntax-highlighter": "^16.0.0",
         "react-toggle": "^4.1.3",
         "reactflow": "^11.11.4",
         "recharts": "^2.12.7",
@@ -114,13 +118,13 @@
         "tailwind-merge": "^2.5.2",
         "tippy.js": "^6.3.7",
         "twilio": "^4.22.0",
-        "typeorm": "^0.3.20",
+        "typeorm": "^0.3.26",
         "typeorm-extension": "^2.2.13",
         "universal-cookie": "^7.2.1",
         "use-async-effect": "^2.2.6",
         "uuid": "^8.3.2",
         "web-push": "^3.6.7",
-        "zod": "^3.25.30"
+        "zod": "^3.25.76"
       },
       "devDependencies": {
         "@faker-js/faker": "^8.0.2",
@@ -243,89 +247,20 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -501,19 +436,21 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -528,109 +465,28 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
-      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
-        "@babel/types": "^7.23.6"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.5"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -801,14 +657,15 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -836,14 +693,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1760,21 +1617,23 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -2004,10 +1863,11 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2076,9 +1936,10 @@
       }
     },
     "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -2225,9 +2086,10 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -2244,10 +2106,11 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2542,6 +2405,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3239,7 +3103,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
@@ -3398,12 +3263,13 @@
       "dev": true
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -3684,10 +3550,11 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -4107,20 +3974,12 @@
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },

APIReference/views/main/pagination.ejs

@@ -108,7 +108,7 @@
          </div>
          </div>
          <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-            <%- include('../partials/code', {title: "Example Pagination Request", requestUrl: "/api/monitors/get-list?skip=0&limit=3", requestType: "GET", code: pageData.requestCode }) -%>
+            <%- include('../partials/code', {title: "Example Pagination Request", requestUrl: "/api/monitors/get-list?skip=0&limit=3", requestType: "POST", code: pageData.requestCode }) -%>
             <%- include('../partials/code', {title: "Example Pagination Response" , requestUrl: "", requestType: "", code: pageData.responseCode }) -%>
          </div>
       </div>

Accounts/Dockerfile.tpl

@@ -14,9 +14,12 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
 # IF APP_VERSION is not set, set it to 1.0.0

Accounts/package-lock.json

@@ -12,7 +12,7 @@
                 "ejs": "^3.1.10",
                 "react": "^18.3.1",
                 "react-dom": "^18.3.1",
-                "react-router-dom": "^6.23.1",
+                "react-router-dom": "^6.30.1",
                 "use-async-effect": "^2.2.7"
             },
             "devDependencies": {
@@ -35,7 +35,7 @@
                 "@elastic/elasticsearch": "^8.12.1",
                 "@monaco-editor/react": "^4.4.6",
                 "@opentelemetry/api": "^1.9.0",
-                "@opentelemetry/api-logs": "^0.52.1",
+                "@opentelemetry/api-logs": "^0.206.0",
                 "@opentelemetry/context-zone": "^1.25.1",
                 "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
                 "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
@@ -53,7 +53,9 @@
                 "@opentelemetry/sdk-trace-web": "^1.25.1",
                 "@opentelemetry/semantic-conventions": "^1.26.0",
                 "@remixicon/react": "^4.2.0",
+                "@simplewebauthn/server": "^13.2.2",
                 "@tippyjs/react": "^4.2.6",
+                "@types/archiver": "^6.0.3",
                 "@types/crypto-js": "^4.2.2",
                 "@types/qrcode": "^1.5.5",
                 "@types/react-highlight": "^0.12.8",
@@ -62,8 +64,10 @@
                 "@types/web-push": "^3.6.4",
                 "acme-client": "^5.3.0",
                 "airtable": "^0.12.2",
-                "axios": "^1.7.2",
-                "bullmq": "^5.3.3",
+                "archiver": "^7.0.1",
+                "axios": "^1.12.0",
+                "botbuilder": "^4.23.3",
+                "bullmq": "^5.61.0",
                 "cookie-parser": "^1.4.7",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
@@ -84,11 +88,11 @@
                 "moment": "^2.30.1",
                 "moment-timezone": "^0.5.45",
                 "node-cron": "^3.0.3",
-                "nodemailer": "^6.9.10",
+                "nodemailer": "^7.0.7",
                 "otpauth": "^9.3.1",
                 "pg": "^8.7.3",
-                "playwright": "^1.50.0",
-                "posthog-js": "^1.139.6",
+                "playwright": "^1.56.0",
+                "posthog-js": "^1.275.3",
                 "prop-types": "^15.8.1",
                 "qrcode": "^1.5.3",
                 "react": "^18.3.1",
@@ -103,7 +107,7 @@
                 "react-router-dom": "^6.24.1",
                 "react-select": "^5.4.0",
                 "react-spinners": "^0.14.1",
-                "react-syntax-highlighter": "^15.5.0",
+                "react-syntax-highlighter": "^16.0.0",
                 "react-toggle": "^4.1.3",
                 "reactflow": "^11.11.4",
                 "recharts": "^2.12.7",
@@ -118,13 +122,13 @@
                 "tailwind-merge": "^2.5.2",
                 "tippy.js": "^6.3.7",
                 "twilio": "^4.22.0",
-                "typeorm": "^0.3.20",
+                "typeorm": "^0.3.26",
                 "typeorm-extension": "^2.2.13",
                 "universal-cookie": "^7.2.1",
                 "use-async-effect": "^2.2.6",
                 "uuid": "^8.3.2",
                 "web-push": "^3.6.7",
-                "zod": "^3.25.30"
+                "zod": "^3.25.76"
             },
             "devDependencies": {
                 "@faker-js/faker": "^8.0.2",
@@ -344,9 +348,9 @@
             }
         },
         "node_modules/@remix-run/router": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
-            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+            "version": "1.23.0",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
+            "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
@@ -522,21 +526,23 @@
             }
         },
         "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -683,9 +689,9 @@
             }
         },
         "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
@@ -704,10 +710,11 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -794,6 +801,7 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -958,12 +966,12 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.23.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
-            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+            "version": "6.30.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
+            "integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.16.1"
+                "@remix-run/router": "1.23.0"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -973,13 +981,13 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.23.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
-            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
+            "version": "6.30.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
+            "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.16.1",
-                "react-router": "6.23.1"
+                "@remix-run/router": "1.23.0",
+                "react-router": "6.30.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -1009,6 +1017,16 @@
                 "loose-envify": "^1.1.0"
             }
         },
+        "node_modules/semver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
         "node_modules/simple-update-notifier": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
@@ -1021,15 +1039,6 @@
                 "node": ">=8.10.0"
             }
         },
-        "node_modules/simple-update-notifier/node_modules/semver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
         "node_modules/supports-color": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1047,6 +1056,7 @@
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
             },

Accounts/package.json

@@ -33,7 +33,7 @@
         "ejs": "^3.1.10",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-router-dom": "^6.23.1",
+        "react-router-dom": "^6.30.1",
         "use-async-effect": "^2.2.7"
     },
     "devDependencies": {

Accounts/src/Pages/Login.tsx

@@ -12,6 +12,7 @@ import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchem
 import Link from "Common/UI/Components/Link/Link";
 import { DASHBOARD_URL } from "Common/UI/Config";
 import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import EditionLabel from "Common/UI/Components/EditionLabel/EditionLabel";
 import UiAnalytics from "Common/UI/Utils/Analytics";
 import LoginUtil from "Common/UI/Utils/Login";
 import UserTotpAuth from "Common/Models/DatabaseModels/UserTotpAuth";
@@ -192,6 +193,9 @@ const LoginPage: () => JSX.Element = () => {
           src={OneUptimeLogo}
           alt="OneUptime"
         />
+        <div className="mt-4 flex justify-center">
+          <EditionLabel />
+        </div>
         {!showTwoFactorAuth && (
           <>
             <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">

AdminDashboard/Dockerfile.tpl

@@ -14,9 +14,12 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
 # IF APP_VERSION is not set, set it to 1.0.0

AdminDashboard/Serve.ts

@@ -1,13 +1,74 @@
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import Express, { ExpressApplication } from "Common/Server/Utils/Express";
+import Express, {
+  ExpressApplication,
+  ExpressRequest,
+  ExpressResponse,
+} from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import App from "Common/Server/Utils/StartServer";
+import Response from "Common/Server/Utils/Response";
+import UserMiddleware from "Common/Server/Middleware/UserAuthorization";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
+import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException";
+import { JSONObject } from "Common/Types/JSON";
 import "ejs";
+import JSONWebTokenData from "Common/Types/JsonWebTokenData";
 
 export const APP_NAME: string = "admin";
 
 const app: ExpressApplication = Express.getExpressApp();
 
+type EnsureMasterAdminAccessFunction = (
+  req: ExpressRequest,
+  res: ExpressResponse,
+) => Promise<JSONObject>;
+
+const ensureMasterAdminAccess: EnsureMasterAdminAccessFunction = async (
+  req: ExpressRequest,
+  res: ExpressResponse,
+): Promise<JSONObject> => {
+  try {
+    const accessToken: string | undefined =
+      UserMiddleware.getAccessTokenFromExpressRequest(req);
+
+    if (!accessToken) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        new NotAuthorizedException(
+          "Unauthorized: Only master admins can access the admin dashboard.",
+        ),
+      );
+      return {};
+    }
+
+    const authData: JSONWebTokenData = JSONWebToken.decode(accessToken);
+
+    if (!authData.isMasterAdmin) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        new NotAuthorizedException(
+          "Unauthorized: Only master admins can access the admin dashboard.",
+        ),
+      );
+      return {};
+    }
+
+    return {};
+  } catch (error) {
+    logger.error(error);
+    Response.sendErrorResponse(
+      req,
+      res,
+      new NotAuthorizedException(
+        "Unauthorized: Only master admins can access the admin dashboard.",
+      ),
+    );
+    return {};
+  }
+};
+
 const init: PromiseVoidFunction = async (): Promise<void> => {
   try {
     // init the app
@@ -19,6 +80,7 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
         liveCheck: async () => {},
         readyCheck: async () => {},
       },
+      getVariablesToRenderIndexPage: ensureMasterAdminAccess,
     });
 
     // add default routes

AdminDashboard/package-lock.json

@@ -12,7 +12,7 @@
                 "ejs": "^3.1.10",
                 "react": "^18.3.1",
                 "react-dom": "^18.3.1",
-                "react-router-dom": "^6.23.1"
+                "react-router-dom": "^6.30.1"
             },
             "devDependencies": {
                 "@types/node": "^16.11.35",
@@ -34,7 +34,7 @@
                 "@elastic/elasticsearch": "^8.12.1",
                 "@monaco-editor/react": "^4.4.6",
                 "@opentelemetry/api": "^1.9.0",
-                "@opentelemetry/api-logs": "^0.52.1",
+                "@opentelemetry/api-logs": "^0.206.0",
                 "@opentelemetry/context-zone": "^1.25.1",
                 "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
                 "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
@@ -52,7 +52,9 @@
                 "@opentelemetry/sdk-trace-web": "^1.25.1",
                 "@opentelemetry/semantic-conventions": "^1.26.0",
                 "@remixicon/react": "^4.2.0",
+                "@simplewebauthn/server": "^13.2.2",
                 "@tippyjs/react": "^4.2.6",
+                "@types/archiver": "^6.0.3",
                 "@types/crypto-js": "^4.2.2",
                 "@types/qrcode": "^1.5.5",
                 "@types/react-highlight": "^0.12.8",
@@ -61,8 +63,10 @@
                 "@types/web-push": "^3.6.4",
                 "acme-client": "^5.3.0",
                 "airtable": "^0.12.2",
-                "axios": "^1.7.2",
-                "bullmq": "^5.3.3",
+                "archiver": "^7.0.1",
+                "axios": "^1.12.0",
+                "botbuilder": "^4.23.3",
+                "bullmq": "^5.61.0",
                 "cookie-parser": "^1.4.7",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
@@ -83,11 +87,11 @@
                 "moment": "^2.30.1",
                 "moment-timezone": "^0.5.45",
                 "node-cron": "^3.0.3",
-                "nodemailer": "^6.9.10",
+                "nodemailer": "^7.0.7",
                 "otpauth": "^9.3.1",
                 "pg": "^8.7.3",
-                "playwright": "^1.50.0",
-                "posthog-js": "^1.139.6",
+                "playwright": "^1.56.0",
+                "posthog-js": "^1.275.3",
                 "prop-types": "^15.8.1",
                 "qrcode": "^1.5.3",
                 "react": "^18.3.1",
@@ -102,7 +106,7 @@
                 "react-router-dom": "^6.24.1",
                 "react-select": "^5.4.0",
                 "react-spinners": "^0.14.1",
-                "react-syntax-highlighter": "^15.5.0",
+                "react-syntax-highlighter": "^16.0.0",
                 "react-toggle": "^4.1.3",
                 "reactflow": "^11.11.4",
                 "recharts": "^2.12.7",
@@ -117,13 +121,13 @@
                 "tailwind-merge": "^2.5.2",
                 "tippy.js": "^6.3.7",
                 "twilio": "^4.22.0",
-                "typeorm": "^0.3.20",
+                "typeorm": "^0.3.26",
                 "typeorm-extension": "^2.2.13",
                 "universal-cookie": "^7.2.1",
                 "use-async-effect": "^2.2.6",
                 "uuid": "^8.3.2",
                 "web-push": "^3.6.7",
-                "zod": "^3.25.30"
+                "zod": "^3.25.76"
             },
             "devDependencies": {
                 "@faker-js/faker": "^8.0.2",
@@ -343,9 +347,9 @@
             "dev": true
         },
         "node_modules/@remix-run/router": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
-            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+            "version": "1.23.0",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
+            "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
@@ -491,21 +495,23 @@
             }
         },
         "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -601,9 +607,10 @@
             }
         },
         "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
             }
@@ -620,10 +627,11 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -710,6 +718,7 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -937,12 +946,12 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.23.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
-            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+            "version": "6.30.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
+            "integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.16.1"
+                "@remix-run/router": "1.23.0"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -952,13 +961,13 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.23.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
-            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
+            "version": "6.30.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
+            "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.16.1",
-                "react-router": "6.23.1"
+                "@remix-run/router": "1.23.0",
+                "react-router": "6.30.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -988,6 +997,16 @@
                 "loose-envify": "^1.1.0"
             }
         },
+        "node_modules/semver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
         "node_modules/simple-update-notifier": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
@@ -1000,15 +1019,6 @@
                 "node": ">=8.10.0"
             }
         },
-        "node_modules/simple-update-notifier/node_modules/semver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
         "node_modules/supports-color": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1026,6 +1036,7 @@
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
             },

AdminDashboard/package.json

@@ -8,7 +8,7 @@
         "ejs": "^3.1.10",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-router-dom": "^6.23.1"
+        "react-router-dom": "^6.30.1"
     },
     "scripts": {
         "dev-build": "NODE_ENV=development node esbuild.config.js",

AdminDashboard/src/App.tsx

@@ -5,6 +5,7 @@ import Projects from "./Pages/Projects/Index";
 import SettingsAPIKey from "./Pages/Settings/APIKey/Index";
 import SettingsAuthentication from "./Pages/Settings/Authentication/Index";
 import SettingsCallSMS from "./Pages/Settings/CallSMS/Index";
+import SettingsWhatsApp from "./Pages/Settings/WhatsApp/Index";
 // Settings Pages.
 import SettingsEmail from "./Pages/Settings/Email/Index";
 import SettingsProbes from "./Pages/Settings/Probes/Index";
@@ -25,6 +26,7 @@ import {
 } from "react-router-dom";
 import UserView from "./Pages/Users/View/Index";
 import UserDelete from "./Pages/Users/View/Delete";
+import UserSettings from "./Pages/Users/View/Settings";
 import ProjectView from "./Pages/Projects/View/Index";
 import ProjectDelete from "./Pages/Projects/View/Delete";
 
@@ -70,6 +72,11 @@ const App: () => JSX.Element = () => {
           element={<UserView />}
         />
 
+        <PageRoute
+          path={RouteMap[PageMap.USER_SETTINGS]?.toString() || ""}
+          element={<UserSettings />}
+        />
+
         <PageRoute
           path={RouteMap[PageMap.USER_DELETE]?.toString() || ""}
           element={<UserDelete />}
@@ -105,6 +112,11 @@ const App: () => JSX.Element = () => {
           element={<SettingsCallSMS />}
         />
 
+        <PageRoute
+          path={RouteMap[PageMap.SETTINGS_WHATSAPP]?.toString() || ""}
+          element={<SettingsWhatsApp />}
+        />
+
         <PageRoute
           path={RouteMap[PageMap.SETTINGS_PROBES]?.toString() || ""}
           element={<SettingsProbes />}

AdminDashboard/src/Components/Header/Header.tsx

@@ -3,6 +3,7 @@ import Logo from "./Logo";
 import UserProfile from "./UserProfile";
 import Button, { ButtonStyleType } from "Common/UI/Components/Button/Button";
 import Header from "Common/UI/Components/Header/Header";
+import EditionLabel from "Common/UI/Components/EditionLabel/EditionLabel";
 import { DASHBOARD_URL } from "Common/UI/Config";
 import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
@@ -27,6 +28,7 @@ const DashboardHeader: FunctionComponent = (): ReactElement => {
         }
         rightComponents={
           <>
+            <EditionLabel className="mr-3 hidden md:inline-flex" />
             <Button
               title="Exit Admin"
               buttonStyle={ButtonStyleType.NORMAL}

AdminDashboard/src/Pages/Settings/SideMenu.tsx

@@ -50,6 +50,15 @@ const DashboardSideMenu: () => JSX.Element = (): ReactElement => {
           }}
           icon={IconProp.Call}
         />
+        <SideMenuItem
+          link={{
+            title: "WhatsApp",
+            to: RouteUtil.populateRouteParams(
+              RouteMap[PageMap.SETTINGS_WHATSAPP] as Route,
+            ),
+          }}
+          icon={IconProp.WhatsApp}
+        />
       </SideMenuSection>
 
       <SideMenuSection title="Monitoring">

AdminDashboard/src/Pages/Settings/WhatsApp/Index.tsx

@@ -0,0 +1,491 @@
+import PageMap from "../../../Utils/PageMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
+import DashboardSideMenu from "../SideMenu";
+import Route from "Common/Types/API/Route";
+import ObjectID from "Common/Types/ObjectID";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import Page from "Common/UI/Components/Page/Page";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
+import React, { FunctionComponent, ReactElement, useState } from "react";
+import Card from "Common/UI/Components/Card/Card";
+import MarkdownViewer from "Common/UI/Components/Markdown.tsx/MarkdownViewer";
+import BasicForm from "Common/UI/Components/Forms/BasicForm";
+import Alert, { AlertType } from "Common/UI/Components/Alerts/Alert";
+import { JSONObject } from "Common/Types/JSON";
+import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
+import HTTPResponse from "Common/Types/API/HTTPResponse";
+import URL from "Common/Types/API/URL";
+import API from "Common/UI/Utils/API/API";
+import { APP_API_URL } from "Common/UI/Config";
+import WhatsAppTemplateMessages, {
+  WhatsAppTemplateId,
+  WhatsAppTemplateIds,
+  WhatsAppTemplateLanguage,
+} from "Common/Types/WhatsApp/WhatsAppTemplates";
+
+type ToFriendlyName = (value: string) => string;
+
+const toFriendlyName: ToFriendlyName = (value: string): string => {
+  return value
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .replace(/_/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
+};
+
+type ExtractTemplateVariables = (template: string) => Array<string>;
+
+const extractTemplateVariables: ExtractTemplateVariables = (
+  template: string,
+): Array<string> => {
+  const matches: RegExpMatchArray | null = template.match(/\{\{(.*?)\}\}/g);
+
+  if (!matches) {
+    return [];
+  }
+
+  const uniqueVariables: Set<string> = new Set<string>();
+
+  for (const match of matches) {
+    const variable: string = match.replace("{{", "").replace("}}", "").trim();
+
+    if (variable) {
+      uniqueVariables.add(variable);
+    }
+  }
+
+  return Array.from(uniqueVariables).sort((a: string, b: string) => {
+    return a.localeCompare(b);
+  });
+};
+
+type BuildWhatsAppSetupMarkdown = () => string;
+
+const buildWhatsAppSetupMarkdown: BuildWhatsAppSetupMarkdown = (): string => {
+  const templateKeys: Array<keyof typeof WhatsAppTemplateIds> = Object.keys(
+    WhatsAppTemplateIds,
+  ) as Array<keyof typeof WhatsAppTemplateIds>;
+
+  const appApiBaseUrl: string = APP_API_URL.toString().replace(/\/$/, "");
+  const primaryWebhookUrl: string = `${appApiBaseUrl}/notification/whatsapp/webhook`;
+
+  const description: string =
+    "Follow these steps to connect Meta WhatsApp with OneUptime so notifications can be delivered via WhatsApp.";
+
+  const prerequisitesList: Array<string> = [
+    "Meta Business Manager admin access for the WhatsApp Business Account.",
+    "A WhatsApp Business phone number approved for API messaging.",
+    "Admin access to OneUptime with permission to edit global notification settings.",
+    "A webhook verify token string that you'll configure identically in Meta and OneUptime.",
+  ];
+
+  const setupStepsList: Array<string> = [
+    "Sign in to the [Meta Business Manager](https://business.facebook.com/) with admin access to your WhatsApp Business Account.",
+    "From **Business Settings → Accounts → WhatsApp Accounts**, create or select the account that owns your sender phone number.",
+    "In Buisness Portfolio, create a system user and assign it to the WhatsApp Business Account with the role of **Admin**.",
+    "Generate a token for this system user and this will be your long-lived access token. Make sure to select the **whatsapp_business_management** and **whatsapp_business_messaging** permissions when generating the token.",
+    "Paste the access token, phone number ID, and webhook verify token into the **Meta WhatsApp Settings** card above, then save.",
+    "For the **Business Account ID**, go to **Business Settings → Business Info** (or **Business Settings → WhatsApp Accounts → Settings**) and copy the **WhatsApp Business Account ID** value.",
+    "To locate the **App ID** and **App Secret**, open [Meta for Developers](https://developers.facebook.com/apps/), select your WhatsApp app, then navigate to **Settings → Basic**. The App ID is shown at the top; click **Show** next to **App Secret** to reveal and copy it.",
+    "Create each template listed below in the Meta WhatsApp Manager. Make sure the template name, language, and variables match exactly. You can however change the content to your preference. Please make sure it's approved by Meta.",
+    "Send a test notification from OneUptime to confirm that WhatsApp delivery succeeds.",
+  ];
+
+  const prerequisitesMarkdown: string = prerequisitesList
+    .map((item: string) => {
+      return `- ${item}`;
+    })
+    .join("\n");
+
+  const setupStepsMarkdown: string = setupStepsList
+    .map((item: string, index: number) => {
+      return `${index + 1}. ${item}`;
+    })
+    .join("\n");
+
+  const tableRows: string = templateKeys
+    .map((enumKey: keyof typeof WhatsAppTemplateIds) => {
+      const templateId: WhatsAppTemplateId = WhatsAppTemplateIds[enumKey];
+      const friendlyName: string = toFriendlyName(enumKey.toString());
+      const templateMessage: string = WhatsAppTemplateMessages[templateId];
+      const language: string = WhatsAppTemplateLanguage[templateId] || "en";
+      const variables: Array<string> =
+        extractTemplateVariables(templateMessage);
+      const variableList: string =
+        variables.length > 0
+          ? variables
+              .map((variable: string) => {
+                return `\`${variable}\``;
+              })
+              .join(", ")
+          : "_None_";
+
+      return `| ${friendlyName} | \`${templateId}\` | ${language} | ${variableList} |`;
+    })
+    .join("\n");
+
+  const templateBodies: string = templateKeys
+    .map((enumKey: keyof typeof WhatsAppTemplateIds) => {
+      const templateId: WhatsAppTemplateId = WhatsAppTemplateIds[enumKey];
+      const friendlyName: string = toFriendlyName(enumKey.toString());
+      const templateMessage: string = WhatsAppTemplateMessages[templateId];
+      const language: string = WhatsAppTemplateLanguage[templateId] || "en";
+      const variables: Array<string> =
+        extractTemplateVariables(templateMessage);
+      const variableMarkdown: string =
+        variables.length > 0
+          ? variables
+              .map((variable: string) => {
+                return `- \`${variable}\``;
+              })
+              .join("\n")
+          : "_None_";
+      const variablesHeading: string = variables.length
+        ? `**Variables (${variables.length})**`
+        : "**Variables**";
+
+      return [
+        `#### ${friendlyName}`,
+        "",
+        `**Template Name:** \`${templateId}\``,
+        `**Language:** ${language}`,
+        "",
+        variablesHeading,
+        variableMarkdown,
+        "",
+        "**Body**",
+        "```plaintext",
+        templateMessage,
+        "```",
+        "",
+        "---",
+      ].join("\n");
+    })
+    .join("\n\n");
+
+  const templateSummaryTable: string = [
+    "| Friendly Name | Template Name | Language | Variables |",
+    "| --- | --- | --- | --- |",
+    tableRows,
+  ]
+    .filter(Boolean)
+    .join("\n");
+
+  const webhookSection: string = [
+    "### Configure Meta Webhook Subscription",
+    "1. In the OneUptime Admin Dashboard, open **Settings → WhatsApp → Meta WhatsApp Settings** and enter a strong value in **Webhook Verify Token**. Save the form so the encrypted token is stored in Global Config.",
+    "2. Keep that verify token handy—Meta does not generate one for you. You'll paste the exact same value when configuring the callback.",
+    "3. In [Meta for Developers](https://developers.facebook.com/apps/), select your WhatsApp app and navigate to **WhatsApp → Configuration → Webhooks**.",
+    `4. Click **Configure**, then supply one of the following callback URLs when Meta asks for your endpoint:\n   - \`${primaryWebhookUrl}\`\n `,
+    "5. Paste the verify token from step 1 into Meta's **Verify Token** field and submit. Meta will call the callback URL and expect that value to match before it approves the subscription.",
+    "6. After verification succeeds, subscribe to the **messages** field (and any other WhatsApp webhook categories you need) so delivery status updates are forwarded to OneUptime.",
+  ]
+    .filter(Boolean)
+    .join("\n\n");
+
+  return [
+    description,
+    "### Prerequisites",
+    prerequisitesMarkdown,
+    "### Setup Steps",
+    setupStepsMarkdown,
+    webhookSection,
+    "### Required WhatsApp Templates",
+    templateSummaryTable,
+    "### Template Bodies",
+    "> Copy the exact template body below—including punctuation and spacing—when creating each template inside Meta. The variables list shows every placeholder that must be configured in WhatsApp Manager.",
+    templateBodies,
+  ]
+    .filter(Boolean)
+    .join("\n\n");
+};
+
+const whatsappSetupMarkdown: string = buildWhatsAppSetupMarkdown();
+
+const SettingsWhatsApp: FunctionComponent = (): ReactElement => {
+  const [isSendingTest, setIsSendingTest] = useState<boolean>(false);
+  const [testError, setTestError] = useState<string>("");
+  const [testSuccess, setTestSuccess] = useState<string>("");
+
+  return (
+    <Page
+      title={"Admin Settings"}
+      breadcrumbLinks={[
+        {
+          title: "Admin Dashboard",
+          to: RouteUtil.populateRouteParams(RouteMap[PageMap.HOME] as Route),
+        },
+        {
+          title: "Settings",
+          to: RouteUtil.populateRouteParams(
+            RouteMap[PageMap.SETTINGS] as Route,
+          ),
+        },
+        {
+          title: "WhatsApp",
+          to: RouteUtil.populateRouteParams(
+            RouteMap[PageMap.SETTINGS_WHATSAPP] as Route,
+          ),
+        },
+      ]}
+      sideMenu={<DashboardSideMenu />}
+    >
+      <CardModelDetail
+        name="Meta WhatsApp Settings"
+        cardProps={{
+          title: "Meta WhatsApp Settings",
+          description:
+            "Configure Meta WhatsApp credentials. These values are used to send WhatsApp notifications from OneUptime.",
+        }}
+        isEditable={true}
+        editButtonText="Edit Meta WhatsApp Config"
+        formSteps={[
+          {
+            title: "Credentials",
+            id: "meta-credentials",
+          },
+          {
+            title: "Meta App",
+            id: "meta-app",
+          },
+        ]}
+        formFields={[
+          {
+            field: {
+              metaWhatsAppAccessToken: true,
+            },
+            title: "Access Token",
+            stepId: "meta-credentials",
+            fieldType: FormFieldSchemaType.EncryptedText,
+            required: true,
+            description:
+              "Long-lived access token generated in the Meta WhatsApp Business Platform.",
+            placeholder: "EAAG...",
+          },
+          {
+            field: {
+              metaWhatsAppPhoneNumberId: true,
+            },
+            title: "Phone Number ID",
+            stepId: "meta-credentials",
+            fieldType: FormFieldSchemaType.Text,
+            required: true,
+            description:
+              "The WhatsApp Business phone number ID associated with your sending number.",
+            placeholder: "123456789012345",
+          },
+          {
+            field: {
+              metaWhatsAppBusinessAccountId: true,
+            },
+            title: "Business Account ID",
+            stepId: "meta-credentials",
+            fieldType: FormFieldSchemaType.Text,
+            required: false,
+            description:
+              "Optional Business Account ID that owns the WhatsApp templates.",
+            placeholder: "123456789012345",
+          },
+          {
+            field: {
+              metaWhatsAppWebhookVerifyToken: true,
+            },
+            title: "Webhook Verify Token",
+            stepId: "meta-credentials",
+            fieldType: FormFieldSchemaType.EncryptedText,
+            required: false,
+            description:
+              "Secret token configured in Meta to validate webhook subscription requests.",
+            placeholder: "Webhook verify token",
+          },
+          {
+            field: {
+              metaWhatsAppAppId: true,
+            },
+            title: "App ID",
+            stepId: "meta-app",
+            fieldType: FormFieldSchemaType.Text,
+            required: false,
+            description:
+              "Optional Facebook App ID tied to your WhatsApp integration.",
+            placeholder: "987654321098765",
+          },
+          {
+            field: {
+              metaWhatsAppAppSecret: true,
+            },
+            title: "App Secret",
+            stepId: "meta-app",
+            fieldType: FormFieldSchemaType.EncryptedText,
+            required: false,
+            description:
+              "Optional Facebook App Secret used for webhook signature verification.",
+            placeholder: "Facebook App Secret",
+          },
+        ]}
+        modelDetailProps={{
+          modelType: GlobalConfig,
+          id: "model-detail-global-config-meta-whatsapp",
+          fields: [
+            {
+              field: {
+                metaWhatsAppAccessToken: true,
+              },
+              title: "Access Token",
+              fieldType: FieldType.HiddenText,
+              placeholder: "Not Configured",
+            },
+            {
+              field: {
+                metaWhatsAppPhoneNumberId: true,
+              },
+              title: "Phone Number ID",
+              fieldType: FieldType.Text,
+              placeholder: "Not Configured",
+            },
+            {
+              field: {
+                metaWhatsAppBusinessAccountId: true,
+              },
+              title: "Business Account ID",
+              fieldType: FieldType.Text,
+              placeholder: "Not Configured",
+            },
+            {
+              field: {
+                metaWhatsAppWebhookVerifyToken: true,
+              },
+              title: "Webhook Verify Token",
+              fieldType: FieldType.HiddenText,
+              placeholder: "Not Configured",
+            },
+            {
+              field: {
+                metaWhatsAppAppId: true,
+              },
+              title: "App ID",
+              fieldType: FieldType.Text,
+              placeholder: "Not Configured",
+            },
+            {
+              field: {
+                metaWhatsAppAppSecret: true,
+              },
+              title: "App Secret",
+              fieldType: FieldType.HiddenText,
+              placeholder: "Not Configured",
+            },
+          ],
+          modelId: ObjectID.getZeroObjectID(),
+        }}
+      />
+
+      <Card
+        title="Send Test WhatsApp Message"
+        description="Send a test WhatsApp template message to confirm your Meta configuration."
+      >
+        {testSuccess ? (
+          <Alert
+            type={AlertType.SUCCESS}
+            title={testSuccess}
+            className="mb-4"
+          />
+        ) : (
+          <></>
+        )}
+
+        <BasicForm
+          id="send-test-whatsapp-form"
+          name="Send Test WhatsApp Message"
+          isLoading={isSendingTest}
+          error={testError || ""}
+          submitButtonText="Send Test Message"
+          maxPrimaryButtonWidth={true}
+          initialValues={{
+            phoneNumber: "",
+          }}
+          fields={[
+            {
+              field: {
+                phoneNumber: true,
+              },
+              title: "Recipient WhatsApp Number",
+              description:
+                "Enter the full international phone number (including country code) that should receive the test message.",
+              placeholder: "+11234567890",
+              required: true,
+              fieldType: FormFieldSchemaType.Phone,
+              disableSpellCheck: true,
+            },
+          ]}
+          onSubmit={async (
+            values: JSONObject,
+            onSubmitSuccessful?: () => void,
+          ) => {
+            const toPhone: string = String(values["phoneNumber"] || "").trim();
+
+            if (!toPhone) {
+              setTestSuccess("");
+              setTestError(
+                "Please enter a WhatsApp number before sending a test message.",
+              );
+              return;
+            }
+
+            setIsSendingTest(true);
+            setTestError("");
+            setTestSuccess("");
+
+            try {
+              const response: HTTPResponse<JSONObject> | HTTPErrorResponse =
+                await API.post({
+                  url: URL.fromString(APP_API_URL.toString()).addRoute(
+                    "/notification/whatsapp/test",
+                  ),
+                  data: {
+                    toPhone,
+                    templateKey: WhatsAppTemplateIds.TestNotification,
+                    templateLanguageCode:
+                      WhatsAppTemplateLanguage[
+                        WhatsAppTemplateIds.TestNotification
+                      ],
+                  },
+                });
+
+              if (response instanceof HTTPErrorResponse) {
+                throw response;
+              }
+
+              if (response.isFailure()) {
+                throw new Error("Failed to send test WhatsApp message.");
+              }
+
+              setTestSuccess(
+                "Test WhatsApp message sent successfully. Check the recipient device to confirm delivery.",
+              );
+
+              if (onSubmitSuccessful) {
+                onSubmitSuccessful();
+              }
+            } catch (err) {
+              setTestError(API.getFriendlyMessage(err));
+            } finally {
+              setIsSendingTest(false);
+            }
+          }}
+        />
+      </Card>
+
+      <Card
+        title="Meta WhatsApp Setup Guide"
+        description="Steps to connect Meta WhatsApp and the templates you must provision."
+      >
+        <MarkdownViewer text={whatsappSetupMarkdown} />
+      </Card>
+    </Page>
+  );
+};
+
+export default SettingsWhatsApp;

AdminDashboard/src/Pages/Users/View/Settings.tsx

@@ -0,0 +1,94 @@
+import PageMap from "../../../Utils/PageMap";
+import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
+import Route from "Common/Types/API/Route";
+import ObjectID from "Common/Types/ObjectID";
+import Navigation from "Common/UI/Utils/Navigation";
+import React, { FunctionComponent, ReactElement } from "react";
+import SideMenuComponent from "./SideMenu";
+import User from "Common/Models/DatabaseModels/User";
+import ModelPage from "Common/UI/Components/Page/ModelPage";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import FieldType from "Common/UI/Components/Types/FieldType";
+
+const UserSettings: FunctionComponent = (): ReactElement => {
+  const modelId: ObjectID = Navigation.getLastParamAsObjectID(1);
+
+  return (
+    <ModelPage<User>
+      modelId={modelId}
+      modelNameField="email"
+      modelType={User}
+      title={"User"}
+      breadcrumbLinks={[
+        {
+          title: "Admin Dashboard",
+          to: RouteUtil.populateRouteParams(RouteMap[PageMap.HOME] as Route),
+        },
+        {
+          title: "Users",
+          to: RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route),
+        },
+        {
+          title: "User",
+          to: RouteUtil.populateRouteParams(
+            RouteMap[PageMap.USER_VIEW] as Route,
+            {
+              modelId: modelId,
+            },
+          ),
+        },
+        {
+          title: "Settings",
+          to: RouteUtil.populateRouteParams(
+            RouteMap[PageMap.USER_SETTINGS] as Route,
+            {
+              modelId: modelId,
+            },
+          ),
+        },
+      ]}
+      sideMenu={<SideMenuComponent modelId={modelId} />}
+    >
+      <CardModelDetail<User>
+        name="user-master-admin-settings"
+        cardProps={{
+          title: "Master Admin Access",
+          description:
+            "Grant or revoke master admin access for this user. Master admins can manage every project and workspace.",
+        }}
+        isEditable={true}
+        editButtonText="Update Access"
+        formFields={[
+          {
+            field: {
+              isMasterAdmin: true,
+            },
+            title: "Master Admin",
+            description:
+              "Enable to give this user full access to the entire platform.",
+            fieldType: FormFieldSchemaType.Toggle,
+            required: true,
+          },
+        ]}
+        modelDetailProps={{
+          modelType: User,
+          id: "user-master-admin-settings-detail",
+          fields: [
+            {
+              field: {
+                isMasterAdmin: true,
+              },
+              title: "Master Admin",
+              fieldType: FieldType.Boolean,
+              placeholder: "No",
+            },
+          ],
+          modelId: modelId,
+        }}
+      />
+    </ModelPage>
+  );
+};
+
+export default UserSettings;

AdminDashboard/src/Pages/Users/View/SideMenu.tsx

@@ -30,6 +30,18 @@ const SideMenuComponent: FunctionComponent<SideMenuProps> = (
           }}
           icon={IconProp.Info}
         />
+        <SideMenuItem
+          link={{
+            title: "Settings",
+            to: RouteUtil.populateRouteParams(
+              RouteMap[PageMap.USER_SETTINGS] as Route,
+              {
+                modelId: props.modelId,
+              },
+            ),
+          }}
+          icon={IconProp.Settings}
+        />
       </SideMenuSection>
 
       <SideMenuSection title="Advanced">

AdminDashboard/src/Utils/PageMap.ts

@@ -6,6 +6,7 @@ enum PageMap {
 
   USERS = "USERS",
   USER_VIEW = "USER_VIEW",
+  USER_SETTINGS = "USER_SETTINGS",
   USER_DELETE = "USER_DELETE",
 
   PROJECTS = "PROJECTS",
@@ -15,6 +16,7 @@ enum PageMap {
   SETTINGS_HOST = "SETTINGS_HOST",
   SETTINGS_SMTP = "SETTINGS_SMTP",
   SETTINGS_CALL_AND_SMS = "SETTINGS_CALL_AND_SMS",
+  SETTINGS_WHATSAPP = "SETTINGS_WHATSAPP",
   SETTINGS_PROBES = "SETTINGS_PROBES",
   SETTINGS_AUTHENTICATION = "SETTINGS_AUTHENTICATION",
   SETTINGS_API_KEY = "SETTINGS_API_KEY",

AdminDashboard/src/Utils/RouteMap.ts

@@ -18,6 +18,9 @@ const RouteMap: Dictionary<Route> = {
 
   [PageMap.USERS]: new Route(`/admin/users`),
   [PageMap.USER_VIEW]: new Route(`/admin/users/${RouteParams.ModelID}`),
+  [PageMap.USER_SETTINGS]: new Route(
+    `/admin/users/${RouteParams.ModelID}/settings`,
+  ),
   [PageMap.USER_DELETE]: new Route(
     `/admin/users/${RouteParams.ModelID}/delete`,
   ),
@@ -25,6 +28,7 @@ const RouteMap: Dictionary<Route> = {
   [PageMap.SETTINGS_HOST]: new Route(`/admin/settings/host`),
   [PageMap.SETTINGS_SMTP]: new Route(`/admin/settings/smtp`),
   [PageMap.SETTINGS_CALL_AND_SMS]: new Route(`/admin/settings/call-and-sms`),
+  [PageMap.SETTINGS_WHATSAPP]: new Route(`/admin/settings/whatsapp`),
   [PageMap.SETTINGS_PROBES]: new Route(`/admin/settings/probes`),
   [PageMap.SETTINGS_AUTHENTICATION]: new Route(
     `/admin/settings/authentication`,

App/Dockerfile.tpl

@@ -14,9 +14,12 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
 # IF APP_VERSION is not set, set it to 1.0.0

App/FeatureSet/BaseAPI/Index.ts

@@ -14,9 +14,11 @@ import TelemetryAPI from "Common/Server/API/TelemetryAPI";
 import ProbeAPI from "Common/Server/API/ProbeAPI";
 import ProjectAPI from "Common/Server/API/ProjectAPI";
 import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
+import WhatsAppLogAPI from "./WhatsAppLogAPI";
 
 // Import API
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
+import EnterpriseLicenseAPI from "Common/Server/API/EnterpriseLicenseAPI";
 import MonitorAPI from "Common/Server/API/MonitorAPI";
 import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
 import StatusPageAPI from "Common/Server/API/StatusPageAPI";
@@ -31,6 +33,7 @@ import MonitorTest from "Common/Models/DatabaseModels/MonitorTest";
 import UserEmailAPI from "Common/Server/API/UserEmailAPI";
 import UserNotificationLogTimelineAPI from "Common/Server/API/UserOnCallLogTimelineAPI";
 import UserSMSAPI from "Common/Server/API/UserSmsAPI";
+import UserWhatsAppAPI from "Common/Server/API/UserWhatsAppAPI";
 import UserPushAPI from "Common/Server/API/UserPushAPI";
 import ApiKeyPermissionService, {
   Service as ApiKeyPermissionServiceType,
@@ -96,6 +99,9 @@ import IncidentInternalNoteService, {
 import IncidentNoteTemplateService, {
   Service as IncidentNoteTemplateServiceType,
 } from "Common/Server/Services/IncidentNoteTemplateService";
+import IncidentPostmortemTemplateService, {
+  Service as IncidentPostmortemTemplateServiceType,
+} from "Common/Server/Services/IncidentPostmortemTemplateService";
 import TableViewService, {
   Service as TableViewServiceType,
 } from "Common/Server/Services/TableViewService";
@@ -139,9 +145,6 @@ import LogService, {
   LogService as LogServiceType,
 } from "Common/Server/Services/LogService";
 
-import TelemetryAttributeService, {
-  TelemetryAttributeService as TelemetryAttributeServiceType,
-} from "Common/Server/Services/TelemetryAttributeService";
 import CopilotActionTypePriorityService, {
   Service as CopilotActionTypePriorityServiceType,
 } from "Common/Server/Services/CopilotActionTypePriorityService";
@@ -378,6 +381,7 @@ import TelemetryExceptionService, {
 import ExceptionInstanceService, {
   ExceptionInstanceService as ExceptionInstanceServiceType,
 } from "Common/Server/Services/ExceptionInstanceService";
+import AcmeChallengeAPI from "Common/Server/API/AcmeChallengeAPI";
 
 import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
@@ -408,6 +412,7 @@ import Incident from "Common/Models/DatabaseModels/Incident";
 import IncidentCustomField from "Common/Models/DatabaseModels/IncidentCustomField";
 import IncidentInternalNote from "Common/Models/DatabaseModels/IncidentInternalNote";
 import IncidentNoteTemplate from "Common/Models/DatabaseModels/IncidentNoteTemplate";
+import IncidentPostmortemTemplate from "Common/Models/DatabaseModels/IncidentPostmortemTemplate";
 import IncidentOwnerTeam from "Common/Models/DatabaseModels/IncidentOwnerTeam";
 import IncidentOwnerUser from "Common/Models/DatabaseModels/IncidentOwnerUser";
 import IncidentPublicNote from "Common/Models/DatabaseModels/IncidentPublicNote";
@@ -487,7 +492,6 @@ import WorkflowVariable from "Common/Models/DatabaseModels/WorkflowVariable";
 import ProbeOwnerTeam from "Common/Models/DatabaseModels/ProbeOwnerTeam";
 import ProbeOwnerUser from "Common/Models/DatabaseModels/ProbeOwnerUser";
 import ServiceCatalogDependency from "Common/Models/DatabaseModels/ServiceCatalogDependency";
-import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
 import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance";
 import TelemetyException from "Common/Models/DatabaseModels/TelemetryException";
 import CopilotActionTypePriority from "Common/Models/DatabaseModels/CopilotActionTypePriority";
@@ -613,10 +617,7 @@ const BaseAPIFeatureSet: FeatureSet = {
 
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAnalyticsAPI<TelemetryAttribute, TelemetryAttributeServiceType>(
-        TelemetryAttribute,
-        TelemetryAttributeService,
-      ).getRouter(),
+      new AcmeChallengeAPI().getRouter(),
     );
 
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, OpenAPI.getRouter());
@@ -1398,6 +1399,17 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentPostmortemTemplate,
+        IncidentPostmortemTemplateServiceType
+      >(
+        IncidentPostmortemTemplate,
+        IncidentPostmortemTemplateService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<
@@ -1538,6 +1550,11 @@ const BaseAPIFeatureSet: FeatureSet = {
       new BaseAPI<SmsLog, SmsLogServiceType>(SmsLog, SmsLogService).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new WhatsAppLogAPI().getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<PushNotificationLog, PushNotificationLogServiceType>(
@@ -1635,6 +1652,10 @@ const BaseAPIFeatureSet: FeatureSet = {
       `/${APP_NAME.toLocaleLowerCase()}`,
       new ResellerPlanAPI().getRouter(),
     );
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new EnterpriseLicenseAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new SlackAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1675,6 +1696,10 @@ const BaseAPIFeatureSet: FeatureSet = {
     );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserEmailAPI().getRouter());
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserSMSAPI().getRouter());
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new UserWhatsAppAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserPushAPI().getRouter());
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ProbeAPI().getRouter());
 

App/FeatureSet/BaseAPI/WhatsAppLogAPI.ts

@@ -0,0 +1,14 @@
+import BaseAPI from "Common/Server/API/BaseAPI";
+import WhatsAppLog from "Common/Models/DatabaseModels/WhatsAppLog";
+import WhatsAppLogService, {
+  Service as WhatsAppLogServiceType,
+} from "Common/Server/Services/WhatsAppLogService";
+
+export default class WhatsAppLogAPI extends BaseAPI<
+  WhatsAppLog,
+  WhatsAppLogServiceType
+> {
+  public constructor() {
+    super(WhatsAppLog, WhatsAppLogService);
+  }
+}

App/FeatureSet/Identity/API/Authentication.ts

@@ -25,24 +25,70 @@ import EmailVerificationTokenService from "Common/Server/Services/EmailVerificat
 import MailService from "Common/Server/Services/MailService";
 import UserService from "Common/Server/Services/UserService";
 import UserTotpAuthService from "Common/Server/Services/UserTotpAuthService";
+import UserSessionService, {
+  SessionMetadata,
+} from "Common/Server/Services/UserSessionService";
 import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
+  extractDeviceInfo,
+  getClientIp,
+  headerValueToString,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
 import TotpAuth from "Common/Server/Utils/TotpAuth";
 import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
 import User from "Common/Models/DatabaseModels/User";
+import UserSession from "Common/Models/DatabaseModels/UserSession";
 import UserTotpAuth from "Common/Models/DatabaseModels/UserTotpAuth";
 import UserWebAuthn from "Common/Models/DatabaseModels/UserWebAuthn";
 import UserWebAuthnService from "Common/Server/Services/UserWebAuthnService";
+import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException";
 
 const router: ExpressRouter = Express.getRouter();
 
+const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
+
+type FinalizeUserLoginInput = {
+  req: ExpressRequest;
+  res: ExpressResponse;
+  user: User;
+  isGlobalLogin: boolean;
+};
+
+const finalizeUserLogin: (
+  data: FinalizeUserLoginInput,
+) => Promise<SessionMetadata> = async (
+  data: FinalizeUserLoginInput,
+): Promise<SessionMetadata> => {
+  const { req, res, user, isGlobalLogin } = data;
+
+  const sessionMetadata: SessionMetadata =
+    await UserSessionService.createSession({
+      userId: user.id!,
+      isGlobalLogin,
+      ipAddress: getClientIp(req),
+      userAgent: headerValueToString(req.headers["user-agent"]),
+      ...extractDeviceInfo(req),
+    });
+
+  CookieUtil.setUserCookie({
+    expressResponse: res,
+    user,
+    isGlobalLogin,
+    sessionId: sessionMetadata.session.id!,
+    refreshToken: sessionMetadata.refreshToken,
+    refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
+    accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+  });
+
+  return sessionMetadata;
+};
+
 router.post(
   "/signup",
   async (
@@ -185,9 +231,9 @@ router.post(
       if (savedUser) {
         // Refresh Permissions for this user here.
         await AccessTokenService.refreshUserAllPermissions(savedUser.id!);
-
-        CookieUtil.setUserCookie({
-          expressResponse: res,
+        await finalizeUserLogin({
+          req,
+          res,
           user: savedUser,
           isGlobalLogin: true,
         });
@@ -487,6 +533,127 @@ router.post(
   },
 );
 
+router.post(
+  "/refresh-token",
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      const refreshToken: string | undefined =
+        CookieUtil.getRefreshTokenFromExpressRequest(req);
+
+      if (!refreshToken) {
+        CookieUtil.removeAllCookies(req, res);
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException(
+            "Refresh token missing. Please login again.",
+          ),
+        );
+      }
+
+      const session: UserSession | null =
+        await UserSessionService.findActiveSessionByRefreshToken(refreshToken);
+
+      if (!session || !session.id) {
+        CookieUtil.removeAllCookies(req, res);
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      if (
+        session.refreshTokenExpiresAt &&
+        OneUptimeDate.hasExpired(session.refreshTokenExpiresAt)
+      ) {
+        await UserSessionService.revokeSessionById(session.id, {
+          reason: "Refresh token expired",
+        });
+        CookieUtil.removeAllCookies(req, res);
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      if (!session.userId) {
+        await UserSessionService.revokeSessionById(session.id, {
+          reason: "Session missing user",
+        });
+        CookieUtil.removeAllCookies(req, res);
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      const user: User | null = await UserService.findOneById({
+        id: session.userId,
+        props: {
+          isRoot: true,
+        },
+        select: {
+          _id: true,
+          email: true,
+          name: true,
+          isMasterAdmin: true,
+          profilePictureId: true,
+          timezone: true,
+          enableTwoFactorAuth: true,
+        },
+      });
+
+      if (!user) {
+        await UserSessionService.revokeSessionById(session.id, {
+          reason: "User not found",
+        });
+        CookieUtil.removeAllCookies(req, res);
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Account no longer exists."),
+        );
+      }
+
+      const additionalInfo: JSONObject = (session.additionalInfo ||
+        {}) as JSONObject;
+      const isGlobalLogin: boolean =
+        typeof additionalInfo["isGlobalLogin"] === "boolean"
+          ? (additionalInfo["isGlobalLogin"] as boolean)
+          : true;
+
+      const renewedSession: SessionMetadata =
+        await UserSessionService.renewSessionWithNewRefreshToken({
+          session,
+          ipAddress: getClientIp(req),
+          userAgent: headerValueToString(req.headers["user-agent"]),
+          ...extractDeviceInfo(req),
+        });
+
+      CookieUtil.setUserCookie({
+        expressResponse: res,
+        user,
+        isGlobalLogin,
+        sessionId: renewedSession.session.id!,
+        refreshToken: renewedSession.refreshToken,
+        refreshTokenExpiresAt: renewedSession.refreshTokenExpiresAt,
+        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+      });
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
+
 router.post(
   "/logout",
   async (
@@ -495,6 +662,15 @@ router.post(
     next: NextFunction,
   ): Promise<void> => {
     try {
+      const refreshToken: string | undefined =
+        CookieUtil.getRefreshTokenFromExpressRequest(req);
+
+      if (refreshToken) {
+        await UserSessionService.revokeSessionByRefreshToken(refreshToken, {
+          reason: "User logout",
+        });
+      }
+
       CookieUtil.removeAllCookies(req, res);
 
       return Response.sendEmptySuccessResponse(req, res);
@@ -788,8 +964,9 @@ const login: LoginFunction = async (options: {
       if (alreadySavedUser.password.toString() === user.password!.toString()) {
         logger.info("User logged in: " + alreadySavedUser.email?.toString());
 
-        CookieUtil.setUserCookie({
-          expressResponse: res,
+        await finalizeUserLogin({
+          req,
+          res,
           user: alreadySavedUser,
           isGlobalLogin: true,
         });

App/FeatureSet/Identity/API/SCIM.ts

@@ -6,6 +6,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
   OneUptimeRequest,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
@@ -166,13 +167,7 @@ const formatTeamForSCIM: (
   }
 
   return {
-    // Include both SCIM 2.0 Group schema and SCIM 1.1 core schema for broader compatibility
-    // Some provisioning agents (e.g., Okta On-Prem) expect 'urn:scim:schemas:core:1.0'
-    // to be present even when using SCIM v2 endpoints.
-    schemas: [
-      "urn:ietf:params:scim:schemas:core:2.0:Group",
-      "urn:scim:schemas:core:1.0",
-    ],
+    schemas: ["urn:ietf:params:scim:schemas:core:2.0:Group"],
     id: team.id?.toString(),
     displayName: team.name?.toString(),
     members: members,
@@ -189,7 +184,11 @@ const formatTeamForSCIM: (
 router.get(
   "/scim/v2/:projectScimId/ServiceProviderConfig",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Project SCIM ServiceProviderConfig - scimId: ${req.params["projectScimId"]!}`,
@@ -208,7 +207,7 @@ router.get(
       return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -217,7 +216,11 @@ router.get(
 router.get(
   "/scim/v2/:projectScimId/Users",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Project SCIM Users list - scimId: ${req.params["projectScimId"]!}`,
@@ -390,7 +393,7 @@ router.get(
       );
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -399,7 +402,11 @@ router.get(
 router.get(
   "/scim/v2/:projectScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Get individual user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -458,7 +465,7 @@ router.get(
       return Response.sendJsonObjectResponse(req, res, user);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -467,7 +474,11 @@ router.get(
 router.put(
   "/scim/v2/:projectScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Update user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -624,7 +635,7 @@ router.put(
       return Response.sendJsonObjectResponse(req, res, user);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -633,7 +644,11 @@ router.put(
 router.get(
   "/scim/v2/:projectScimId/Groups",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Groups list request for projectScimId: ${req.params["projectScimId"]}`,
@@ -713,7 +728,7 @@ router.get(
       });
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -722,7 +737,11 @@ router.get(
 router.get(
   "/scim/v2/:projectScimId/Groups/:groupId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Get individual group request for groupId: ${req.params["groupId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -777,7 +796,7 @@ router.get(
       return Response.sendJsonObjectResponse(req, res, group);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -786,7 +805,11 @@ router.get(
 router.post(
   "/scim/v2/:projectScimId/Groups",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Create group request for projectScimId: ${req.params["projectScimId"]}`,
@@ -811,41 +834,53 @@ router.post(
           projectId: projectId,
           name: displayName,
         },
-        select: { _id: true },
+        select: {
+          _id: true,
+          name: true,
+          createdAt: true,
+          updatedAt: true,
+          projectId: true,
+        },
         props: { isRoot: true },
       });
 
+      let targetTeam: Team;
+      let createdNewTeam: boolean = false;
+
       if (existingTeam) {
         logger.debug(
-          `SCIM Create group - team already exists with id: ${existingTeam.id}`,
+          `SCIM Create group - team already exists with id: ${existingTeam.id}, reusing existing team`,
         );
-        throw new BadRequestException("Group with this name already exists");
+        targetTeam = existingTeam;
+      } else {
+        // Create new team
+        logger.debug(`SCIM Create group - creating new team: ${displayName}`);
+        const team: Team = new Team();
+        team.projectId = projectId;
+        team.name = displayName;
+        team.isTeamEditable = true; // Allow editing SCIM-created teams
+        team.isTeamDeleteable = true; // Allow deleting SCIM-created teams
+        team.shouldHaveAtLeastOneMember = false; // SCIM groups can be empty
+
+        const createdTeam: Team = await TeamService.create({
+          data: team,
+          props: { isRoot: true },
+        });
+
+        logger.debug(
+          `SCIM Create group - created team with id: ${createdTeam.id}`,
+        );
+
+        targetTeam = createdTeam;
+        createdNewTeam = true;
       }
 
-      // Create new team
-      logger.debug(`SCIM Create group - creating new team: ${displayName}`);
-      const team: Team = new Team();
-      team.projectId = projectId;
-      team.name = displayName;
-      team.isTeamEditable = true; // Allow editing SCIM-created teams
-      team.isTeamDeleteable = true; // Allow deleting SCIM-created teams
-      team.shouldHaveAtLeastOneMember = false; // SCIM groups can be empty
-
-      const createdTeam: Team = await TeamService.create({
-        data: team,
-        props: { isRoot: true },
-      });
-
-      logger.debug(
-        `SCIM Create group - created team with id: ${createdTeam.id}`,
-      );
-
-      // Handle initial members if provided
+      // Handle members if provided. Adds any new members and leaves existing ones intact.
       const members: Array<SCIMMember> =
         (scimGroup["members"] as Array<SCIMMember>) || [];
       if (members.length > 0) {
         logger.debug(
-          `SCIM Create group - adding ${members.length} initial members`,
+          `SCIM Create group - ensuring ${members.length} members are part of team ${targetTeam.id}`,
         );
         for (const member of members) {
           const userId: string = member["value"] as string;
@@ -864,18 +899,18 @@ router.post(
                   query: {
                     projectId: projectId,
                     userId: new ObjectID(userId),
-                    teamId: createdTeam.id!,
+                    teamId: targetTeam.id!,
                   },
                   select: { _id: true },
                   props: { isRoot: true },
                 });
 
               if (!existingMember) {
-                // Add user to the new team
+                // Add user to the team
                 const newTeamMember: TeamMember = new TeamMember();
                 newTeamMember.projectId = projectId;
                 newTeamMember.userId = new ObjectID(userId);
-                newTeamMember.teamId = createdTeam.id!;
+                newTeamMember.teamId = targetTeam.id!;
                 newTeamMember.hasAcceptedInvitation = true;
                 newTeamMember.invitationAcceptedAt =
                   OneUptimeDate.getCurrentDate();
@@ -887,7 +922,7 @@ router.post(
                   },
                 });
                 logger.debug(
-                  `SCIM Create group - added user ${userId} to team`,
+                  `SCIM Create group - added user ${userId} to team ${targetTeam.id}`,
                 );
               }
             }
@@ -895,21 +930,42 @@ router.post(
         }
       }
 
-      const createdGroup: JSONObject = await formatTeamForSCIM(
-        createdTeam,
+      const teamForResponse: Team | null = await TeamService.findOneById({
+        id: targetTeam.id!,
+        select: {
+          _id: true,
+          name: true,
+          createdAt: true,
+          updatedAt: true,
+          projectId: true,
+        },
+        props: { isRoot: true },
+      });
+
+      if (!teamForResponse) {
+        throw new NotFoundException("Failed to retrieve group");
+      }
+
+      const groupResponse: JSONObject = await formatTeamForSCIM(
+        teamForResponse,
         req.params["projectScimId"]!,
         true,
       );
 
       logger.debug(
-        `SCIM Create group - returning created group with id: ${createdTeam.id}`,
+        `SCIM Create group - returning group with id: ${teamForResponse.id}`,
       );
 
-      res.status(201);
-      return Response.sendJsonObjectResponse(req, res, createdGroup);
+      if (createdNewTeam) {
+        res.status(201);
+      } else {
+        res.status(200);
+      }
+
+      return Response.sendJsonObjectResponse(req, res, groupResponse);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -918,7 +974,11 @@ router.post(
 router.put(
   "/scim/v2/:projectScimId/Groups/:groupId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Update group request for groupId: ${req.params["groupId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -968,10 +1028,6 @@ router.put(
         );
       }
 
-      if (!team.isTeamEditable) {
-        throw new BadRequestException("This group cannot be updated");
-      }
-
       // Update team name if provided
       const displayName: string = scimGroup["displayName"] as string;
       if (displayName && displayName !== team.name) {
@@ -1072,7 +1128,7 @@ router.put(
       throw new NotFoundException("Failed to retrieve updated group");
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -1081,7 +1137,11 @@ router.put(
 router.delete(
   "/scim/v2/:projectScimId/Groups/:groupId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Delete group request for groupId: ${req.params["groupId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -1159,7 +1219,7 @@ router.delete(
       });
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -1168,7 +1228,11 @@ router.delete(
 router.patch(
   "/scim/v2/:projectScimId/Groups/:groupId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Patch group request for groupId: ${req.params["groupId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -1214,10 +1278,6 @@ router.patch(
         );
       }
 
-      if (!team.isTeamEditable) {
-        throw new BadRequestException("This group cannot be updated");
-      }
-
       // Handle SCIM patch operations
       const operations: JSONObject[] =
         (scimPatch["Operations"] as JSONObject[]) || [];
@@ -1403,7 +1463,7 @@ router.patch(
       throw new NotFoundException("Failed to retrieve updated group");
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -1412,7 +1472,11 @@ router.patch(
 router.post(
   "/scim/v2/:projectScimId/Users",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Create user request for projectScimId: ${req.params["projectScimId"]}`,
@@ -1499,7 +1563,7 @@ router.post(
       return Response.sendJsonObjectResponse(req, res, createdUser);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -1508,7 +1572,11 @@ router.post(
 router.delete(
   "/scim/v2/:projectScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `SCIM Delete user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
@@ -1560,7 +1628,7 @@ router.delete(
       });
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );

App/FeatureSet/Identity/API/SSO.ts

@@ -20,6 +20,9 @@ import AccessTokenService from "Common/Server/Services/AccessTokenService";
 import ProjectSSOService from "Common/Server/Services/ProjectSsoService";
 import TeamMemberService from "Common/Server/Services/TeamMemberService";
 import UserService from "Common/Server/Services/UserService";
+import UserSessionService, {
+  SessionMetadata,
+} from "Common/Server/Services/UserSessionService";
 import QueryHelper from "Common/Server/Types/Database/QueryHelper";
 import Select from "Common/Server/Types/Database/Select";
 import CookieUtil from "Common/Server/Utils/Cookie";
@@ -28,6 +31,9 @@ import Express, {
   ExpressResponse,
   ExpressRouter,
   NextFunction,
+  extractDeviceInfo,
+  getClientIp,
+  headerValueToString,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -40,6 +46,8 @@ import Name from "Common/Types/Name";
 
 const router: ExpressRouter = Express.getRouter();
 
+const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
+
 /*
  * This route is used to get the SSO config for the user.
  * when the user logs in from OneUptime and not from the IDP.
@@ -47,7 +55,11 @@ const router: ExpressRouter = Express.getRouter();
 
 router.get(
   "/service-provider-login",
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       if (!req.query["email"]) {
         return Response.sendErrorResponse(
@@ -152,7 +164,11 @@ router.get(
     } catch (err) {
       logger.error(err);
 
-      Response.sendErrorResponse(req, res, err as Exception);
+      if (err instanceof Exception) {
+        return next(err);
+      }
+
+      return next(new ServerException());
     }
   },
 );
@@ -162,7 +178,7 @@ router.get(
   async (
     req: ExpressRequest,
     res: ExpressResponse,
-    _next: NextFunction,
+    next: NextFunction,
   ): Promise<void> => {
     try {
       if (!req.params["projectId"]) {
@@ -238,22 +254,42 @@ router.get(
     } catch (err) {
       logger.error(err);
 
-      Response.sendErrorResponse(req, res, err as Exception);
+      if (err instanceof Exception) {
+        return next(err);
+      }
+
+      return next(new ServerException());
     }
   },
 );
 
 router.get(
   "/idp-login/:projectId/:projectSsoId",
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
-    return await loginUserWithSso(req, res);
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      await loginUserWithSso(req, res);
+    } catch (err) {
+      return next(err);
+    }
   },
 );
 
 router.post(
   "/idp-login/:projectId/:projectSsoId",
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
-    return await loginUserWithSso(req, res);
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      await loginUserWithSso(req, res);
+    } catch (err) {
+      return next(err);
+    }
   },
 );
 
@@ -511,15 +547,31 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
       expressResponse: res,
     });
 
+    // Refresh Permissions for this user here.
+    await AccessTokenService.refreshUserAllPermissions(alreadySavedUser.id!);
+
+    const sessionMetadata: SessionMetadata =
+      await UserSessionService.createSession({
+        userId: alreadySavedUser.id!,
+        isGlobalLogin: false,
+        ipAddress: getClientIp(req),
+        userAgent: headerValueToString(req.headers["user-agent"]),
+        ...extractDeviceInfo(req),
+        additionalInfo: {
+          projectId: projectId.toString(),
+        },
+      });
+
     CookieUtil.setUserCookie({
       expressResponse: res,
       user: alreadySavedUser,
       isGlobalLogin: false,
+      sessionId: sessionMetadata.session.id!,
+      refreshToken: sessionMetadata.refreshToken,
+      refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
+      accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
     });
 
-    // Refresh Permissions for this user here.
-    await AccessTokenService.refreshUserAllPermissions(alreadySavedUser.id!);
-
     const host: Hostname = await DatabaseConfig.getHost();
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 

App/FeatureSet/Identity/API/StatusPageAuthentication.ts

@@ -6,30 +6,93 @@ import URL from "Common/Types/API/URL";
 import OneUptimeDate from "Common/Types/Date";
 import EmailTemplateType from "Common/Types/Email/EmailTemplateType";
 import BadDataException from "Common/Types/Exception/BadDataException";
+import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException";
 import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
-import PositiveNumber from "Common/Types/PositiveNumber";
 import DatabaseConfig from "Common/Server/DatabaseConfig";
 import { EncryptionSecret } from "Common/Server/EnvironmentConfig";
 import MailService from "Common/Server/Services/MailService";
 import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
 import StatusPageService from "Common/Server/Services/StatusPageService";
+import StatusPagePrivateUserSessionService, {
+  SessionMetadata as StatusPageSessionMetadata,
+} from "Common/Server/Services/StatusPagePrivateUserSessionService";
 import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
+  extractDeviceInfo,
+  getClientIp,
+  headerValueToString,
 } from "Common/Server/Utils/Express";
-import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
 import StatusPage from "Common/Models/DatabaseModels/StatusPage";
 import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
+import StatusPagePrivateUserSession from "Common/Models/DatabaseModels/StatusPagePrivateUserSession";
 
 const router: ExpressRouter = Express.getRouter();
 
+const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
+
+type FinalizeStatusPageLoginInput = {
+  req: ExpressRequest;
+  res: ExpressResponse;
+  user: StatusPagePrivateUser;
+};
+
+const finalizeStatusPageLogin: (data: FinalizeStatusPageLoginInput) => Promise<{
+  sessionMetadata: StatusPageSessionMetadata;
+  accessToken: string;
+}> = async (
+  data: FinalizeStatusPageLoginInput,
+): Promise<{
+  sessionMetadata: StatusPageSessionMetadata;
+  accessToken: string;
+}> => {
+  const { req, res, user } = data;
+
+  if (!user.projectId) {
+    throw new BadDataException(
+      "Status page user is missing associated projectId.",
+    );
+  }
+
+  if (!user.statusPageId) {
+    throw new BadDataException(
+      "Status page user is missing associated statusPageId.",
+    );
+  }
+
+  const sessionMetadata: StatusPageSessionMetadata =
+    await StatusPagePrivateUserSessionService.createSession({
+      projectId: user.projectId,
+      statusPageId: user.statusPageId,
+      statusPagePrivateUserId: user.id!,
+      ipAddress: getClientIp(req),
+      userAgent: headerValueToString(req.headers["user-agent"]),
+      ...extractDeviceInfo(req),
+    });
+
+  const accessToken: string = CookieUtil.setStatusPagePrivateUserCookie({
+    expressResponse: res,
+    user,
+    statusPageId: user.statusPageId,
+    sessionId: sessionMetadata.session.id!,
+    refreshToken: sessionMetadata.refreshToken,
+    refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
+    accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+  });
+
+  return {
+    sessionMetadata,
+    accessToken,
+  };
+};
+
 router.post(
   "/logout/:statuspageid",
   async (
@@ -46,7 +109,20 @@ router.post(
         req.params["statuspageid"].toString(),
       );
 
-      CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId)); // remove the cookie.
+      const refreshToken: string | undefined =
+        CookieUtil.getRefreshTokenFromExpressRequest(req, statusPageId);
+
+      if (refreshToken) {
+        await StatusPagePrivateUserSessionService.revokeSessionByRefreshToken(
+          refreshToken,
+          {
+            reason: "User logged out",
+          },
+        );
+      }
+
+      CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+      CookieUtil.removeCookie(res, CookieUtil.getRefreshTokenKey(statusPageId));
 
       return Response.sendEmptySuccessResponse(req, res);
     } catch (err) {
@@ -55,6 +131,198 @@ router.post(
   },
 );
 
+router.post(
+  "/refresh-token/:statuspageid",
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      const statusPageIdParam: string | undefined = req.params["statuspageid"];
+
+      if (!statusPageIdParam) {
+        throw new BadDataException("Status Page ID is required.");
+      }
+
+      const statusPageId: ObjectID = new ObjectID(statusPageIdParam.toString());
+
+      const refreshToken: string | undefined =
+        CookieUtil.getRefreshTokenFromExpressRequest(req, statusPageId);
+
+      if (!refreshToken) {
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException(
+            "Refresh token missing. Please login again.",
+          ),
+        );
+      }
+
+      const session: StatusPagePrivateUserSession | null =
+        await StatusPagePrivateUserSessionService.findActiveSessionByRefreshToken(
+          refreshToken,
+        );
+
+      if (!session || !session.id || !session.statusPageId) {
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      if (session.statusPageId.toString() !== statusPageId.toString()) {
+        await StatusPagePrivateUserSessionService.revokeSessionById(
+          session.id,
+          {
+            reason: "Status page mismatch",
+          },
+        );
+
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      if (
+        session.refreshTokenExpiresAt &&
+        OneUptimeDate.hasExpired(session.refreshTokenExpiresAt)
+      ) {
+        await StatusPagePrivateUserSessionService.revokeSessionById(
+          session.id,
+          {
+            reason: "Refresh token expired",
+          },
+        );
+
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      if (!session.statusPagePrivateUserId) {
+        await StatusPagePrivateUserSessionService.revokeSessionById(
+          session.id,
+          {
+            reason: "Session missing user",
+          },
+        );
+
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Session expired. Please login again."),
+        );
+      }
+
+      const user: StatusPagePrivateUser | null =
+        await StatusPagePrivateUserService.findOneById({
+          id: session.statusPagePrivateUserId,
+          props: {
+            isRoot: true,
+          },
+          select: {
+            _id: true,
+            email: true,
+            statusPageId: true,
+            projectId: true,
+          },
+        });
+
+      if (!user) {
+        await StatusPagePrivateUserSessionService.revokeSessionById(
+          session.id,
+          {
+            reason: "User not found",
+          },
+        );
+
+        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
+        CookieUtil.removeCookie(
+          res,
+          CookieUtil.getRefreshTokenKey(statusPageId),
+        );
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException("Account no longer exists."),
+        );
+      }
+
+      const renewedSession: StatusPageSessionMetadata =
+        await StatusPagePrivateUserSessionService.renewSessionWithNewRefreshToken(
+          {
+            session,
+            ipAddress: getClientIp(req),
+            userAgent: headerValueToString(req.headers["user-agent"]),
+            ...extractDeviceInfo(req),
+          },
+        );
+
+      const accessToken: string = CookieUtil.setStatusPagePrivateUserCookie({
+        expressResponse: res,
+        user,
+        statusPageId: user.statusPageId!,
+        sessionId: renewedSession.session.id!,
+        refreshToken: renewedSession.refreshToken,
+        refreshTokenExpiresAt: renewedSession.refreshTokenExpiresAt,
+        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+      });
+
+      return Response.sendEntityResponse(
+        req,
+        res,
+        user,
+        StatusPagePrivateUser,
+        {
+          miscData: {
+            token: accessToken,
+          },
+        },
+      );
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
+
 router.post(
   "/forgot-password",
   async (
@@ -376,6 +644,7 @@ router.post(
             password: true,
             email: true,
             statusPageId: true,
+            projectId: true,
           },
           props: {
             isRoot: true,
@@ -383,31 +652,38 @@ router.post(
         });
 
       if (alreadySavedUser) {
-        const token: string = JSONWebToken.sign({
-          data: alreadySavedUser,
-          expiresInSeconds: OneUptimeDate.getSecondsInDays(
-            new PositiveNumber(30),
-          ),
+        const { accessToken } = await finalizeStatusPageLogin({
+          req,
+          res,
+          user: alreadySavedUser,
         });
 
-        CookieUtil.setCookie(
-          res,
-          CookieUtil.getUserTokenKey(alreadySavedUser.statusPageId!),
-          token,
-          {
-            httpOnly: true,
-            maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),
-          },
-        );
+        const sanitizedUser: StatusPagePrivateUser | null =
+          await StatusPagePrivateUserService.findOneById({
+            id: alreadySavedUser.id!,
+            props: {
+              isRoot: true,
+            },
+            select: {
+              _id: true,
+              email: true,
+              statusPageId: true,
+              projectId: true,
+            },
+          });
+
+        if (!sanitizedUser && (alreadySavedUser as any).password) {
+          delete (alreadySavedUser as any).password;
+        }
 
         return Response.sendEntityResponse(
           req,
           res,
-          alreadySavedUser,
+          sanitizedUser || alreadySavedUser,
           StatusPagePrivateUser,
           {
             miscData: {
-              token: token,
+              token: accessToken,
             },
           },
         );

App/FeatureSet/Identity/API/StatusPageSCIM.ts

@@ -4,6 +4,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
   OneUptimeRequest,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
@@ -29,7 +30,11 @@ const router: ExpressRouter = Express.getRouter();
 router.get(
   "/status-page-scim/v2/:statusPageScimId/ServiceProviderConfig",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM ServiceProviderConfig - scimId: ${req.params["statusPageScimId"]!}`,
@@ -44,7 +49,7 @@ router.get(
       return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -53,7 +58,11 @@ router.get(
 router.get(
   "/status-page-scim/v2/:statusPageScimId/Users",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM Users list request for statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -164,7 +173,7 @@ router.get(
       });
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -173,7 +182,11 @@ router.get(
 router.get(
   "/status-page-scim/v2/:statusPageScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM Get individual user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -231,7 +244,7 @@ router.get(
       return Response.sendJsonObjectResponse(req, res, user);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -240,7 +253,11 @@ router.get(
 router.post(
   "/status-page-scim/v2/:statusPageScimId/Users",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM Create user request for statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -333,7 +350,7 @@ router.post(
       return Response.sendJsonObjectResponse(req, res, createdUser);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -342,7 +359,11 @@ router.post(
 router.put(
   "/status-page-scim/v2/:statusPageScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM Update user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -489,7 +510,7 @@ router.put(
       return Response.sendJsonObjectResponse(req, res, user);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );
@@ -498,7 +519,11 @@ router.put(
 router.delete(
   "/status-page-scim/v2/:statusPageScimId/Users/:userId",
   SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       logger.debug(
         `Status Page SCIM Delete user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -562,7 +587,7 @@ router.delete(
       return Response.sendEmptySuccessResponse(req, res);
     } catch (err) {
       logger.error(err);
-      return Response.sendErrorResponse(req, res, err as BadRequestException);
+      return next(err);
     }
   },
 );

App/FeatureSet/Identity/API/StatusPageSSO.ts

@@ -1,6 +1,5 @@
 import SSOUtil from "../Utils/SSO";
 import URL from "Common/Types/API/URL";
-import OneUptimeDate from "Common/Types/Date";
 import Email from "Common/Types/Email";
 import BadRequestException from "Common/Types/Exception/BadRequestException";
 import Exception from "Common/Types/Exception/Exception";
@@ -8,9 +7,11 @@ import ServerException from "Common/Types/Exception/ServerException";
 import HashedString from "Common/Types/HashedString";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
-import PositiveNumber from "Common/Types/PositiveNumber";
 import { Host, HttpProtocol } from "Common/Server/EnvironmentConfig";
 import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
+import StatusPagePrivateUserSessionService, {
+  SessionMetadata as StatusPageSessionMetadata,
+} from "Common/Server/Services/StatusPagePrivateUserSessionService";
 import StatusPageService from "Common/Server/Services/StatusPageService";
 import StatusPageSsoService from "Common/Server/Services/StatusPageSsoService";
 import CookieUtil from "Common/Server/Utils/Cookie";
@@ -19,8 +20,10 @@ import Express, {
   ExpressResponse,
   ExpressRouter,
   NextFunction,
+  extractDeviceInfo,
+  getClientIp,
+  headerValueToString,
 } from "Common/Server/Utils/Express";
-import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
 import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
@@ -30,6 +33,8 @@ import xml2js from "xml2js";
 // Initialize Express router.
 const router: ExpressRouter = Express.getRouter();
 
+const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
+
 // Define a GET route for SSO in a status page context.
 router.get(
   "/status-page-sso/:statusPageId/:statusPageSsoId",
@@ -115,7 +120,11 @@ router.get(
 
 router.post(
   "/status-page-idp-login/:statusPageId/:statusPageSsoId",
-  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
     try {
       const samlResponseBase64: string = req.body.SAMLResponse;
 
@@ -281,24 +290,30 @@ router.post(
         });
       }
 
-      const token: string = JSONWebToken.sign({
-        data: alreadySavedUser,
-        expiresInSeconds: OneUptimeDate.getSecondsInDays(
-          new PositiveNumber(30),
-        ),
+      if (!alreadySavedUser.projectId) {
+        alreadySavedUser.projectId = projectId;
+      }
+
+      const sessionMetadata: StatusPageSessionMetadata =
+        await StatusPagePrivateUserSessionService.createSession({
+          projectId: alreadySavedUser.projectId!,
+          statusPageId: statusPageId,
+          statusPagePrivateUserId: alreadySavedUser.id!,
+          ipAddress: getClientIp(req),
+          userAgent: headerValueToString(req.headers["user-agent"]),
+          ...extractDeviceInfo(req),
+        });
+
+      const token: string = CookieUtil.setStatusPagePrivateUserCookie({
+        expressResponse: res,
+        user: alreadySavedUser,
+        statusPageId: statusPageId,
+        sessionId: sessionMetadata.session.id!,
+        refreshToken: sessionMetadata.refreshToken,
+        refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
+        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
       });
 
-      CookieUtil.setCookie(
-        res,
-        CookieUtil.getUserTokenKey(alreadySavedUser.statusPageId!),
-        token,
-
-        {
-          httpOnly: true,
-          maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),
-        },
-      );
-
       // get status page URL.
       const statusPageURL: string =
         await StatusPageService.getStatusPageFirstURL(statusPageId);
@@ -312,7 +327,11 @@ router.post(
       );
     } catch (err) {
       logger.error(err);
-      Response.sendErrorResponse(req, res, new ServerException());
+      if (err instanceof Exception) {
+        return next(err);
+      }
+
+      return next(new ServerException());
     }
   },
 );

App/FeatureSet/Notification/API/Call.ts

@@ -12,6 +12,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -22,139 +23,146 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/make-call",
   ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse) => {
-    const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = JSONFunctions.deserialize(req.body);
 
-    await CallService.makeCall(body["callRequest"] as CallRequest, {
-      projectId: body["projectId"] as ObjectID,
-      isSensitive: (body["isSensitive"] as boolean) || false,
-      userOnCallLogTimelineId:
-        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-      customTwilioConfig: body["customTwilioConfig"] as any,
-      incidentId: (body["incidentId"] as ObjectID) || undefined,
-      alertId: (body["alertId"] as ObjectID) || undefined,
-      scheduledMaintenanceId:
-        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-      statusPageAnnouncementId:
-        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-      userId: (body["userId"] as ObjectID) || undefined,
-      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-      onCallPolicyEscalationRuleId:
-        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-      onCallDutyPolicyExecutionLogTimelineId:
-        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-        undefined,
-      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-      teamId: (body["teamId"] as ObjectID) || undefined,
-    });
+      await CallService.makeCall(body["callRequest"] as CallRequest, {
+        projectId: body["projectId"] as ObjectID,
+        isSensitive: (body["isSensitive"] as boolean) || false,
+        userOnCallLogTimelineId:
+          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+        customTwilioConfig: body["customTwilioConfig"] as any,
+        incidentId: (body["incidentId"] as ObjectID) || undefined,
+        alertId: (body["alertId"] as ObjectID) || undefined,
+        scheduledMaintenanceId:
+          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+        statusPageAnnouncementId:
+          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+        userId: (body["userId"] as ObjectID) || undefined,
+        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+        onCallPolicyEscalationRuleId:
+          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+        onCallDutyPolicyExecutionLogTimelineId:
+          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+          undefined,
+        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+        teamId: (body["teamId"] as ObjectID) || undefined,
+      });
 
-    return Response.sendEmptySuccessResponse(req, res);
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
   },
 );
 
-router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
-  const body: JSONObject = req.body;
+router.post(
+  "/test",
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body;
 
-  const callSMSConfigId: ObjectID = new ObjectID(
-    body["callSMSConfigId"] as string,
-  );
+      const callSMSConfigId: ObjectID = new ObjectID(
+        body["callSMSConfigId"] as string,
+      );
 
-  const config: ProjectCallSMSConfig | null =
-    await ProjectCallSMSConfigService.findOneById({
-      id: callSMSConfigId,
-      props: {
-        isRoot: true,
-      },
-      select: {
-        _id: true,
-        twilioAccountSID: true,
-        twilioAuthToken: true,
-        twilioPrimaryPhoneNumber: true,
-        twilioSecondaryPhoneNumbers: true,
-        projectId: true,
-      },
-    });
+      const config: ProjectCallSMSConfig | null =
+        await ProjectCallSMSConfigService.findOneById({
+          id: callSMSConfigId,
+          props: {
+            isRoot: true,
+          },
+          select: {
+            _id: true,
+            twilioAccountSID: true,
+            twilioAuthToken: true,
+            twilioPrimaryPhoneNumber: true,
+            twilioSecondaryPhoneNumbers: true,
+            projectId: true,
+          },
+        });
 
-  if (!config) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "call and sms config not found for id" + callSMSConfigId.toString(),
-      ),
-    );
-  }
+      if (!config) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException(
+            "call and sms config not found for id" + callSMSConfigId.toString(),
+          ),
+        );
+      }
 
-  const toPhone: Phone = new Phone(body["toPhone"] as string);
+      const toPhone: Phone = new Phone(body["toPhone"] as string);
 
-  if (!toPhone) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("toPhone is required"),
-    );
-  }
+      if (!toPhone) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("toPhone is required"),
+        );
+      }
 
-  // if any of the twilio config is missing, we will not send make the call
+      // if any of the twilio config is missing, we will not send make the call
 
-  if (!config.twilioAccountSID) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioAccountSID is required"),
-    );
-  }
+      if (!config.twilioAccountSID) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioAccountSID is required"),
+        );
+      }
 
-  if (!config.twilioAuthToken) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioAuthToken is required"),
-    );
-  }
+      if (!config.twilioAuthToken) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioAuthToken is required"),
+        );
+      }
 
-  if (!config.twilioPrimaryPhoneNumber) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioPrimaryPhoneNumber is required"),
-    );
-  }
+      if (!config.twilioPrimaryPhoneNumber) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioPrimaryPhoneNumber is required"),
+        );
+      }
 
-  const twilioConfig: TwilioConfig | undefined =
-    ProjectCallSMSConfigService.toTwilioConfig(config);
+      const twilioConfig: TwilioConfig | undefined =
+        ProjectCallSMSConfigService.toTwilioConfig(config);
 
-  try {
-    if (!twilioConfig) {
-      throw new BadDataException("twilioConfig is undefined");
+      try {
+        if (!twilioConfig) {
+          throw new BadDataException("twilioConfig is undefined");
+        }
+
+        const testCallRequest: CallRequest = {
+          data: [
+            {
+              sayMessage: "This is a test call from OneUptime.",
+            },
+          ],
+          to: toPhone,
+        };
+
+        await CallService.makeCall(testCallRequest, {
+          projectId: config.projectId,
+          customTwilioConfig: twilioConfig,
+        });
+      } catch (err) {
+        logger.error(err);
+        throw new BadDataException(
+          "Error making test call. Please check the twilio logs for more details",
+        );
+      }
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
     }
-
-    const testCallRequest: CallRequest = {
-      data: [
-        {
-          sayMessage: "This is a test call from OneUptime.",
-        },
-      ],
-      to: toPhone,
-    };
-
-    await CallService.makeCall(testCallRequest, {
-      projectId: config.projectId,
-      customTwilioConfig: twilioConfig,
-    });
-  } catch (err) {
-    logger.error(err);
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "Error making test call. Please check the twilio logs for more details",
-      ),
-    );
-  }
-
-  return Response.sendEmptySuccessResponse(req, res);
-});
+  },
+);
 
 export default router;

App/FeatureSet/Notification/API/Mail.ts

@@ -11,6 +11,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
 
@@ -19,70 +20,74 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/send",
   ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse) => {
-    const body: JSONObject = req.body;
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body;
 
-    const mail: EmailMessage = {
-      templateType: body["templateType"] as EmailTemplateType,
-      toEmail: new Email(body["toEmail"] as string),
-      subject: body["subject"] as string,
-      vars: body["vars"] as Dictionary<string>,
-      body: (body["body"] as string) || "",
-    };
+      const mail: EmailMessage = {
+        templateType: body["templateType"] as EmailTemplateType,
+        toEmail: new Email(body["toEmail"] as string),
+        subject: body["subject"] as string,
+        vars: body["vars"] as Dictionary<string>,
+        body: (body["body"] as string) || "",
+      };
 
-    let mailServer: EmailServer | undefined = undefined;
+      let mailServer: EmailServer | undefined = undefined;
 
-    if (hasMailServerSettingsInBody(body)) {
-      mailServer = MailService.getEmailServer(req.body);
+      if (hasMailServerSettingsInBody(body)) {
+        mailServer = MailService.getEmailServer(req.body);
+      }
+
+      await MailService.send(mail, {
+        projectId: body["projectId"]
+          ? new ObjectID(body["projectId"] as string)
+          : undefined,
+        emailServer: mailServer,
+        userOnCallLogTimelineId:
+          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+        incidentId: body["incidentId"]
+          ? new ObjectID(body["incidentId"].toString())
+          : undefined,
+        alertId: body["alertId"]
+          ? new ObjectID(body["alertId"].toString())
+          : undefined,
+        scheduledMaintenanceId: body["scheduledMaintenanceId"]
+          ? new ObjectID(body["scheduledMaintenanceId"].toString())
+          : undefined,
+        statusPageId: body["statusPageId"]
+          ? new ObjectID(body["statusPageId"].toString())
+          : undefined,
+        statusPageAnnouncementId: body["statusPageAnnouncementId"]
+          ? new ObjectID(body["statusPageAnnouncementId"].toString())
+          : undefined,
+        userId: body["userId"]
+          ? new ObjectID(body["userId"].toString())
+          : undefined,
+        onCallPolicyId: body["onCallPolicyId"]
+          ? new ObjectID(body["onCallPolicyId"].toString())
+          : undefined,
+        onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
+          ? new ObjectID(body["onCallPolicyEscalationRuleId"].toString())
+          : undefined,
+        onCallDutyPolicyExecutionLogTimelineId: body[
+          "onCallDutyPolicyExecutionLogTimelineId"
+        ]
+          ? new ObjectID(
+              body["onCallDutyPolicyExecutionLogTimelineId"].toString(),
+            )
+          : undefined,
+        onCallScheduleId: body["onCallScheduleId"]
+          ? new ObjectID(body["onCallScheduleId"].toString())
+          : undefined,
+        teamId: body["teamId"]
+          ? new ObjectID(body["teamId"].toString())
+          : undefined,
+      });
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
     }
-
-    await MailService.send(mail, {
-      projectId: body["projectId"]
-        ? new ObjectID(body["projectId"] as string)
-        : undefined,
-      emailServer: mailServer,
-      userOnCallLogTimelineId:
-        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-      incidentId: body["incidentId"]
-        ? new ObjectID(body["incidentId"].toString())
-        : undefined,
-      alertId: body["alertId"]
-        ? new ObjectID(body["alertId"].toString())
-        : undefined,
-      scheduledMaintenanceId: body["scheduledMaintenanceId"]
-        ? new ObjectID(body["scheduledMaintenanceId"].toString())
-        : undefined,
-      statusPageId: body["statusPageId"]
-        ? new ObjectID(body["statusPageId"].toString())
-        : undefined,
-      statusPageAnnouncementId: body["statusPageAnnouncementId"]
-        ? new ObjectID(body["statusPageAnnouncementId"].toString())
-        : undefined,
-      userId: body["userId"]
-        ? new ObjectID(body["userId"].toString())
-        : undefined,
-      onCallPolicyId: body["onCallPolicyId"]
-        ? new ObjectID(body["onCallPolicyId"].toString())
-        : undefined,
-      onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
-        ? new ObjectID(body["onCallPolicyEscalationRuleId"].toString())
-        : undefined,
-      onCallDutyPolicyExecutionLogTimelineId: body[
-        "onCallDutyPolicyExecutionLogTimelineId"
-      ]
-        ? new ObjectID(
-            body["onCallDutyPolicyExecutionLogTimelineId"].toString(),
-          )
-        : undefined,
-      onCallScheduleId: body["onCallScheduleId"]
-        ? new ObjectID(body["onCallScheduleId"].toString())
-        : undefined,
-      teamId: body["teamId"]
-        ? new ObjectID(body["teamId"].toString())
-        : undefined,
-    });
-
-    return Response.sendEmptySuccessResponse(req, res);
   },
 );
 

App/FeatureSet/Notification/API/PushNotification.ts

@@ -5,6 +5,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
 import { JSONObject } from "Common/Types/JSON";
@@ -15,50 +16,54 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/send",
   ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse) => {
-    const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = JSONFunctions.deserialize(req.body);
 
-    // Support both new devices format and legacy deviceTokens/deviceNames format
-    let devices: Array<{ token: string; name?: string }> = [];
+      // Support both new devices format and legacy deviceTokens/deviceNames format
+      let devices: Array<{ token: string; name?: string }> = [];
 
-    if (body["devices"]) {
-      // New format: devices as array of objects
-      devices = body["devices"] as Array<{ token: string; name?: string }>;
-    } else {
-      throw new Error("Invalid request format: 'devices' array is required.");
+      if (body["devices"]) {
+        // New format: devices as array of objects
+        devices = body["devices"] as Array<{ token: string; name?: string }>;
+      } else {
+        throw new Error("Invalid request format: 'devices' array is required.");
+      }
+
+      await PushService.send(
+        {
+          devices,
+          deviceType: (body["deviceType"] as any) || "web",
+          message: body["message"] as any,
+        },
+        {
+          projectId: (body["projectId"] as ObjectID) || undefined,
+          isSensitive: (body["isSensitive"] as boolean) || false,
+          userOnCallLogTimelineId:
+            (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+          incidentId: (body["incidentId"] as ObjectID) || undefined,
+          alertId: (body["alertId"] as ObjectID) || undefined,
+          scheduledMaintenanceId:
+            (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+          statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+          statusPageAnnouncementId:
+            (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+          userId: (body["userId"] as ObjectID) || undefined,
+          onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+          onCallPolicyEscalationRuleId:
+            (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+          onCallDutyPolicyExecutionLogTimelineId:
+            (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+            undefined,
+          onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+          teamId: (body["teamId"] as ObjectID) || undefined,
+        },
+      );
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
     }
-
-    await PushService.send(
-      {
-        devices,
-        deviceType: (body["deviceType"] as any) || "web",
-        message: body["message"] as any,
-      },
-      {
-        projectId: (body["projectId"] as ObjectID) || undefined,
-        isSensitive: (body["isSensitive"] as boolean) || false,
-        userOnCallLogTimelineId:
-          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-        incidentId: (body["incidentId"] as ObjectID) || undefined,
-        alertId: (body["alertId"] as ObjectID) || undefined,
-        scheduledMaintenanceId:
-          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-        statusPageAnnouncementId:
-          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-        userId: (body["userId"] as ObjectID) || undefined,
-        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-        onCallPolicyEscalationRuleId:
-          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-        onCallDutyPolicyExecutionLogTimelineId:
-          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-          undefined,
-        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-        teamId: (body["teamId"] as ObjectID) || undefined,
-      },
-    );
-
-    return Response.sendEmptySuccessResponse(req, res);
   },
 );
 

App/FeatureSet/Notification/API/SMS.ts

@@ -11,6 +11,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -21,130 +22,141 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/send",
   ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse) => {
-    const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = JSONFunctions.deserialize(req.body);
 
-    await SmsService.sendSms(body["to"] as Phone, body["message"] as string, {
-      projectId: body["projectId"] as ObjectID,
-      isSensitive: (body["isSensitive"] as boolean) || false,
-      userOnCallLogTimelineId:
-        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-      customTwilioConfig: body["customTwilioConfig"] as any,
-      incidentId: (body["incidentId"] as ObjectID) || undefined,
-      alertId: (body["alertId"] as ObjectID) || undefined,
-      scheduledMaintenanceId:
-        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-      statusPageAnnouncementId:
-        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-      userId: (body["userId"] as ObjectID) || undefined,
-      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-      onCallPolicyEscalationRuleId:
-        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-      onCallDutyPolicyExecutionLogTimelineId:
-        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-        undefined,
-      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-      teamId: (body["teamId"] as ObjectID) || undefined,
-    });
+      await SmsService.sendSms(body["to"] as Phone, body["message"] as string, {
+        projectId: body["projectId"] as ObjectID,
+        isSensitive: (body["isSensitive"] as boolean) || false,
+        userOnCallLogTimelineId:
+          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+        customTwilioConfig: body["customTwilioConfig"] as any,
+        incidentId: (body["incidentId"] as ObjectID) || undefined,
+        alertId: (body["alertId"] as ObjectID) || undefined,
+        scheduledMaintenanceId:
+          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+        statusPageAnnouncementId:
+          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+        userId: (body["userId"] as ObjectID) || undefined,
+        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+        onCallPolicyEscalationRuleId:
+          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+        onCallDutyPolicyExecutionLogTimelineId:
+          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+          undefined,
+        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+        teamId: (body["teamId"] as ObjectID) || undefined,
+      });
 
-    return Response.sendEmptySuccessResponse(req, res);
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
   },
 );
 
-router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
-  const body: JSONObject = req.body;
+router.post(
+  "/test",
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body;
 
-  const callSMSConfigId: ObjectID = new ObjectID(
-    body["callSMSConfigId"] as string,
-  );
+      const callSMSConfigId: ObjectID = new ObjectID(
+        body["callSMSConfigId"] as string,
+      );
 
-  const config: ProjectCallSMSConfig | null =
-    await ProjectCallSMSConfigService.findOneById({
-      id: callSMSConfigId,
-      props: {
-        isRoot: true,
-      },
-      select: {
-        _id: true,
-        twilioAccountSID: true,
-        twilioAuthToken: true,
-        twilioPrimaryPhoneNumber: true,
-        twilioSecondaryPhoneNumbers: true,
-        projectId: true,
-      },
-    });
+      const config: ProjectCallSMSConfig | null =
+        await ProjectCallSMSConfigService.findOneById({
+          id: callSMSConfigId,
+          props: {
+            isRoot: true,
+          },
+          select: {
+            _id: true,
+            twilioAccountSID: true,
+            twilioAuthToken: true,
+            twilioPrimaryPhoneNumber: true,
+            twilioSecondaryPhoneNumbers: true,
+            projectId: true,
+          },
+        });
 
-  if (!config) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "call and sms config not found for id" + callSMSConfigId.toString(),
-      ),
-    );
-  }
+      if (!config) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException(
+            "call and sms config not found for id" + callSMSConfigId.toString(),
+          ),
+        );
+      }
 
-  const toPhone: Phone = new Phone(body["toPhone"] as string);
+      const toPhone: Phone = new Phone(body["toPhone"] as string);
 
-  if (!toPhone) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("toPhone is required"),
-    );
-  }
+      if (!toPhone) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("toPhone is required"),
+        );
+      }
 
-  // if any of the twilio config is missing, we will not send make the call
+      // if any of the twilio config is missing, we will not send make the call
 
-  if (!config.twilioAccountSID) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioAccountSID is required"),
-    );
-  }
+      if (!config.twilioAccountSID) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioAccountSID is required"),
+        );
+      }
 
-  if (!config.twilioAuthToken) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioAuthToken is required"),
-    );
-  }
+      if (!config.twilioAuthToken) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioAuthToken is required"),
+        );
+      }
 
-  if (!config.twilioPrimaryPhoneNumber) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("twilioPrimaryPhoneNumber is required"),
-    );
-  }
+      if (!config.twilioPrimaryPhoneNumber) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("twilioPrimaryPhoneNumber is required"),
+        );
+      }
 
-  const twilioConfig: TwilioConfig | undefined =
-    ProjectCallSMSConfigService.toTwilioConfig(config);
+      const twilioConfig: TwilioConfig | undefined =
+        ProjectCallSMSConfigService.toTwilioConfig(config);
 
-  try {
-    if (!twilioConfig) {
-      throw new BadDataException("twilioConfig is undefined");
+      try {
+        if (!twilioConfig) {
+          throw new BadDataException("twilioConfig is undefined");
+        }
+
+        await SmsService.sendSms(
+          toPhone,
+          "This is a test SMS from OneUptime.",
+          {
+            projectId: config.projectId,
+            customTwilioConfig: twilioConfig,
+          },
+        );
+      } catch (err) {
+        logger.error(err);
+        throw new BadDataException(
+          "Failed to send test SMS. Please check the twilio logs for more details.",
+        );
+      }
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
     }
-
-    await SmsService.sendSms(toPhone, "This is a test SMS from OneUptime.", {
-      projectId: config.projectId,
-      customTwilioConfig: twilioConfig,
-    });
-  } catch (err) {
-    logger.error(err);
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "Failed to send test SMS. Please check the twilio logs for more details.",
-      ),
-    );
-  }
-
-  return Response.sendEmptySuccessResponse(req, res);
-});
+  },
+);
 
 export default router;

App/FeatureSet/Notification/API/SMTPConfig.ts

@@ -11,6 +11,7 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -18,87 +19,92 @@ import ProjectSmtpConfig from "Common/Models/DatabaseModels/ProjectSmtpConfig";
 
 const router: ExpressRouter = Express.getRouter();
 
-router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
-  const body: JSONObject = req.body;
+router.post(
+  "/test",
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body;
 
-  const smtpConfigId: ObjectID = new ObjectID(body["smtpConfigId"] as string);
+      const smtpConfigId: ObjectID = new ObjectID(
+        body["smtpConfigId"] as string,
+      );
 
-  const config: ProjectSmtpConfig | null =
-    await ProjectSMTPConfigService.findOneById({
-      id: smtpConfigId,
-      props: {
-        isRoot: true,
-      },
-      select: {
-        _id: true,
-        hostname: true,
-        port: true,
-        username: true,
-        password: true,
-        fromEmail: true,
-        fromName: true,
-        secure: true,
-        projectId: true,
-      },
-    });
+      const config: ProjectSmtpConfig | null =
+        await ProjectSMTPConfigService.findOneById({
+          id: smtpConfigId,
+          props: {
+            isRoot: true,
+          },
+          select: {
+            _id: true,
+            hostname: true,
+            port: true,
+            username: true,
+            password: true,
+            fromEmail: true,
+            fromName: true,
+            secure: true,
+            projectId: true,
+          },
+        });
 
-  if (!config) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "smtp-config not found for id" + smtpConfigId.toString(),
-      ),
-    );
-  }
+      if (!config) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException(
+            "smtp-config not found for id" + smtpConfigId.toString(),
+          ),
+        );
+      }
 
-  const toEmail: Email = new Email(body["toEmail"] as string);
+      const toEmail: Email = new Email(body["toEmail"] as string);
 
-  if (!toEmail) {
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException("toEmail is required"),
-    );
-  }
+      if (!toEmail) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("toEmail is required"),
+        );
+      }
 
-  const mail: EmailMessage = {
-    templateType: EmailTemplateType.SMTPTest,
-    toEmail: new Email(body["toEmail"] as string),
-    subject: "Test Email from OneUptime",
-    vars: {},
-    body: "",
-  };
+      const mail: EmailMessage = {
+        templateType: EmailTemplateType.SMTPTest,
+        toEmail: new Email(body["toEmail"] as string),
+        subject: "Test Email from OneUptime",
+        vars: {},
+        body: "",
+      };
 
-  const mailServer: EmailServer = {
-    id: config.id!,
-    host: config.hostname!,
-    port: config.port!,
-    username: config.username!,
-    password: config.password!,
-    fromEmail: config.fromEmail!,
-    fromName: config.fromName!,
-    secure: Boolean(config.secure),
-  };
+      const mailServer: EmailServer = {
+        id: config.id!,
+        host: config.hostname!,
+        port: config.port!,
+        username: config.username!,
+        password: config.password!,
+        fromEmail: config.fromEmail!,
+        fromName: config.fromName!,
+        secure: Boolean(config.secure),
+      };
 
-  try {
-    await MailService.send(mail, {
-      emailServer: mailServer,
-      projectId: config.projectId!,
-      timeout: 4000,
-    });
-  } catch (err) {
-    logger.error(err);
-    return Response.sendErrorResponse(
-      req,
-      res,
-      new BadDataException(
-        "Cannot send email. Please check your SMTP config. If you are using Google or Gmail, please dont since it does not support machine access to their mail servers. If you are still having issues, please uncheck SSL/TLS toggle and try again. We recommend using SendGrid or Mailgun or any large volume mail provider for SMTP.",
-      ),
-    );
-  }
+      try {
+        await MailService.send(mail, {
+          emailServer: mailServer,
+          projectId: config.projectId!,
+          timeout: 4000,
+        });
+      } catch (err) {
+        logger.error(err);
+        throw new BadDataException(
+          "Cannot send email. Please check your SMTP config. If you are using Google or Gmail, please dont since it does not support machine access to their mail servers. If you are still having issues, please uncheck SSL/TLS toggle and try again. We recommend using SendGrid or Mailgun or any large volume mail provider for SMTP.",
+        );
+      }
 
-  return Response.sendEmptySuccessResponse(req, res);
-});
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
 
 export default router;

App/FeatureSet/Notification/API/WhatsApp.ts

@@ -0,0 +1,491 @@
+import WhatsAppService from "../Services/WhatsAppService";
+import BadDataException from "Common/Types/Exception/BadDataException";
+import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
+import { JSONArray, JSONObject } from "Common/Types/JSON";
+import ObjectID from "Common/Types/ObjectID";
+import Phone from "Common/Types/Phone";
+import WhatsAppMessage from "Common/Types/WhatsApp/WhatsAppMessage";
+import {
+  WhatsAppTemplateId,
+  WhatsAppTemplateIds,
+  WhatsAppTemplateLanguage,
+} from "Common/Types/WhatsApp/WhatsAppTemplates";
+import WhatsAppStatus from "Common/Types/WhatsAppStatus";
+import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
+import WhatsAppLogService from "Common/Server/Services/WhatsAppLogService";
+import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+  NextFunction,
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+
+const router: ExpressRouter = Express.getRouter();
+
+const MAX_STATUS_MESSAGE_LENGTH: number = 500;
+
+export const mapWebhookStatusToWhatsAppStatus: (
+  status?: string,
+) => WhatsAppStatus = (status?: string): WhatsAppStatus => {
+  switch ((status || "").toLowerCase()) {
+    case "sent":
+      return WhatsAppStatus.Sent;
+    case "delivered":
+      return WhatsAppStatus.Delivered;
+    case "read":
+      return WhatsAppStatus.Read;
+    case "failed":
+      return WhatsAppStatus.Failed;
+    case "deleted":
+    case "removed":
+      return WhatsAppStatus.Deleted;
+    case "warning":
+      return WhatsAppStatus.Warning;
+    case "queued":
+    case "pending":
+      return WhatsAppStatus.Queued;
+    case "error":
+      return WhatsAppStatus.Error;
+    case "success":
+      return WhatsAppStatus.Success;
+    default:
+      return WhatsAppStatus.Unknown;
+  }
+};
+
+export const buildStatusMessage: (payload: JSONObject) => string | undefined = (
+  payload: JSONObject,
+): string | undefined => {
+  const messageParts: Array<string> = [];
+  const rawStatus: string | undefined = payload["status"]
+    ? String(payload["status"])
+    : undefined;
+
+  if (rawStatus) {
+    messageParts.push(`Status: ${rawStatus}`);
+  }
+
+  const timestamp: string | undefined = payload["timestamp"]
+    ? String(payload["timestamp"])
+    : undefined;
+
+  if (timestamp) {
+    const numericTimestamp: number = Number(timestamp);
+    if (!isNaN(numericTimestamp)) {
+      messageParts.push(
+        `Timestamp: ${new Date(numericTimestamp * 1000).toISOString()}`,
+      );
+    } else {
+      messageParts.push(`Timestamp: ${timestamp}`);
+    }
+  }
+
+  const conversation: JSONObject | undefined =
+    (payload["conversation"] as JSONObject | undefined) || undefined;
+
+  if (conversation) {
+    if (conversation["id"]) {
+      messageParts.push(`Conversation: ${conversation["id"]}`);
+    }
+
+    const origin: JSONObject | undefined =
+      (conversation["origin"] as JSONObject | undefined) || undefined;
+
+    if (origin?.["type"]) {
+      messageParts.push(`Origin: ${origin["type"]}`);
+    }
+
+    if (conversation["expiration_timestamp"]) {
+      const expirationTimestamp: number = Number(
+        conversation["expiration_timestamp"],
+      );
+
+      if (!isNaN(expirationTimestamp)) {
+        messageParts.push(
+          `Conversation expires: ${new Date(expirationTimestamp * 1000).toISOString()}`,
+        );
+      }
+    }
+  }
+
+  const pricing: JSONObject | undefined =
+    (payload["pricing"] as JSONObject | undefined) || undefined;
+
+  if (pricing) {
+    const pricingParts: Array<string> = [];
+
+    if (pricing["billable"] !== undefined) {
+      pricingParts.push(`billable=${pricing["billable"]}`);
+    }
+
+    if (pricing["category"]) {
+      pricingParts.push(`category=${pricing["category"]}`);
+    }
+
+    if (pricing["pricing_model"]) {
+      pricingParts.push(`model=${pricing["pricing_model"]}`);
+    }
+
+    if (pricingParts.length > 0) {
+      messageParts.push(`Pricing: ${pricingParts.join(", ")}`);
+    }
+  }
+
+  const errors: JSONArray | undefined =
+    (payload["errors"] as JSONArray | undefined) || undefined;
+
+  if (Array.isArray(errors) && errors.length > 0) {
+    const firstError: JSONObject = errors[0] as JSONObject;
+    const errorParts: Array<string> = [];
+
+    if (firstError["title"]) {
+      errorParts.push(String(firstError["title"]));
+    }
+
+    if (firstError["code"]) {
+      errorParts.push(`code=${firstError["code"]}`);
+    }
+
+    if (firstError["detail"]) {
+      errorParts.push(String(firstError["detail"]));
+    }
+
+    if (errorParts.length > 0) {
+      messageParts.push(`Error: ${errorParts.join(" - ")}`);
+    }
+  }
+
+  if (messageParts.length === 0) {
+    return undefined;
+  }
+
+  const statusMessage: string = messageParts.join(" | ");
+
+  if (statusMessage.length <= MAX_STATUS_MESSAGE_LENGTH) {
+    return statusMessage;
+  }
+
+  return `${statusMessage.substring(0, MAX_STATUS_MESSAGE_LENGTH - 3)}...`;
+};
+
+const updateWhatsAppLogStatus: (
+  statusPayload: JSONObject,
+) => Promise<void> = async (statusPayload: JSONObject): Promise<void> => {
+  const messageId: string | undefined = statusPayload["id"]
+    ? String(statusPayload["id"])
+    : undefined;
+
+  if (!messageId) {
+    logger.warn(
+      `[Meta WhatsApp Webhook] Received status payload without message id. Payload: ${JSON.stringify(statusPayload)}`,
+    );
+    return;
+  }
+
+  const rawStatus: string | undefined = statusPayload["status"]
+    ? String(statusPayload["status"])
+    : undefined;
+
+  const derivedStatus: WhatsAppStatus =
+    mapWebhookStatusToWhatsAppStatus(rawStatus);
+
+  const statusMessage: string | undefined = buildStatusMessage(statusPayload);
+
+  const updateResult: number = await WhatsAppLogService.updateOneBy({
+    query: {
+      whatsAppMessageId: messageId,
+    },
+    data: {
+      status: derivedStatus,
+      ...(statusMessage ? { statusMessage } : {}),
+    },
+    props: {
+      isRoot: true,
+    },
+  });
+
+  if (updateResult === 0) {
+    logger.warn(
+      `[Meta WhatsApp Webhook] No WhatsApp log found for message id ${messageId}. Payload: ${JSON.stringify(statusPayload)}`,
+    );
+  } else {
+    logger.debug(
+      `[Meta WhatsApp Webhook] Updated WhatsApp log for message id ${messageId} with status ${derivedStatus}.`,
+    );
+  }
+};
+
+const toTemplateVariables: (
+  rawVariables: JSONObject | undefined,
+) => Record<string, string> | undefined = (
+  rawVariables: JSONObject | undefined,
+): Record<string, string> | undefined => {
+  if (!rawVariables) {
+    return undefined;
+  }
+
+  const result: Record<string, string> = {};
+
+  for (const key of Object.keys(rawVariables)) {
+    const value: unknown = rawVariables[key];
+    if (value !== null && value !== undefined) {
+      result[key] = String(value);
+    }
+  }
+
+  return Object.keys(result).length > 0 ? result : undefined;
+};
+
+router.post(
+  "/send",
+  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    const body: JSONObject = req.body as JSONObject;
+
+    if (!body["to"]) {
+      throw new BadDataException("`to` phone number is required");
+    }
+
+    const toPhone: Phone = new Phone(body["to"] as string);
+
+    const message: WhatsAppMessage = {
+      to: toPhone,
+      body: (body["body"] as string) || "",
+      templateKey: (body["templateKey"] as string) || undefined,
+      templateVariables: toTemplateVariables(
+        body["templateVariables"] as JSONObject | undefined,
+      ),
+      templateLanguageCode:
+        (body["templateLanguageCode"] as string) || undefined,
+    };
+
+    try {
+      await WhatsAppService.sendWhatsApp(message, {
+        projectId: body["projectId"]
+          ? new ObjectID(body["projectId"] as string)
+          : undefined,
+        isSensitive: (body["isSensitive"] as boolean) || false,
+        userOnCallLogTimelineId: body["userOnCallLogTimelineId"]
+          ? new ObjectID(body["userOnCallLogTimelineId"] as string)
+          : undefined,
+        incidentId: body["incidentId"]
+          ? new ObjectID(body["incidentId"] as string)
+          : undefined,
+        alertId: body["alertId"]
+          ? new ObjectID(body["alertId"] as string)
+          : undefined,
+        scheduledMaintenanceId: body["scheduledMaintenanceId"]
+          ? new ObjectID(body["scheduledMaintenanceId"] as string)
+          : undefined,
+        statusPageId: body["statusPageId"]
+          ? new ObjectID(body["statusPageId"] as string)
+          : undefined,
+        statusPageAnnouncementId: body["statusPageAnnouncementId"]
+          ? new ObjectID(body["statusPageAnnouncementId"] as string)
+          : undefined,
+        userId: body["userId"]
+          ? new ObjectID(body["userId"] as string)
+          : undefined,
+        onCallPolicyId: body["onCallPolicyId"]
+          ? new ObjectID(body["onCallPolicyId"] as string)
+          : undefined,
+        onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
+          ? new ObjectID(body["onCallPolicyEscalationRuleId"] as string)
+          : undefined,
+        onCallDutyPolicyExecutionLogTimelineId: body[
+          "onCallDutyPolicyExecutionLogTimelineId"
+        ]
+          ? new ObjectID(
+              body["onCallDutyPolicyExecutionLogTimelineId"] as string,
+            )
+          : undefined,
+        onCallScheduleId: body["onCallScheduleId"]
+          ? new ObjectID(body["onCallScheduleId"] as string)
+          : undefined,
+        teamId: body["teamId"]
+          ? new ObjectID(body["teamId"] as string)
+          : undefined,
+      });
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
+
+router.get("/webhook", async (req: ExpressRequest, res: ExpressResponse) => {
+  const mode: string | undefined = req.query["hub.mode"]
+    ? String(req.query["hub.mode"])
+    : undefined;
+  const verifyToken: string | undefined = req.query["hub.verify_token"]
+    ? String(req.query["hub.verify_token"])
+    : undefined;
+  const challenge: string | undefined = req.query["hub.challenge"]
+    ? String(req.query["hub.challenge"])
+    : undefined;
+
+  if (mode === "subscribe" && challenge) {
+    const globalConfigTokenResponse: GlobalConfig | null =
+      await GlobalConfigService.findOneBy({
+        query: {
+          _id: ObjectID.getZeroObjectID().toString(),
+        },
+        props: {
+          isRoot: true,
+        },
+        select: {
+          metaWhatsAppWebhookVerifyToken: true,
+        },
+      });
+
+    const configuredVerifyToken: string | undefined =
+      globalConfigTokenResponse?.metaWhatsAppWebhookVerifyToken?.trim() ||
+      undefined;
+
+    if (!configuredVerifyToken) {
+      logger.error(
+        "Meta WhatsApp webhook verify token is not configured. Rejecting verification request.",
+      );
+      res.sendStatus(403);
+      return;
+    }
+
+    if (verifyToken === configuredVerifyToken) {
+      res.status(200).send(challenge);
+      return;
+    }
+
+    logger.warn(
+      "Meta WhatsApp webhook verification failed due to token mismatch.",
+    );
+    res.sendStatus(403);
+    return;
+  }
+
+  res.sendStatus(400);
+});
+
+router.post(
+  "/webhook",
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body as JSONObject;
+
+      if (
+        (body["object"] as string | undefined) !== "whatsapp_business_account"
+      ) {
+        logger.debug(
+          `[Meta WhatsApp Webhook] Received event for unsupported object: ${JSON.stringify(body)}`,
+        );
+        return Response.sendEmptySuccessResponse(req, res);
+      }
+
+      const entries: JSONArray | undefined = body["entry"] as
+        | JSONArray
+        | undefined;
+
+      if (!Array.isArray(entries)) {
+        logger.warn(
+          `[Meta WhatsApp Webhook] Payload did not include entries array. Payload: ${JSON.stringify(body)}`,
+        );
+        return Response.sendEmptySuccessResponse(req, res);
+      }
+
+      const statusUpdatePromises: Array<Promise<void>> = [];
+
+      for (const entry of entries) {
+        const entryObject: JSONObject = entry as JSONObject;
+        const changes: JSONArray | undefined =
+          (entryObject["changes"] as JSONArray | undefined) || undefined;
+
+        if (!Array.isArray(changes)) {
+          continue;
+        }
+
+        for (const change of changes) {
+          const changeObject: JSONObject = change as JSONObject;
+          const value: JSONObject | undefined =
+            (changeObject["value"] as JSONObject | undefined) || undefined;
+
+          if (!value) {
+            continue;
+          }
+
+          const statuses: JSONArray | undefined =
+            (value["statuses"] as JSONArray | undefined) || undefined;
+
+          if (Array.isArray(statuses)) {
+            for (const statusItem of statuses) {
+              statusUpdatePromises.push(
+                updateWhatsAppLogStatus(statusItem as JSONObject),
+              );
+            }
+          }
+        }
+      }
+
+      if (statusUpdatePromises.length > 0) {
+        await Promise.allSettled(statusUpdatePromises);
+      }
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
+
+router.post(
+  "/test",
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+    try {
+      const body: JSONObject = req.body as JSONObject;
+
+      if (!body["toPhone"]) {
+        throw new BadDataException("toPhone is required");
+      }
+
+      const toPhone: Phone = new Phone(body["toPhone"] as string);
+
+      const templateKey: WhatsAppTemplateId =
+        WhatsAppTemplateIds.TestNotification;
+
+      const templateLanguageCode: string =
+        WhatsAppTemplateLanguage[templateKey] || "en";
+
+      const message: WhatsAppMessage = {
+        to: toPhone,
+        body: "",
+        templateKey,
+        templateVariables: undefined,
+        templateLanguageCode,
+      };
+
+      try {
+        await WhatsAppService.sendWhatsApp(message, {
+          projectId: body["projectId"]
+            ? new ObjectID(body["projectId"] as string)
+            : undefined,
+          isSensitive: false,
+        });
+      } catch (err) {
+        const errorMsg: string =
+          err instanceof Error && err.message
+            ? err.message
+            : "Failed to send test WhatsApp message.";
+
+        throw new BadDataException(errorMsg);
+      }
+
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      return next(err);
+    }
+  },
+);
+
+export default router;

App/FeatureSet/Notification/Config.ts

@@ -12,6 +12,8 @@ import Phone from "Common/Types/Phone";
 
 type GetGlobalSMTPConfig = () => Promise<EmailServer | null>;
 
+export const DEFAULT_META_WHATSAPP_API_VERSION: string = "v23.0";
+
 export const getGlobalSMTPConfig: GetGlobalSMTPConfig =
   async (): Promise<EmailServer | null> => {
     const globalConfig: GlobalConfig | null =
@@ -222,6 +224,83 @@ export const SMSHighRiskCostInCents: number = process.env[
   ? parseInt(process.env["SMS_HIGH_RISK_COST_IN_CENTS"])
   : 0;
 
+export interface MetaWhatsAppConfig {
+  accessToken: string;
+  phoneNumberId: string;
+  businessAccountId?: string | undefined;
+  appId?: string | undefined;
+  appSecret?: string | undefined;
+  apiVersion?: string | undefined;
+}
+
+type GetMetaWhatsAppConfigFunction = () => Promise<MetaWhatsAppConfig>;
+
+export const getMetaWhatsAppConfig: GetMetaWhatsAppConfigFunction =
+  async (): Promise<MetaWhatsAppConfig> => {
+    const globalConfig: GlobalConfig | null =
+      await GlobalConfigService.findOneBy({
+        query: {
+          _id: ObjectID.getZeroObjectID().toString(),
+        },
+        props: {
+          isRoot: true,
+        },
+        select: {
+          metaWhatsAppAccessToken: true,
+          metaWhatsAppPhoneNumberId: true,
+          metaWhatsAppBusinessAccountId: true,
+          metaWhatsAppAppId: true,
+          metaWhatsAppAppSecret: true,
+        },
+      });
+
+    if (!globalConfig) {
+      throw new BadDataException("Global Config not found");
+    }
+
+    const accessToken: string | undefined =
+      globalConfig.metaWhatsAppAccessToken?.trim();
+    const phoneNumberId: string | undefined =
+      globalConfig.metaWhatsAppPhoneNumberId?.trim();
+
+    if (!accessToken) {
+      throw new BadDataException(
+        "Meta WhatsApp access token not configured. Please set it in the Admin Dashboard: " +
+          AdminDashboardClientURL.toString(),
+      );
+    }
+
+    if (!phoneNumberId) {
+      throw new BadDataException(
+        "Meta WhatsApp phone number ID not configured. Please set it in the Admin Dashboard: " +
+          AdminDashboardClientURL.toString(),
+      );
+    }
+
+    const businessAccountId: string | undefined =
+      globalConfig.metaWhatsAppBusinessAccountId?.trim() || undefined;
+    const appId: string | undefined =
+      globalConfig.metaWhatsAppAppId?.trim() || undefined;
+    const appSecret: string | undefined =
+      globalConfig.metaWhatsAppAppSecret?.trim() || undefined;
+    const apiVersion: string = DEFAULT_META_WHATSAPP_API_VERSION;
+
+    return {
+      accessToken,
+      phoneNumberId,
+      businessAccountId,
+      appId,
+      appSecret,
+      apiVersion,
+    };
+  };
+
+export const WhatsAppTextDefaultCostInCents: number = process.env[
+  "WHATSAPP_TEXT_DEFAULT_COST_IN_CENTS"
+]
+  ? parseInt(process.env["WHATSAPP_TEXT_DEFAULT_COST_IN_CENTS"])
+  : 0;
+
 export const CallHighRiskCostInCentsPerMinute: number = process.env[
   "CALL_HIGH_RISK_COST_IN_CENTS_PER_MINUTE"
 ]

App/FeatureSet/Notification/Index.ts

@@ -2,6 +2,7 @@ import CallAPI from "./API/Call";
 // API
 import MailAPI from "./API/Mail";
 import SmsAPI from "./API/SMS";
+import WhatsAppAPI from "./API/WhatsApp";
 import PushNotificationAPI from "./API/PushNotification";
 import SMTPConfigAPI from "./API/SMTPConfig";
 import "./Utils/Handlebars";
@@ -16,6 +17,7 @@ const NotificationFeatureSet: FeatureSet = {
 
     app.use([`/${APP_NAME}/email`, "/email"], MailAPI);
     app.use([`/${APP_NAME}/sms`, "/sms"], SmsAPI);
+    app.use([`/${APP_NAME}/whatsapp`, "/whatsapp"], WhatsAppAPI);
     app.use([`/${APP_NAME}/push`, "/push"], PushNotificationAPI);
     app.use([`/${APP_NAME}/call`, "/call"], CallAPI);
     app.use([`/${APP_NAME}/smtp-config`, "/smtp-config"], SMTPConfigAPI);

App/FeatureSet/Notification/Services/MailService.ts

@@ -37,11 +37,49 @@ class TransporterPool {
   private static semaphore: Map<string, number> = new Map();
   private static readonly MAX_CONCURRENT_CONNECTIONS = 100;
 
+  private static resolveConnectionSettings(emailServer: EmailServer): {
+    portNumber: number;
+    wantsSecureConnection: boolean;
+    secureConnection: boolean;
+    requireTLS: boolean;
+    mode: "implicit-tls" | "starttls" | "plain";
+  } {
+    const portNumber: number = emailServer.port.toNumber();
+    const wantsSecureConnection: boolean = emailServer.secure;
+    const isImplicitTLSPort: boolean = portNumber === 465;
+
+    const secureConnection: boolean = isImplicitTLSPort;
+    const requireTLS: boolean = wantsSecureConnection && !isImplicitTLSPort;
+
+    let mode: "implicit-tls" | "starttls" | "plain" = "plain";
+
+    if (secureConnection) {
+      mode = "implicit-tls";
+    } else if (requireTLS) {
+      mode = "starttls";
+    }
+
+    return {
+      portNumber,
+      wantsSecureConnection,
+      secureConnection,
+      requireTLS,
+      mode,
+    };
+  }
+
+  private static getPoolKey(emailServer: EmailServer): string {
+    const { portNumber, mode } = this.resolveConnectionSettings(emailServer);
+    const username: string = emailServer.username || "noauth";
+
+    return `${emailServer.host.toString()}:${portNumber}:${username}:${mode}`;
+  }
+
   public static getTransporter(
     emailServer: EmailServer,
     options: { timeout?: number | undefined },
   ): Transporter {
-    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+    const key: string = this.getPoolKey(emailServer);
 
     if (!this.pools.has(key)) {
       const transporter: Transporter = this.createTransporter(
@@ -59,9 +97,12 @@ class TransporterPool {
     emailServer: EmailServer,
     options: { timeout?: number | undefined },
   ): Transporter {
+    const { portNumber, wantsSecureConnection, secureConnection, requireTLS } =
+      this.resolveConnectionSettings(emailServer);
+
     let tlsOptions: tls.ConnectionOptions | undefined = undefined;
 
-    if (!emailServer.secure) {
+    if (!wantsSecureConnection) {
       tlsOptions = {
         rejectUnauthorized: false,
       };
@@ -69,8 +110,9 @@ class TransporterPool {
 
     return nodemailer.createTransport({
       host: emailServer.host.toString(),
-      port: emailServer.port.toNumber(),
-      secure: emailServer.secure,
+      port: portNumber,
+      secure: secureConnection,
+      requireTLS,
       tls: tlsOptions,
       auth:
         emailServer.username && emailServer.password
@@ -88,7 +130,7 @@ class TransporterPool {
   public static async acquireConnection(
     emailServer: EmailServer,
   ): Promise<void> {
-    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+    const key: string = this.getPoolKey(emailServer);
 
     while ((this.semaphore.get(key) || 0) >= this.MAX_CONCURRENT_CONNECTIONS) {
       await new Promise<void>((resolve: () => void) => {
@@ -100,7 +142,7 @@ class TransporterPool {
   }
 
   public static releaseConnection(emailServer: EmailServer): void {
-    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
+    const key: string = this.getPoolKey(emailServer);
     const current: number = this.semaphore.get(key) || 0;
     this.semaphore.set(key, Math.max(0, current - 1));
   }

App/FeatureSet/Notification/Services/WhatsAppService.ts

@@ -0,0 +1,497 @@
+import {
+  WhatsAppTextDefaultCostInCents,
+  getMetaWhatsAppConfig,
+  MetaWhatsAppConfig,
+  DEFAULT_META_WHATSAPP_API_VERSION,
+} from "../Config";
+import BadDataException from "Common/Types/Exception/BadDataException";
+import ObjectID from "Common/Types/ObjectID";
+import UserNotificationStatus from "Common/Types/UserNotification/UserNotificationStatus";
+import WhatsAppMessage from "Common/Types/WhatsApp/WhatsAppMessage";
+import WhatsAppStatus from "Common/Types/WhatsAppStatus";
+import {
+  AuthenticationTemplates,
+  WhatsAppTemplateId,
+} from "Common/Types/WhatsApp/WhatsAppTemplates";
+import { JSONArray, JSONObject } from "Common/Types/JSON";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
+import NotificationService from "Common/Server/Services/NotificationService";
+import ProjectService from "Common/Server/Services/ProjectService";
+import UserOnCallLogTimelineService from "Common/Server/Services/UserOnCallLogTimelineService";
+import WhatsAppLogService from "Common/Server/Services/WhatsAppLogService";
+import logger from "Common/Server/Utils/Logger";
+import Project from "Common/Models/DatabaseModels/Project";
+import WhatsAppLog from "Common/Models/DatabaseModels/WhatsAppLog";
+import API from "Common/Utils/API";
+import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
+import HTTPResponse from "Common/Types/API/HTTPResponse";
+import Protocol from "Common/Types/API/Protocol";
+import Route from "Common/Types/API/Route";
+import URL from "Common/Types/API/URL";
+
+const SENSITIVE_MESSAGE_PLACEHOLDER: string =
+  "This message is sensitive and is not logged";
+
+export default class WhatsAppService {
+  public static async sendWhatsApp(
+    message: WhatsAppMessage,
+    options: {
+      projectId?: ObjectID | undefined;
+      isSensitive?: boolean | undefined;
+      userOnCallLogTimelineId?: ObjectID | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
+    } = {},
+  ): Promise<void> {
+    let sendError: Error | null = null;
+    const whatsAppLog: WhatsAppLog = new WhatsAppLog();
+
+    try {
+      if (!message.to) {
+        throw new BadDataException(
+          "WhatsApp recipient phone number is required",
+        );
+      }
+
+      if (!message.body && !message.templateKey) {
+        throw new BadDataException(
+          "Either WhatsApp message body or template key must be provided",
+        );
+      }
+
+      const isSensitiveMessage: boolean = Boolean(options.isSensitive);
+      const messageSummary: string = isSensitiveMessage
+        ? SENSITIVE_MESSAGE_PLACEHOLDER
+        : message.body ||
+          (message.templateKey
+            ? `Template: ${message.templateKey}${
+                message.templateVariables
+                  ? " Variables: " + JSON.stringify(message.templateVariables)
+                  : ""
+              }`
+            : "");
+
+      whatsAppLog.toNumber = message.to;
+      whatsAppLog.messageText = messageSummary;
+      whatsAppLog.whatsAppCostInUSDCents = 0;
+
+      if (options.projectId) {
+        whatsAppLog.projectId = options.projectId;
+      }
+
+      if (options.incidentId) {
+        whatsAppLog.incidentId = options.incidentId;
+      }
+
+      if (options.alertId) {
+        whatsAppLog.alertId = options.alertId;
+      }
+
+      if (options.scheduledMaintenanceId) {
+        whatsAppLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
+      }
+
+      if (options.statusPageId) {
+        whatsAppLog.statusPageId = options.statusPageId;
+      }
+
+      if (options.statusPageAnnouncementId) {
+        whatsAppLog.statusPageAnnouncementId = options.statusPageAnnouncementId;
+      }
+
+      if (options.userId) {
+        whatsAppLog.userId = options.userId;
+      }
+
+      if (options.teamId) {
+        whatsAppLog.teamId = options.teamId;
+      }
+
+      if (options.onCallPolicyId) {
+        whatsAppLog.onCallDutyPolicyId = options.onCallPolicyId;
+      }
+
+      if (options.onCallPolicyEscalationRuleId) {
+        whatsAppLog.onCallDutyPolicyEscalationRuleId =
+          options.onCallPolicyEscalationRuleId;
+      }
+
+      if (options.onCallScheduleId) {
+        whatsAppLog.onCallDutyPolicyScheduleId = options.onCallScheduleId;
+      }
+
+      const config: MetaWhatsAppConfig = await getMetaWhatsAppConfig();
+
+      let messageCost: number = 0;
+      const shouldChargeForMessage: boolean = IsBillingEnabled;
+
+      if (shouldChargeForMessage) {
+        messageCost = WhatsAppTextDefaultCostInCents / 100;
+      }
+
+      let project: Project | null = null;
+
+      if (options.projectId) {
+        project = await ProjectService.findOneById({
+          id: options.projectId,
+          select: {
+            smsOrCallCurrentBalanceInUSDCents: true,
+            lowCallAndSMSBalanceNotificationSentToOwners: true,
+            name: true,
+            notEnabledSmsOrCallNotificationSentToOwners: true,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+
+        if (!project) {
+          whatsAppLog.status = WhatsAppStatus.Error;
+          whatsAppLog.statusMessage = `Project ${options.projectId.toString()} not found.`;
+          logger.error(whatsAppLog.statusMessage);
+          await WhatsAppLogService.create({
+            data: whatsAppLog,
+            props: {
+              isRoot: true,
+            },
+          });
+          return;
+        }
+
+        if (shouldChargeForMessage) {
+          let updatedBalance: number =
+            project.smsOrCallCurrentBalanceInUSDCents || 0;
+
+          try {
+            updatedBalance = await NotificationService.rechargeIfBalanceIsLow(
+              project.id!,
+            );
+          } catch (err) {
+            logger.error(err);
+          }
+
+          project.smsOrCallCurrentBalanceInUSDCents = updatedBalance;
+
+          if (!project.smsOrCallCurrentBalanceInUSDCents) {
+            whatsAppLog.status = WhatsAppStatus.LowBalance;
+            whatsAppLog.statusMessage = `Project ${options.projectId.toString()} does not have enough balance for WhatsApp messages.`;
+            logger.error(whatsAppLog.statusMessage);
+
+            await WhatsAppLogService.create({
+              data: whatsAppLog,
+              props: {
+                isRoot: true,
+              },
+            });
+
+            if (!project.lowCallAndSMSBalanceNotificationSentToOwners) {
+              await ProjectService.updateOneById({
+                id: project.id!,
+                data: {
+                  lowCallAndSMSBalanceNotificationSentToOwners: true,
+                },
+                props: {
+                  isRoot: true,
+                },
+              });
+
+              await ProjectService.sendEmailToProjectOwners(
+                project.id!,
+                `Low WhatsApp message balance for ${project.name || ""}`,
+                `We tried to send a WhatsApp message to ${message.to.toString()} with message:<br/><br/>${messageSummary}<br/><br/>The message was not sent because your project does not have enough balance for WhatsApp messages. Current balance is ${
+                  (project.smsOrCallCurrentBalanceInUSDCents || 0) / 100
+                } USD. Required balance for this message is ${messageCost} USD. Please enable auto recharge or recharge manually.`,
+              );
+            }
+            return;
+          }
+
+          if (project.smsOrCallCurrentBalanceInUSDCents < messageCost * 100) {
+            whatsAppLog.status = WhatsAppStatus.LowBalance;
+            whatsAppLog.statusMessage = `Project does not have enough balance to send WhatsApp message. Current balance is ${
+              project.smsOrCallCurrentBalanceInUSDCents / 100
+            } USD. Required balance is ${messageCost} USD.`;
+            logger.error(whatsAppLog.statusMessage);
+
+            await WhatsAppLogService.create({
+              data: whatsAppLog,
+              props: {
+                isRoot: true,
+              },
+            });
+
+            if (!project.lowCallAndSMSBalanceNotificationSentToOwners) {
+              await ProjectService.updateOneById({
+                id: project.id!,
+                data: {
+                  lowCallAndSMSBalanceNotificationSentToOwners: true,
+                },
+                props: {
+                  isRoot: true,
+                },
+              });
+
+              await ProjectService.sendEmailToProjectOwners(
+                project.id!,
+                `Low WhatsApp message balance for ${project.name || ""}`,
+                `We tried to send a WhatsApp message to ${message.to.toString()} with message:<br/><br/>${messageSummary}<br/><br/>The message was not sent because your project does not have enough balance for WhatsApp messages. Current balance is ${
+                  project.smsOrCallCurrentBalanceInUSDCents / 100
+                } USD. Required balance is ${messageCost} USD. Please enable auto recharge or recharge manually.`,
+              );
+            }
+            return;
+          }
+        }
+      }
+
+      const payload: JSONObject = {
+        messaging_product: "whatsapp",
+        recipient_type: "individual",
+        to: message.to.toString(),
+      } as JSONObject;
+
+      if (!message.templateKey) {
+        throw new BadDataException("WhatsApp message template key is required");
+      }
+
+      if (message.templateKey) {
+        const template: JSONObject = {
+          name: message.templateKey,
+          language: {
+            code: message.templateLanguageCode || "en",
+          },
+        } as JSONObject;
+
+        const components: JSONArray = [];
+
+        if (
+          message.templateVariables &&
+          Object.keys(message.templateVariables).length > 0
+        ) {
+          const parameters: JSONArray = [];
+
+          for (const [key, value] of Object.entries(
+            message.templateVariables,
+          )) {
+            parameters.push({
+              type: "text",
+              parameter_name: key,
+              text: value,
+            } as JSONObject);
+          }
+
+          if (parameters.length > 0) {
+            components.push({
+              type: "body",
+              parameters,
+            } as JSONObject);
+          }
+        }
+
+        /*
+         * Check if this is an authentication template
+         * Authentication templates may have special requirements including button components
+         */
+        const isAuthTemplate: boolean = AuthenticationTemplates.has(
+          message.templateKey as WhatsAppTemplateId,
+        );
+
+        if (isAuthTemplate) {
+          logger.info(
+            `Sending authentication template: ${message.templateKey}`,
+          );
+
+          /*
+           * Authentication templates in WhatsApp may have a button component for "Copy Code"
+           * If the template was created with a button, we need to provide button parameters
+           */
+          if (message.templateVariables) {
+            const otpCode: string | undefined =
+              message.templateVariables["1"] ||
+              message.templateVariables["otp"] ||
+              message.templateVariables["code"];
+
+            if (otpCode) {
+              /*
+               * Add button component - the index should match the button position in the template
+               * Usually authentication templates have the button as the first (and only) button
+               */
+              components.push({
+                type: "button",
+                sub_type: "url",
+                index: 0,
+                parameters: [
+                  {
+                    type: "text",
+                    text: otpCode,
+                  },
+                ],
+              } as JSONObject);
+            }
+          }
+        }
+
+        if (components.length > 0) {
+          template["components"] = components;
+        }
+
+        payload["type"] = "template";
+        payload["template"] = template;
+      } else {
+        payload["type"] = "text";
+        payload["text"] = {
+          body: message.body || "",
+        } as JSONObject;
+      }
+
+      const apiVersion: string =
+        config.apiVersion?.trim() || DEFAULT_META_WHATSAPP_API_VERSION;
+
+      const url: URL = new URL(
+        Protocol.HTTPS,
+        "graph.facebook.com",
+        new Route(`${apiVersion}/${config.phoneNumberId}/messages`),
+      );
+
+      logger.debug(`WhatsApp API request: ${JSON.stringify(payload)}`);
+
+      const response: HTTPResponse<JSONObject> | HTTPErrorResponse =
+        await API.post<JSONObject>({
+          url,
+          data: payload,
+          headers: {
+            Authorization: `Bearer ${config.accessToken}`,
+            "Content-Type": "application/json",
+          },
+        });
+
+      if (response instanceof HTTPErrorResponse) {
+        logger.error("Failed to send WhatsApp message.");
+        logger.error(response);
+        const responseDataAsJSONObject: JSONObject = response.data;
+        const responseJsonAsJSONObject: JSONObject | undefined =
+          (response.jsonData as JSONObject | undefined) || undefined;
+
+        // Log full error details for debugging
+        const errorObject: JSONObject | undefined =
+          (responseDataAsJSONObject["error"] as JSONObject | undefined) ||
+          (responseJsonAsJSONObject?.["error"] as JSONObject | undefined);
+
+        if (errorObject) {
+          logger.error("WhatsApp API Error Details:");
+          logger.error(JSON.stringify(errorObject, null, 2));
+        }
+
+        const detailedErrorMessage: string | undefined =
+          ((responseDataAsJSONObject["error"] as JSONObject | undefined)?.[
+            "message"
+          ] as string | undefined) ||
+          ((responseJsonAsJSONObject?.["error"] as JSONObject | undefined)?.[
+            "message"
+          ] as string | undefined);
+
+        throw new BadDataException(
+          detailedErrorMessage || "Failed to send WhatsApp message.",
+        );
+      }
+
+      const responseData: JSONObject = (response.jsonData || {}) as JSONObject;
+
+      let messageId: string | undefined = undefined;
+      const messagesArray: JSONArray | undefined =
+        (responseData["messages"] as JSONArray) || undefined;
+
+      if (Array.isArray(messagesArray) && messagesArray.length > 0) {
+        const firstMessage: JSONObject = messagesArray[0] as JSONObject;
+        if (firstMessage["id"]) {
+          messageId = firstMessage["id"] as string;
+        }
+      }
+
+      if (messageId) {
+        whatsAppLog.whatsAppMessageId = messageId;
+      }
+
+      whatsAppLog.status = WhatsAppStatus.Sent;
+      whatsAppLog.statusMessage = messageId
+        ? `Message ID: ${messageId}`
+        : "WhatsApp message sent successfully";
+
+      if (shouldChargeForMessage && project) {
+        const deduction: number = Math.floor(messageCost * 100);
+        whatsAppLog.whatsAppCostInUSDCents = deduction;
+
+        project.smsOrCallCurrentBalanceInUSDCents = Math.max(
+          0,
+          Math.floor(
+            (project.smsOrCallCurrentBalanceInUSDCents || 0) - deduction,
+          ),
+        );
+
+        await ProjectService.updateOneById({
+          id: project.id!,
+          data: {
+            smsOrCallCurrentBalanceInUSDCents:
+              project.smsOrCallCurrentBalanceInUSDCents,
+            notEnabledSmsOrCallNotificationSentToOwners: false,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+      }
+    } catch (error: any) {
+      logger.error("Failed to send WhatsApp message.");
+      logger.error(error);
+      whatsAppLog.whatsAppCostInUSDCents = 0;
+      whatsAppLog.status = WhatsAppStatus.Error;
+      const errorMessage: string =
+        error && error.message ? error.message.toString() : `${error}`;
+      whatsAppLog.statusMessage = errorMessage;
+
+      sendError = error;
+    }
+
+    if (options.projectId) {
+      await WhatsAppLogService.create({
+        data: whatsAppLog,
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
+    if (options.userOnCallLogTimelineId) {
+      await UserOnCallLogTimelineService.updateOneById({
+        id: options.userOnCallLogTimelineId,
+        data: {
+          status: [
+            WhatsAppStatus.Success,
+            WhatsAppStatus.Sent,
+            WhatsAppStatus.Delivered,
+            WhatsAppStatus.Read,
+          ].includes(whatsAppLog.status || WhatsAppStatus.Error)
+            ? UserNotificationStatus.Sent
+            : UserNotificationStatus.Error,
+          statusMessage: whatsAppLog.statusMessage,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
+    if (sendError) {
+      throw sendError;
+    }
+  }
+}

App/package-lock.json

@@ -41,7 +41,7 @@
         "@elastic/elasticsearch": "^8.12.1",
         "@monaco-editor/react": "^4.4.6",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/api-logs": "^0.52.1",
+        "@opentelemetry/api-logs": "^0.206.0",
         "@opentelemetry/context-zone": "^1.25.1",
         "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
         "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
@@ -59,7 +59,9 @@
         "@opentelemetry/sdk-trace-web": "^1.25.1",
         "@opentelemetry/semantic-conventions": "^1.26.0",
         "@remixicon/react": "^4.2.0",
+        "@simplewebauthn/server": "^13.2.2",
         "@tippyjs/react": "^4.2.6",
+        "@types/archiver": "^6.0.3",
         "@types/crypto-js": "^4.2.2",
         "@types/qrcode": "^1.5.5",
         "@types/react-highlight": "^0.12.8",
@@ -68,8 +70,10 @@
         "@types/web-push": "^3.6.4",
         "acme-client": "^5.3.0",
         "airtable": "^0.12.2",
-        "axios": "^1.7.2",
-        "bullmq": "^5.3.3",
+        "archiver": "^7.0.1",
+        "axios": "^1.12.0",
+        "botbuilder": "^4.23.3",
+        "bullmq": "^5.61.0",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "cron-parser": "^4.8.1",
@@ -90,11 +94,11 @@
         "moment": "^2.30.1",
         "moment-timezone": "^0.5.45",
         "node-cron": "^3.0.3",
-        "nodemailer": "^6.9.10",
+        "nodemailer": "^7.0.7",
         "otpauth": "^9.3.1",
         "pg": "^8.7.3",
-        "playwright": "^1.50.0",
-        "posthog-js": "^1.139.6",
+        "playwright": "^1.56.0",
+        "posthog-js": "^1.275.3",
         "prop-types": "^15.8.1",
         "qrcode": "^1.5.3",
         "react": "^18.3.1",
@@ -109,7 +113,7 @@
         "react-router-dom": "^6.24.1",
         "react-select": "^5.4.0",
         "react-spinners": "^0.14.1",
-        "react-syntax-highlighter": "^15.5.0",
+        "react-syntax-highlighter": "^16.0.0",
         "react-toggle": "^4.1.3",
         "reactflow": "^11.11.4",
         "recharts": "^2.12.7",
@@ -124,13 +128,13 @@
         "tailwind-merge": "^2.5.2",
         "tippy.js": "^6.3.7",
         "twilio": "^4.22.0",
-        "typeorm": "^0.3.20",
+        "typeorm": "^0.3.26",
         "typeorm-extension": "^2.2.13",
         "universal-cookie": "^7.2.1",
         "use-async-effect": "^2.2.6",
         "uuid": "^8.3.2",
         "web-push": "^3.6.7",
-        "zod": "^3.25.30"
+        "zod": "^3.25.76"
       },
       "devDependencies": {
         "@faker-js/faker": "^8.0.2",
@@ -253,89 +257,20 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -511,19 +446,21 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -538,109 +475,28 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
-      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
-        "@babel/types": "^7.23.6"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.5"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -811,14 +667,15 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -846,14 +703,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1745,15 +1602,17 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.1.tgz",
+      "integrity": "sha512-hU4EGxxt+j7TQijx1oYdAjw4xuIp1wRQSsbMFwSthCWeBQur1eF+qJ5iQ5sN3Tw8YRzQNKb8jszgBdMDVqwJcw==",
+      "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.4",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -1863,21 +1722,23 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1948,6 +1809,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -2108,6 +1982,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -2136,10 +2011,11 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2201,6 +2077,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2231,6 +2108,20 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -2240,9 +2131,10 @@
       }
     },
     "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -2286,6 +2178,51 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -2389,9 +2326,10 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -2408,10 +2346,11 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2433,15 +2372,16 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -2452,12 +2392,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -2511,14 +2454,24 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2533,6 +2486,19 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -2587,11 +2553,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2642,10 +2609,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2653,10 +2621,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -2665,9 +2637,10 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -2826,6 +2799,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3523,7 +3497,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
@@ -3780,6 +3755,15 @@
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -3787,12 +3771,13 @@
       "dev": true
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -3803,6 +3788,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -3811,6 +3797,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -3875,9 +3862,10 @@
       "dev": true
     },
     "node_modules/nodemailer": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.7.tgz",
-      "integrity": "sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz",
+      "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==",
+      "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -4120,10 +4108,11 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -4627,20 +4616,12 @@
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4910,9 +4891,10 @@
       }
     },
     "node_modules/xml-crypto": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.2.0.tgz",
-      "integrity": "sha512-qVurBUOQrmvlgmZqIVBqmb06TD2a/PpEUfFPgD7BuBfjmoH4zgkqaWSIJrnymlCvM2GGt9x+XtJFA+ttoAufqg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.2.1.tgz",
+      "integrity": "sha512-0GUNbPtQt+PLMsC5HoZRONX+K6NBJEqpXe/lsvrFj0EqfpGPpVfJKGE7a5jCg8s2+Wkrf/2U1G41kIH+zC9eyQ==",
+      "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.8",
         "xpath": "0.0.32"

App/package.json

@@ -18,8 +18,6 @@
   "dependencies": {
     "@sendgrid/mail": "^8.1.0",
     "Common": "file:../Common",
-    
-
     "ejs": "^3.1.9",
     "handlebars": "^4.7.8",
     "nodemailer": "^6.9.7",

Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -3,6 +3,8 @@ import Route from "../../../Types/API/Route";
 import AnalyticsTableEngine from "../../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
+import Projection from "../../../Types/AnalyticsDatabase/Projection";
+import MaterializedView from "../../../Types/AnalyticsDatabase/MaterializedView";
 import {
   ColumnAccessControl,
   TableAccessControl,
@@ -40,6 +42,8 @@ export default class AnalyticsBaseModel extends CommonModel {
     enableWorkflowOn?: EnableWorkflowOn | undefined;
     enableRealtimeEventsOn?: EnableRealtimeEventsOn | undefined;
     partitionKey: string;
+    projections?: Array<Projection> | undefined;
+    materializedViews?: Array<MaterializedView> | undefined;
   }) {
     super({
       tableColumns: data.tableColumns,
@@ -140,6 +144,8 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.crudApiPath = data.crudApiPath;
     this.enableRealtimeEventsOn = data.enableRealtimeEventsOn;
     this.partitionKey = data.partitionKey;
+    this.projections = data.projections || [];
+    this.materializedViews = data.materializedViews || [];
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;
@@ -250,6 +256,22 @@ export default class AnalyticsBaseModel extends CommonModel {
     this._crudApiPath = v;
   }
 
+  private _projections: Array<Projection> = [];
+  public get projections(): Array<Projection> {
+    return this._projections;
+  }
+  public set projections(v: Array<Projection>) {
+    this._projections = v;
+  }
+
+  private _materializedViews: Array<MaterializedView> = [];
+  public get materializedViews(): Array<MaterializedView> {
+    return this._materializedViews;
+  }
+  public set materializedViews(v: Array<MaterializedView>) {
+    this._materializedViews = v;
+  }
+
   public getTenantColumn(): AnalyticsTableColumn | null {
     const column: AnalyticsTableColumn | undefined = this.tableColumns.find(
       (column: AnalyticsTableColumn) => {

Common/Models/AnalyticsModels/ExceptionInstance.ts

@@ -9,6 +9,332 @@ import { SpanStatus } from "./Span";
 
 export default class ExceptionInstance extends AnalyticsBaseModel {
   public constructor() {
+    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "projectId",
+      title: "Project ID",
+      description: "ID of project",
+      required: true,
+      type: TableColumnType.ObjectID,
+      isTenantId: true,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceId",
+      title: "Service ID",
+      description: "ID of the Service which created the log",
+      required: true,
+      type: TableColumnType.ObjectID,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "time",
+      title: "Time",
+      description: "When was the log created?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "timeUnixNano",
+      title: "Time (in Unix Nano)",
+      description: "When was the log created?",
+      required: true,
+      type: TableColumnType.LongNumber,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const exceptionTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "exceptionType",
+      title: "Exception Type",
+      description: "Exception Type", // Examples: java.net.ConnectException; OSError; etc.
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const stackTraceColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "stackTrace",
+      title: "Stack Trace",
+      description: "Exception Stack Trace", // Examples: Division by zero; Can't convert 'int' object to str implicitly
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const messageColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "message",
+      title: "Exception Message",
+      description: "Exception Message", // Examples: Division by zero; Can't convert 'int' object to str implicitly
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const spanStatusCodeColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
+      {
+        key: "spanStatusCode",
+        title: "Span Status Code",
+        description: "Span Status Code",
+        required: false,
+        type: TableColumnType.Number,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryException,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryException,
+          ],
+          update: [],
+        },
+      },
+    );
+
+    const escapedColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "escaped",
+      title: "Exception Escaped",
+      description: "Exception Escaped", // SHOULD be set to true if the exception event is recorded at a point where it is known that the exception is escaping the scope of the span.
+      required: false,
+      type: TableColumnType.Boolean,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "traceId",
+      title: "Trace ID",
+      description: "ID of the trace",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "spanId",
+      title: "Span ID",
+      description: "ID of the span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const fingerprintColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "fingerprint",
+      title: "Fingerprint",
+      description: "Fingerprint of the exception",
+      required: true,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
+    const spanNameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "spanName",
+      title: "Span Name",
+      description: "Name of the span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributes",
+      title: "Attributes",
+      description: "Attributes",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.JSON,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
     super({
       tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -45,330 +371,22 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       },
       crudApiPath: new Route("/exceptions"),
       tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "serviceId",
-          title: "Service ID",
-          description: "ID of the Service which created the log",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "time",
-          title: "Time",
-          description: "When was the log created?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "timeUnixNano",
-          title: "Time (in Unix Nano)",
-          description: "When was the log created?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "exceptionType",
-          title: "Exception Type",
-          description: "Exception Type", // Examples: java.net.ConnectException; OSError; etc.
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "stackTrace",
-          title: "Stack Trace",
-          description: "Exception Stack Trace", // Examples: Division by zero; Can't convert 'int' object to str implicitly
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "message",
-          title: "Exception Message",
-          description: "Exception Message", // Examples: Division by zero; Can't convert 'int' object to str implicitly
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "spanStatusCode",
-          title: "Span Status Code",
-          description: "Span Status Code",
-          required: false,
-          type: TableColumnType.Number,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "escaped",
-          title: "Exception Escaped",
-          description: "Exception Escaped", // SHOULD be set to true if the exception event is recorded at a point where it is known that the exception is escaping the scope of the span.
-          required: false,
-          type: TableColumnType.Boolean,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "traceId",
-          title: "Trace ID",
-          description: "ID of the trace",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "spanId",
-          title: "Span ID",
-          description: "ID of the span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "fingerprint",
-          title: "Fingerprint",
-          description: "Fingerprint of the exception",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "spanName",
-          title: "Span Name",
-          description: "Name of the span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "attributes",
-          title: "Attributes",
-          description: "Attributes",
-          required: true,
-          defaultValue: {},
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryException,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryException,
-            ],
-            update: [],
-          },
-        }),
+        projectIdColumn,
+        serviceIdColumn,
+        timeColumn,
+        timeUnixNanoColumn,
+        exceptionTypeColumn,
+        stackTraceColumn,
+        messageColumn,
+        spanStatusCodeColumn,
+        escapedColumn,
+        traceIdColumn,
+        spanIdColumn,
+        fingerprintColumn,
+        spanNameColumn,
+        attributesColumn,
       ],
+      projections: [],
       sortKeys: ["projectId", "time", "serviceId", "fingerprint"],
       primaryKeys: ["projectId", "time", "serviceId", "fingerprint"],
       partitionKey: "sipHash64(projectId) % 16",

Common/Models/AnalyticsModels/Index.ts

@@ -2,7 +2,6 @@ import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Log from "./Log";
 import Metric from "./Metric";
 import Span from "./Span";
-import TelemetryAttribute from "./TelemetryAttribute";
 import ExceptionInstance from "./ExceptionInstance";
 import MonitorLog from "./MonitorLog";
 
@@ -10,7 +9,6 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   Log,
   Span,
   Metric,
-  TelemetryAttribute,
   ExceptionInstance,
   MonitorLog,
 ];

Common/Models/AnalyticsModels/Log.ts

@@ -10,6 +10,264 @@ import LogSeverity from "../../Types/Log/LogSeverity";
 
 export default class Log extends AnalyticsBaseModel {
   public constructor() {
+    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "projectId",
+      title: "Project ID",
+      description: "ID of project",
+      required: true,
+      type: TableColumnType.ObjectID,
+      isTenantId: true,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceId",
+      title: "Service ID",
+      description: "ID of the Service which created the log",
+      required: true,
+      type: TableColumnType.ObjectID,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "time",
+      title: "Time",
+      description: "When was the log created?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "timeUnixNano",
+      title: "Time (in Unix Nano)",
+      description: "When was the log created?",
+      required: true,
+      type: TableColumnType.LongNumber,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const severityTextColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "severityText",
+      title: "Severity Text",
+      description: "Log Severity Text",
+      required: true,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const severityNumberColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
+      {
+        key: "severityNumber",
+        title: "Severity Number",
+        description: "Log Severity Number",
+        required: true,
+        type: TableColumnType.Number,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      },
+    );
+
+    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributes",
+      title: "Attributes",
+      description: "Attributes",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.JSON,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributeKeys",
+      title: "Attribute Keys",
+      description: "Attribute keys extracted from attributes",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.ArrayText,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "traceId",
+      title: "Trace ID",
+      description: "ID of the trace",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "spanId",
+      title: "Span ID",
+      description: "ID of the span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const bodyColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "body",
+      title: "Log Body",
+      description: "Body of the Log",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
     super({
       tableName: "LogItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -43,238 +301,19 @@ export default class Log extends AnalyticsBaseModel {
       pluralName: "Logs",
       crudApiPath: new Route("/logs"),
       tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "serviceId",
-          title: "Service ID",
-          description: "ID of the Service which created the log",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "time",
-          title: "Time",
-          description: "When was the log created?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "timeUnixNano",
-          title: "Time (in Unix Nano)",
-          description: "When was the log created?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "severityText",
-          title: "Severity Text",
-          description: "Log Severity Text",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "severityNumber",
-          title: "Severity Number",
-          description: "Log Severity Number",
-          required: true,
-          type: TableColumnType.Number,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "attributes",
-          title: "Attributes",
-          description: "Attributes",
-          required: true,
-          defaultValue: {},
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "traceId",
-          title: "Trace ID",
-          description: "ID of the trace",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "spanId",
-          title: "Span ID",
-          description: "ID of the span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "body",
-          title: "Log Body",
-          description: "Body of the Log",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
+        projectIdColumn,
+        serviceIdColumn,
+        timeColumn,
+        timeUnixNanoColumn,
+        severityTextColumn,
+        severityNumberColumn,
+        attributesColumn,
+        attributeKeysColumn,
+        traceIdColumn,
+        spanIdColumn,
+        bodyColumn,
       ],
+      projections: [],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
       partitionKey: "sipHash64(projectId) % 16",
@@ -345,6 +384,14 @@ export default class Log extends AnalyticsBaseModel {
     this.setColumnValue("attributes", v);
   }
 
+  public get attributeKeys(): Array<string> | undefined {
+    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
+  }
+
+  public set attributeKeys(v: Array<string> | undefined) {
+    this.setColumnValue("attributeKeys", v);
+  }
+
   public get traceId(): string | undefined {
     return this.getColumnValue("traceId") as string | undefined;
   }

Common/Models/AnalyticsModels/Metric.ts

@@ -28,6 +28,481 @@ export enum ServiceType {
 
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
+    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "projectId",
+      title: "Project ID",
+      description: "ID of project",
+      required: true,
+      type: TableColumnType.ObjectID,
+      isTenantId: true,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    // this can also be the monitor id or the telemetry service id.
+    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceId",
+      title: "Service ID",
+      description: "ID of the Service which created the Metric",
+      required: true,
+      type: TableColumnType.ObjectID,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    // this can also be the monitor id or the telemetry service id.
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description: "Type of the service that this telemetry belongs to",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    // add name and description
+    const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "name",
+      title: "Name",
+      description: "Name of the Metric",
+      required: true,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const aggregationTemporalityColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "aggregationTemporality",
+        title: "Aggregation Temporality",
+        description: "Aggregation Temporality of this Metric",
+        required: false,
+        type: TableColumnType.Text,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      });
+
+    const metricPointTypeColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "metricPointType",
+        title: "Metric Point Type",
+        description: "Metric Point Type of this Metric",
+        required: false,
+        type: TableColumnType.Text,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      });
+
+    // this is end time.
+    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "time",
+      title: "Time",
+      description: "When did the Metric happen?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "startTime",
+      title: "Start Time",
+      description: "When did the Metric happen?",
+      required: false,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    // end time.
+    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "timeUnixNano",
+      title: "Time (in Unix Nano)",
+      description: "When did the Metric happen?",
+      required: true,
+      type: TableColumnType.LongNumber,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const startTimeUnixNanoColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "startTimeUnixNano",
+        title: "Start Time (in Unix Nano)",
+        description: "When did the Metric happen?",
+        required: false,
+        type: TableColumnType.LongNumber,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      });
+
+    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributes",
+      title: "Attributes",
+      description: "Attributes",
+      required: true,
+      type: TableColumnType.JSON,
+      defaultValue: {},
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributeKeys",
+      title: "Attribute Keys",
+      description: "Attribute keys extracted from attributes",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.ArrayText,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const isMonotonicColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "isMonotonic",
+      title: "Is Monotonic",
+      description: "Is Monotonic",
+      required: false,
+      type: TableColumnType.Boolean,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const countColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "count",
+      title: "Count",
+      description: "Count",
+      required: false,
+      type: TableColumnType.Number,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const sumColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "sum",
+      title: "Sum",
+      description: "Sum",
+      required: false,
+      type: TableColumnType.Decimal,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const valueColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "value",
+      title: "Value",
+      description: "Value",
+      required: false,
+      type: TableColumnType.Decimal,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const minColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "min",
+      title: "Min",
+      description: "Min",
+      required: false,
+      type: TableColumnType.Decimal,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const maxColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "max",
+      title: "Max",
+      description: "Max",
+      required: false,
+      type: TableColumnType.Decimal,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const bucketCountsColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "bucketCounts",
+      title: "Bucket Counts",
+      description: "Bucket Counts",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.ArrayNumber,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const explicitBoundsColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
+      {
+        key: "explicitBounds",
+        title: "Explicit Bonds",
+        description: "Explicit Bonds",
+        required: true,
+        defaultValue: [],
+        type: TableColumnType.ArrayNumber,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      },
+    );
+
     super({
       tableName: "MetricItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -61,453 +536,28 @@ export default class Metric extends AnalyticsBaseModel {
         ],
       },
       tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        // this can also be the monitor id or the telemetry service id.
-        new AnalyticsTableColumn({
-          key: "serviceId",
-          title: "Service ID",
-          description: "ID of the Service which created the Metric",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        // this can also be the monitor id or the telemetry service id.
-        new AnalyticsTableColumn({
-          key: "serviceType",
-          title: "Service Type",
-          description: "Type of the service that this telemetry belongs to",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        // add name and description
-
-        new AnalyticsTableColumn({
-          key: "name",
-          title: "Name",
-          description: "Name of the Metric",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "aggregationTemporality",
-          title: "Aggregation Temporality",
-          description: "Aggregation Temporality of this Metric",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "metricPointType",
-          title: "Metric Point Type",
-          description: "Metric Point Type of this Metric",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        // this is end time.
-        new AnalyticsTableColumn({
-          key: "time",
-          title: "Time",
-          description: "When did the Metric happen?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "startTime",
-          title: "Start Time",
-          description: "When did the Metric happen?",
-          required: false,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        // end time.
-        new AnalyticsTableColumn({
-          key: "timeUnixNano",
-          title: "Time (in Unix Nano)",
-          description: "When did the Metric happen?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "startTimeUnixNano",
-          title: "Start Time (in Unix Nano)",
-          description: "When did the Metric happen?",
-          required: false,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "attributes",
-          title: "Attributes",
-          description: "Attributes",
-          required: true,
-          type: TableColumnType.JSON,
-          defaultValue: {},
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "isMonotonic",
-          title: "Is Monotonic",
-          description: "Is Monotonic",
-          required: false,
-          type: TableColumnType.Boolean,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "count",
-          title: "Count",
-          description: "Count",
-          required: false,
-          type: TableColumnType.Number,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "sum",
-          title: "Sum",
-          description: "Sum",
-          required: false,
-          type: TableColumnType.Decimal,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "value",
-          title: "Value",
-          description: "Value",
-          required: false,
-          type: TableColumnType.Decimal,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "min",
-          title: "Min",
-          description: "Min",
-          required: false,
-          type: TableColumnType.Decimal,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "max",
-          title: "Max",
-          description: "Max",
-          required: false,
-          type: TableColumnType.Decimal,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "bucketCounts",
-          title: "Bucket Counts",
-          description: "Bucket Counts",
-          required: true,
-          defaultValue: [],
-          type: TableColumnType.ArrayNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "explicitBounds",
-          title: "Explicit Bonds",
-          description: "Explicit Bonds",
-          required: true,
-          defaultValue: [],
-          type: TableColumnType.ArrayNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceLog,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceLog,
-            ],
-            update: [],
-          },
-        }),
+        projectIdColumn,
+        serviceIdColumn,
+        serviceTypeColumn,
+        nameColumn,
+        aggregationTemporalityColumn,
+        metricPointTypeColumn,
+        timeColumn,
+        startTimeColumn,
+        timeUnixNanoColumn,
+        startTimeUnixNanoColumn,
+        attributesColumn,
+        attributeKeysColumn,
+        isMonotonicColumn,
+        countColumn,
+        sumColumn,
+        valueColumn,
+        minColumn,
+        maxColumn,
+        bucketCountsColumn,
+        explicitBoundsColumn,
       ],
+      projections: [],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
       partitionKey: "sipHash64(projectId) % 16",
@@ -590,6 +640,14 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("attributes", v);
   }
 
+  public get attributeKeys(): Array<string> | undefined {
+    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
+  }
+
+  public set attributeKeys(v: Array<string> | undefined) {
+    this.setColumnValue("attributeKeys", v);
+  }
+
   public get startTime(): Date | undefined {
     return this.getColumnValue("startTime") as Date | undefined;
   }

Common/Models/AnalyticsModels/MonitorLog.ts

@@ -9,6 +9,100 @@ import Permission from "../../Types/Permission";
 
 export default class MonitorLog extends AnalyticsBaseModel {
   public constructor() {
+    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "projectId",
+      title: "Project ID",
+      description: "ID of project",
+      required: true,
+      type: TableColumnType.ObjectID,
+      isTenantId: true,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadProjectMonitor,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateProjectMonitor,
+        ],
+        update: [],
+      },
+    });
+
+    const monitorIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "monitorId",
+      title: "Monitor ID",
+      description: "ID of the monitor which this logs belongs to",
+      required: true,
+      type: TableColumnType.ObjectID,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadProjectMonitor,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateProjectMonitor,
+        ],
+        update: [],
+      },
+    });
+
+    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "time",
+      title: "Time",
+      description: "When was the log created?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadProjectMonitor,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateProjectMonitor,
+        ],
+        update: [],
+      },
+    });
+
+    const logBodyColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "logBody",
+      title: "Log Body",
+      description: "The body of the log",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.JSON,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadProjectMonitor,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateProjectMonitor,
+        ],
+        update: [],
+      },
+    });
+
     super({
       tableName: "MonitorLog",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -42,100 +136,12 @@ export default class MonitorLog extends AnalyticsBaseModel {
       pluralName: "Monitor Logs",
       crudApiPath: new Route("/monitor-log"),
       tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateProjectMonitor,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "monitorId",
-          title: "Monitor ID",
-          description: "ID of the monitor which this logs belongs to",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateProjectMonitor,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "time",
-          title: "Time",
-          description: "When was the log created?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateProjectMonitor,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "logBody",
-          title: "Log Body",
-          description: "The body of the log",
-          required: true,
-          defaultValue: {},
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateProjectMonitor,
-            ],
-            update: [],
-          },
-        }),
+        projectIdColumn,
+        monitorIdColumn,
+        timeColumn,
+        logBodyColumn,
       ],
+      projections: [],
       sortKeys: ["projectId", "time", "monitorId"],
       primaryKeys: ["projectId", "time", "monitorId"],
       partitionKey: "sipHash64(projectId) % 16",

Common/Models/AnalyticsModels/Span.ts

@@ -41,6 +41,451 @@ export interface SpanLink {
 
 export default class Span extends AnalyticsBaseModel {
   public constructor() {
+    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "projectId",
+      title: "Project ID",
+      description: "ID of project",
+      required: true,
+      type: TableColumnType.ObjectID,
+      isTenantId: true,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceId",
+      title: "Service ID",
+      description: "ID of the Service which created the log",
+      required: true,
+      type: TableColumnType.ObjectID,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "startTime",
+      title: "Start Time",
+      description: "When did the span start?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const endTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "endTime",
+      title: "End Time",
+      description: "When did the span end?",
+      required: true,
+      type: TableColumnType.Date,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const startTimeUnixNanoColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "startTimeUnixNano",
+        title: "Start Time in Unix Nano",
+        description: "When did the span start?",
+        required: true,
+        type: TableColumnType.LongNumber,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceTraces,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceTraces,
+          ],
+          update: [],
+        },
+      });
+
+    const durationUnixNanoColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "durationUnixNano",
+        title: "Duration in Unix Nano",
+        description: "How long did the span last?",
+        required: true,
+        type: TableColumnType.LongNumber,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceTraces,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceTraces,
+          ],
+          update: [],
+        },
+      });
+
+    const endTimeUnixNanoColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "endTimeUnixNano",
+        title: "End Time",
+        description: "When did the span end?",
+        required: true,
+        type: TableColumnType.LongNumber,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadTelemetryServiceTraces,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateTelemetryServiceTraces,
+          ],
+          update: [],
+        },
+      });
+
+    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "traceId",
+      title: "Trace ID",
+      description: "ID of the trace",
+      required: true,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "spanId",
+      title: "Span ID",
+      description: "ID of the span",
+      required: true,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const parentSpanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "parentSpanId",
+      title: "Parent Span ID",
+      description: "ID of the parent span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const traceStateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "traceState",
+      title: "Trace State",
+      description: "Trace State",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributes",
+      title: "Attributes",
+      description: "Attributes",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.JSON,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "attributeKeys",
+      title: "Attribute Keys",
+      description: "Attribute keys extracted from attributes",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.ArrayText,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const eventsColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "events",
+      title: "Events",
+      description: "Span Events",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.JSONArray,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const linksColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "links",
+      title: "Links",
+      description: "Span Links",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.JSON,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const statusCodeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "statusCode",
+      title: "Status Code",
+      description: "Status Code",
+      required: false,
+      type: TableColumnType.Number,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const statusMessageColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "statusMessage",
+      title: "Status Message",
+      description: "Status Message",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "name",
+      title: "Name",
+      description: "Name of the span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
+    const kindColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "kind",
+      title: "Kind",
+      description: "Kind of the span",
+      required: false,
+      type: TableColumnType.Text,
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
     super({
       tableName: "SpanItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
@@ -74,424 +519,27 @@ export default class Span extends AnalyticsBaseModel {
         ],
       },
       tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "serviceId",
-          title: "Service ID",
-          description: "ID of the Service which created the log",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "startTime",
-          title: "Start Time",
-          description: "When did the span start?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "endTime",
-          title: "End Time",
-          description: "When did the span end?",
-          required: true,
-          type: TableColumnType.Date,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "startTimeUnixNano",
-          title: "Start Time in Unix Nano",
-          description: "When did the span start?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "durationUnixNano",
-          title: "Duration in Unix Nano",
-          description: "How long did the span last?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "endTimeUnixNano",
-          title: "End Time",
-          description: "When did the span end?",
-          required: true,
-          type: TableColumnType.LongNumber,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "traceId",
-          title: "Trace ID",
-          description: "ID of the trace",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "spanId",
-          title: "Span ID",
-          description: "ID of the span",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "parentSpanId",
-          title: "Parent Span ID",
-          description: "ID of the parent span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "traceState",
-          title: "Trace State",
-          description: "Trace State",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "attributes",
-          title: "Attributes",
-          description: "Attributes",
-          required: true,
-          defaultValue: {},
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "events",
-          title: "Events",
-          description: "Span Events",
-          required: true,
-          defaultValue: [],
-          type: TableColumnType.JSONArray,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "links",
-          title: "Links",
-          description: "Span Links",
-          required: true,
-          defaultValue: {},
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "statusCode",
-          title: "Status Code",
-          description: "Status Code",
-          required: false,
-          type: TableColumnType.Number,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "statusMessage",
-          title: "Status Message",
-          description: "Status Message",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "name",
-          title: "Name",
-          description: "Name of the span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "kind",
-          title: "Kind",
-          description: "Kind of the span",
-          required: false,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.CreateTelemetryServiceTraces,
-            ],
-            update: [],
-          },
-        }),
+        projectIdColumn,
+        serviceIdColumn,
+        startTimeColumn,
+        endTimeColumn,
+        startTimeUnixNanoColumn,
+        durationUnixNanoColumn,
+        endTimeUnixNanoColumn,
+        traceIdColumn,
+        spanIdColumn,
+        parentSpanIdColumn,
+        traceStateColumn,
+        attributesColumn,
+        attributeKeysColumn,
+        eventsColumn,
+        linksColumn,
+        statusCodeColumn,
+        statusMessageColumn,
+        nameColumn,
+        kindColumn,
       ],
+      projections: [],
       sortKeys: ["projectId", "startTime", "serviceId", "traceId"],
       primaryKeys: ["projectId", "startTime", "serviceId", "traceId"],
       partitionKey: "sipHash64(projectId) % 16",
@@ -610,6 +658,14 @@ export default class Span extends AnalyticsBaseModel {
     this.setColumnValue("attributes", v);
   }
 
+  public get attributeKeys(): Array<string> | undefined {
+    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
+  }
+
+  public set attributeKeys(v: Array<string> | undefined) {
+    this.setColumnValue("attributeKeys", v);
+  }
+
   public get events(): Array<SpanEvent> | undefined {
     return this.getColumnValue("events") as Array<SpanEvent> | undefined;
   }

Common/Models/AnalyticsModels/TelemetryAttribute.ts

@@ -1,164 +0,0 @@
-import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
-import Route from "../../Types/API/Route";
-import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
-import TelemetryType from "../../Types/Telemetry/TelemetryType";
-import ObjectID from "../../Types/ObjectID";
-import Permission from "../../Types/Permission";
-
-export default class TelemetryAttribute extends AnalyticsBaseModel {
-  public constructor() {
-    super({
-      tableName: "TelemetryAttribute",
-      tableEngine: AnalyticsTableEngine.MergeTree,
-      singularName: "Telemetry Attribute",
-      pluralName: "Telemetry Attributes",
-      crudApiPath: new Route("/telemetry-attributes"),
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-          Permission.ReadTelemetryServiceLog,
-          Permission.ReadTelemetryServiceMetrics,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-          Permission.CreateTelemetryServiceLog,
-          Permission.CreateTelemetryServiceMetrics,
-        ],
-        update: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.EditTelemetryServiceTraces,
-          Permission.EditTelemetryServiceLog,
-          Permission.EditTelemetryServiceMetrics,
-        ],
-        delete: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.DeleteTelemetryServiceTraces,
-          Permission.DeleteTelemetryServiceLog,
-          Permission.DeleteTelemetryServiceMetrics,
-        ],
-      },
-      tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-              Permission.ReadTelemetryServiceLog,
-              Permission.ReadTelemetryServiceMetrics,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.EditTelemetryServiceTraces,
-              Permission.EditTelemetryServiceLog,
-              Permission.EditTelemetryServiceMetrics,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "telemetryType",
-          title: "Telemetry Type",
-          description: "Type of telemetry",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-              Permission.ReadTelemetryServiceLog,
-              Permission.ReadTelemetryServiceMetrics,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.EditTelemetryServiceTraces,
-              Permission.EditTelemetryServiceLog,
-              Permission.EditTelemetryServiceMetrics,
-            ],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "attributes",
-          title: "Attributes",
-          description: "Attributes",
-          required: true,
-          type: TableColumnType.JSONArray,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadTelemetryServiceTraces,
-              Permission.ReadTelemetryServiceLog,
-              Permission.ReadTelemetryServiceMetrics,
-            ],
-            create: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.EditTelemetryServiceTraces,
-              Permission.EditTelemetryServiceLog,
-              Permission.EditTelemetryServiceMetrics,
-            ],
-            update: [],
-          },
-        }),
-      ],
-      sortKeys: ["projectId", "telemetryType"],
-      primaryKeys: ["projectId", "telemetryType"],
-      partitionKey: "sipHash64(projectId) % 16",
-    });
-  }
-
-  public get projectId(): ObjectID | undefined {
-    return this.getColumnValue("projectId") as ObjectID | undefined;
-  }
-
-  public set projectId(v: ObjectID | undefined) {
-    this.setColumnValue("projectId", v);
-  }
-
-  public get telemetryType(): TelemetryType | undefined {
-    return this.getColumnValue("telemetryType") as TelemetryType | undefined;
-  }
-
-  public set telemetryType(v: TelemetryType | undefined) {
-    this.setColumnValue("telemetryType", v);
-  }
-
-  public get attributes(): Array<string> | undefined {
-    return this.getColumnValue("attributes") as Array<string> | undefined;
-  }
-
-  public set attributes(v: Array<string> | undefined) {
-    this.setColumnValue("attributes", v);
-  }
-}

Common/Models/DatabaseModels/AcmeChallenge.ts

@@ -4,11 +4,13 @@ import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccess
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
+import Route from "../../Types/API/Route";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 
 @TableAccessControl({
@@ -24,6 +26,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   icon: IconProp.Lock,
   tableDescription: "HTTP Challege for Lets Encrypt Certificates",
 })
+@CrudApiEndpoint(new Route("/acme-challenge"))
 @Entity({
   name: "AcmeChallenge",
 })

Common/Models/DatabaseModels/AlertFeed.ts

@@ -10,6 +10,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -418,6 +419,7 @@ export default class AlertFeed extends BaseModel {
     ],
     update: [],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     required: true,

Common/Models/DatabaseModels/AlertInternalNote.ts

@@ -17,7 +17,16 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import File from "./File";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
 
 @EnableDocumentation()
 @CanAccessIfCanReadOn("alert")
@@ -340,6 +349,54 @@ export default class AlertInternalNote extends BaseModel {
   })
   public note?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertInternalNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditAlertInternalNote,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note.",
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "AlertInternalNoteFile",
+    joinColumn: {
+      name: "alertInternalNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

Common/Models/DatabaseModels/AlertSeverity.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -378,6 +379,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.EditAlertSeverity,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/AlertState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -356,6 +357,7 @@ export default class AlertState extends BaseModel {
       Permission.EditAlertState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts

@@ -15,6 +15,7 @@ import TableColumn, {
   getTableColumns,
 } from "../../../Types/Database/TableColumn";
 import TableColumnType from "../../../Types/Database/TableColumnType";
+import { getFirstColorFieldColumn } from "../../../Types/Database/ColorField";
 import Dictionary from "../../../Types/Dictionary";
 import Email from "../../../Types/Email";
 import BadDataException from "../../../Types/Exception/BadDataException";
@@ -123,7 +124,6 @@ export default class DatabaseBaseModel extends BaseEntity {
   public isMasterAdminApiDocs!: boolean;
 
   public currentUserCanAccessColumnBy!: string | null;
-  public labelsColumn!: string | null;
   public slugifyColumn!: string | null;
   public saveSlugToColumn!: string | null;
   public singularName!: string | null;
@@ -204,6 +204,10 @@ export default class DatabaseBaseModel extends BaseEntity {
     return new Columns(Object.keys(getTableColumns(this)));
   }
 
+  public getFirstColorColumn(): string | null {
+    return getFirstColorFieldColumn(this);
+  }
+
   public canQueryMultiTenant(): boolean {
     return Boolean(this.isMultiTenantRequestAllowed);
   }
@@ -345,10 +349,6 @@ export default class DatabaseBaseModel extends BaseEntity {
     return this.currentUserCanAccessColumnBy;
   }
 
-  public getLabelsColumn(): string | null {
-    return this.labelsColumn;
-  }
-
   public get id(): ObjectID | null {
     return this._id ? new ObjectID(this._id) : null;
   }

Common/Models/DatabaseModels/Domain.ts

@@ -301,7 +301,12 @@ export default class Domain extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectDomain,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,

Common/Models/DatabaseModels/EnterpriseLicense.ts

@@ -0,0 +1,104 @@
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import IconProp from "../../Types/Icon/IconProp";
+import { Column, Entity, Index } from "typeorm";
+
+@TableAccessControl({
+  create: [],
+  read: [],
+  update: [],
+  delete: [],
+})
+@CrudApiEndpoint(new Route("/enterprise-license"))
+@TableMetadata({
+  tableName: "EnterpriseLicense",
+  singularName: "Enterprise License",
+  pluralName: "Enterprise Licenses",
+  icon: IconProp.Lock,
+  tableDescription: "Enterprise license keys issued by OneUptime.",
+})
+@Entity({
+  name: "EnterpriseLicense",
+})
+export default class EnterpriseLicense extends BaseModel {
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    title: "Company Name",
+    description: "Company name associated with this license.",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public companyName?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    title: "License Key",
+    description: "Enterprise license key.",
+    unique: true,
+  })
+  @Index({ unique: true })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    unique: true,
+  })
+  public licenseKey?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Date,
+    title: "Expires At",
+    description: "Expiration date of this license.",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Date,
+  })
+  public expiresAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Number,
+    title: "Annual Contract Value",
+    description: "Annual contract value (in USD) for this license.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Number,
+  })
+  public annualContractValue?: number = undefined;
+}

Common/Models/DatabaseModels/GlobalConfig.ts

@@ -262,6 +262,115 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   public twilioSecondaryPhoneNumbers?: string = undefined; // phone numbers separated by comma
 
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Meta WhatsApp Access Token",
+    description:
+      "Access token generated from Meta for sending WhatsApp messages.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppAccessToken?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Meta WhatsApp Phone Number ID",
+    description: "The WhatsApp Business phone number ID from Meta.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppPhoneNumberId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Meta WhatsApp Business Account ID",
+    description: "Business account ID associated with your WhatsApp setup.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppBusinessAccountId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Meta WhatsApp App ID",
+    description:
+      "Facebook App ID used for the WhatsApp Business Platform integration.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppAppId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Meta WhatsApp App Secret",
+    description: "Facebook App Secret for the WhatsApp Business Platform.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppAppSecret?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Meta WhatsApp Webhook Verify Token",
+    description:
+      "Verify token configured in Meta to validate webhook subscriptions.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public metaWhatsAppWebhookVerifyToken?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],
@@ -388,4 +497,75 @@ export default class GlobalConfig extends GlobalConfigModel {
     transformer: Email.getDatabaseTransformer(),
   })
   public adminNotificationEmail?: Email = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Enterprise Company Name",
+    description:
+      "Company name associated with the validated enterprise license.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public enterpriseCompanyName?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Enterprise License Key",
+    description: "Enterprise license key stored after successful validation.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    unique: true,
+  })
+  public enterpriseLicenseKey?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Enterprise License Expires At",
+    description: "Expiration date of the validated enterprise license.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: true,
+  })
+  public enterpriseLicenseExpiresAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Enterprise License Token",
+    description: "Signed JWT returned from license validation.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+    unique: true,
+  })
+  public enterpriseLicenseToken?: string = undefined;
 }

Common/Models/DatabaseModels/Incident.ts

@@ -926,6 +926,39 @@ export default class Incident extends BaseModel {
   })
   public rootCause?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Postmortem Note",
+    description: "Document the postmortem summary for this incident.",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+  })
+  public postmortemNote?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

Common/Models/DatabaseModels/IncidentFeed.ts

@@ -33,6 +33,7 @@ export enum IncidentFeedEventType {
   IncidentUpdated = "IncidentUpdated",
   RootCause = "RootCause",
   RemediationNotes = "RemediationNotes",
+  PostmortemNote = "PostmortemNote",
   OwnerUserRemoved = "OwnerUserRemoved",
   OwnerTeamRemoved = "OwnerTeamRemoved",
   OnCallPolicy = "OnCallPolicy",

Common/Models/DatabaseModels/IncidentInternalNote.ts

@@ -17,7 +17,16 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import File from "./File";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
 
 @EnableDocumentation()
 @CanAccessIfCanReadOn("incident")
@@ -340,6 +349,54 @@ export default class IncidentInternalNote extends BaseModel {
   })
   public note?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentInternalNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentInternalNote,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note.",
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "IncidentInternalNoteFile",
+    joinColumn: {
+      name: "incidentInternalNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

Common/Models/DatabaseModels/IncidentPostmortemTemplate.ts

@@ -0,0 +1,353 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
+import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+
+@TableBillingAccessControl({
+  create: PlanType.Growth,
+  read: PlanType.Growth,
+  update: PlanType.Growth,
+  delete: PlanType.Growth,
+})
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentNoteTemplate,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentNoteTemplate,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentNoteTemplate,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentNoteTemplate,
+  ],
+})
+@CrudApiEndpoint(new Route("/incident-postmortem-template"))
+@Entity({
+  name: "IncidentPostmortemTemplate",
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@TableMetadata({
+  tableName: "IncidentPostmortemTemplate",
+  singularName: "Incident Postmortem Template",
+  pluralName: "Incident Postmortem Templates",
+  icon: IconProp.Book,
+  tableDescription: "Manage postmortem templates for your incidents",
+})
+export default class IncidentPostmortemTemplate extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentNoteTemplate,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    title: "Postmortem Note",
+    description:
+      "Markdown template used when documenting an incident postmortem.",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public postmortemNote?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentNoteTemplate,
+    ],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Name",
+    description: "Name of the Postmortem Template",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public templateName?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentNoteTemplate,
+    ],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+    title: "Template Description",
+    description: "Description of the Postmortem Template",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public templateDescription?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentNoteTemplate,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentNoteTemplate,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Models/DatabaseModels/IncidentPublicNote.ts

@@ -18,7 +18,16 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import File from "./File";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
 
 @EnableDocumentation()
 @CanAccessIfCanReadOn("incident")
@@ -341,6 +350,54 @@ export default class IncidentPublicNote extends BaseModel {
   })
   public note?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentPublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentPublicNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentPublicNote,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note.",
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "IncidentPublicNoteFile",
+    joinColumn: {
+      name: "incidentPublicNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/IncidentSeverity.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -378,6 +379,7 @@ export default class IncidentSeverity extends BaseModel {
       Permission.EditIncidentSeverity,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/IncidentState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -380,6 +381,7 @@ export default class IncidentState extends BaseModel {
       Permission.EditIncidentState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/Index.ts

@@ -24,6 +24,7 @@ import IncidentFeed from "./IncidentFeed";
 import IncidentCustomField from "./IncidentCustomField";
 import IncidentInternalNote from "./IncidentInternalNote";
 import IncidentNoteTemplate from "./IncidentNoteTemplate";
+import IncidentPostmortemTemplate from "./IncidentPostmortemTemplate";
 import IncidentOwnerTeam from "./IncidentOwnerTeam";
 import IncidentOwnerUser from "./IncidentOwnerUser";
 import IncidentPublicNote from "./IncidentPublicNote";
@@ -80,6 +81,7 @@ import ProjectSmtpConfig from "./ProjectSmtpConfig";
 //SSO
 import ProjectSSO from "./ProjectSso";
 import PromoCode from "./PromoCode";
+import EnterpriseLicense from "./EnterpriseLicense";
 import Reseller from "./Reseller";
 import ResellerPlan from "./ResellerPlan";
 // ScheduledMaintenances
@@ -100,6 +102,7 @@ import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository";
 import ShortLink from "./ShortLink";
 // SMS
 import SmsLog from "./SmsLog";
+import WhatsAppLog from "./WhatsAppLog";
 import PushNotificationLog from "./PushNotificationLog";
 import WorkspaceNotificationLog from "./WorkspaceNotificationLog";
 // Status Page
@@ -115,6 +118,7 @@ import StatusPageHistoryChartBarColorRule from "./StatusPageHistoryChartBarColor
 import StatusPageOwnerTeam from "./StatusPageOwnerTeam";
 import StatusPageOwnerUser from "./StatusPageOwnerUser";
 import StatusPagePrivateUser from "./StatusPagePrivateUser";
+import StatusPagePrivateUserSession from "./StatusPagePrivateUserSession";
 import StatusPageResource from "./StatusPageResource";
 import StatusPageSCIM from "./StatusPageSCIM";
 import StatusPageSSO from "./StatusPageSso";
@@ -127,10 +131,12 @@ import TeamComplianceSetting from "./TeamComplianceSetting";
 import TelemetryService from "./TelemetryService";
 import UsageBilling from "./TelemetryUsageBilling";
 import User from "./User";
+import UserSession from "./UserSession";
 import UserCall from "./UserCall";
 // Notification Methods
 import UserEmail from "./UserEmail";
 import UserPush from "./UserPush";
+import UserWhatsApp from "./UserWhatsApp";
 // User Notification Rules
 import UserNotificationRule from "./UserNotificationRule";
 import UserNotificationSetting from "./UserNotificationSetting";
@@ -233,6 +239,7 @@ const AllModelTypes: Array<{
   IncidentOwnerUser,
   IncidentSeverity,
   IncidentNoteTemplate,
+  IncidentPostmortemTemplate,
 
   AlertState,
   Alert,
@@ -261,6 +268,7 @@ const AllModelTypes: Array<{
   StatusPageFooterLink,
   StatusPageHeaderLink,
   StatusPagePrivateUser,
+  StatusPagePrivateUserSession,
   StatusPageHistoryChartBarColorRule,
 
   ScheduledMaintenanceState,
@@ -297,6 +305,7 @@ const AllModelTypes: Array<{
   StatusPageOwnerUser,
 
   SmsLog,
+  WhatsAppLog,
   PushNotificationLog,
   WorkspaceNotificationLog,
   CallLog,
@@ -306,6 +315,7 @@ const AllModelTypes: Array<{
   UserSms,
   UserCall,
   UserPush,
+  UserWhatsApp,
 
   UserNotificationRule,
   UserOnCallLog,
@@ -325,6 +335,7 @@ const AllModelTypes: Array<{
   ResellerPlan,
 
   PromoCode,
+  EnterpriseLicense,
 
   GlobalConfig,
 
@@ -367,6 +378,7 @@ const AllModelTypes: Array<{
   ProbeOwnerTeam,
   ProbeOwnerUser,
 
+  UserSession,
   UserTotpAuth,
   UserWebAuthn,
 

Common/Models/DatabaseModels/Label.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -365,6 +366,7 @@ export default class Label extends AccessControlModel {
       Permission.EditProjectLabel,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/MonitorStatus.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -379,6 +380,7 @@ export default class MonitorStatus extends BaseModel {
       Permission.EditProjectMonitorStatus,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/Project.ts

@@ -134,7 +134,7 @@ export default class Project extends TenantModel {
       Permission.UnAuthorizedSsoUser,
       Permission.ProjectUser,
     ],
-    update: [Permission.ProjectOwner],
+    update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
   })
   @TableColumn({ type: TableColumnType.ShortText })
   @Column({
@@ -704,8 +704,8 @@ export default class Project extends TenantModel {
     type: TableColumnType.Number,
     isDefaultValueColumn: true,
     required: true,
-    title: "SMS or Call Current Balance",
-    description: "Balance in USD for SMS or Call",
+    title: "SMS, Call, and WhatsApp Current Balance",
+    description: "Balance in USD for SMS, Call, and WhatsApp",
     defaultValue: 0,
   })
   @Column({
@@ -732,7 +732,7 @@ export default class Project extends TenantModel {
     isDefaultValueColumn: true,
     required: true,
     title: "Auto Recharge Amount",
-    description: "Auto recharge amount in USD for SMS or Call",
+    description: "Auto recharge amount in USD for SMS, Call, and WhatsApp",
     defaultValue: 20,
   })
   @Column({
@@ -760,7 +760,7 @@ export default class Project extends TenantModel {
     required: true,
     title: "Auto Recharge when current balance falls to",
     description:
-      "Auto recharge is triggered when current balance falls to this amount in USD for SMS or Call",
+      "Auto recharge is triggered when current balance falls to this amount in USD for SMS, Call, and WhatsApp",
     defaultValue: 10,
   })
   @Column({
@@ -798,6 +798,33 @@ export default class Project extends TenantModel {
   })
   public enableSmsNotifications?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ProjectUser,
+    ],
+    update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
+  })
+  @TableColumn({
+    required: true,
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Enable WhatsApp Notifications",
+    description: "Enable WhatsApp notifications for this project.",
+    defaultValue: false,
+  })
+  @Column({
+    nullable: false,
+    default: false,
+    type: ColumnType.Boolean,
+  })
+  public enableWhatsAppNotifications?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [
@@ -841,8 +868,9 @@ export default class Project extends TenantModel {
     required: true,
     isDefaultValueColumn: true,
     type: TableColumnType.Boolean,
-    title: "Enable auto recharge SMS or Call balance",
-    description: "Enable auto recharge SMS or Call balance for this project.",
+    title: "Enable auto recharge for SMS, Call, and WhatsApp balance",
+    description:
+      "Enable auto recharge for SMS, Call, and WhatsApp balance for this project.",
     defaultValue: false,
   })
   @Column({
@@ -862,8 +890,9 @@ export default class Project extends TenantModel {
     isDefaultValueColumn: true,
     hideColumnInDocumentation: true,
     type: TableColumnType.Boolean,
-    title: "Low Call and SMS Balance Notification Sent to Owners",
-    description: "Low Call and SMS Balance Notification Sent to Owners",
+    title: "Low SMS, Call, and WhatsApp Balance Notification Sent to Owners",
+    description:
+      "Low SMS, Call, and WhatsApp Balance Notification Sent to Owners",
     defaultValue: false,
   })
   @Column({
@@ -883,9 +912,10 @@ export default class Project extends TenantModel {
     isDefaultValueColumn: true,
     type: TableColumnType.Boolean,
     hideColumnInDocumentation: true,
-    title: "Failed Call and SMS Balance Charge Notification Sent to Owners",
+    title:
+      "Failed SMS, Call, and WhatsApp Balance Charge Notification Sent to Owners",
     description:
-      "Failed Call and SMS Balance Charge Notification Sent to Owners",
+      "Failed SMS, Call, and WhatsApp Balance Charge Notification Sent to Owners",
     defaultValue: false,
   })
   @Column({
@@ -906,8 +936,9 @@ export default class Project extends TenantModel {
     isDefaultValueColumn: true,
     hideColumnInDocumentation: true,
     type: TableColumnType.Boolean,
-    title: "Not Enabled SMS or Call Notification Sent to Owners",
-    description: "Not Enabled SMS or Call Notification Sent to Owners",
+    title: "Not Enabled SMS, Call, or WhatsApp Notification Sent to Owners",
+    description:
+      "Not Enabled SMS, Call, or WhatsApp Notification Sent to Owners",
     defaultValue: false,
   })
   @Column({

Common/Models/DatabaseModels/ScheduledMaintenanceFeed.ts

@@ -10,6 +10,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -422,6 +423,7 @@ export default class ScheduledMaintenanceFeed extends BaseModel {
     ],
     update: [],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     required: true,

Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote.ts

@@ -16,7 +16,16 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import File from "./File";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
 
 @CanAccessIfCanReadOn("scheduledMaintenance")
 @TenantColumn("projectId")
@@ -340,6 +349,54 @@ export default class ScheduledMaintenanceInternalNote extends BaseModel {
   })
   public note?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceInternalNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceInternalNote,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note.",
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenanceInternalNoteFile",
+    joinColumn: {
+      name: "scheduledMaintenanceInternalNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

Common/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts

@@ -18,7 +18,16 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import File from "./File";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
 
 @EnableDocumentation()
 @CanAccessIfCanReadOn("scheduledMaintenance")
@@ -342,6 +351,54 @@ export default class ScheduledMaintenancePublicNote extends BaseModel {
   })
   public note?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenancePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenancePublicNote,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenancePublicNote,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note.",
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "ScheduledMaintenancePublicNoteFile",
+    joinColumn: {
+      name: "scheduledMaintenancePublicNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/ScheduledMaintenanceState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -380,6 +381,7 @@ export default class ScheduledMaintenanceState extends BaseModel {
       Permission.EditScheduledMaintenanceState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

Common/Models/DatabaseModels/ServiceCatalog.ts

@@ -14,6 +14,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -448,6 +449,7 @@ export default class ServiceCatalog extends BaseModel {
       Permission.EditServiceCatalog,
     ],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     title: "Service Color",

Common/Models/DatabaseModels/StatusPage.ts

@@ -2331,4 +2331,84 @@ export default class StatusPage extends BaseModel {
     create: PlanType.Free,
   })
   public ipWhitelist?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Enable Embedded Overall Status Badge",
+    description:
+      "Enable embedded overall status badge that can be displayed on external websites?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: false,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public enableEmbeddedOverallStatus?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Embedded Overall Status Token",
+    description:
+      "Security token required to access the embedded overall status badge. This token must be provided in the URL.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public embeddedOverallStatusToken?: string = undefined;
 }

Common/Models/DatabaseModels/StatusPagePrivateUserSession.ts

@@ -0,0 +1,413 @@
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Project from "./Project";
+import StatusPage from "./StatusPage";
+import StatusPagePrivateUser from "./StatusPagePrivateUser";
+import Route from "../../Types/API/Route";
+import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import HashedString from "../../Types/HashedString";
+import IconProp from "../../Types/Icon/IconProp";
+import { JSONObject } from "../../Types/JSON";
+import ObjectID from "../../Types/ObjectID";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableBillingAccessControl({
+  create: PlanType.Growth,
+  read: PlanType.Growth,
+  update: PlanType.Growth,
+  delete: PlanType.Growth,
+})
+@CanAccessIfCanReadOn("statusPage")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [],
+  read: [],
+  delete: [],
+  update: [],
+})
+@CrudApiEndpoint(new Route("/status-page-private-user-session"))
+@Entity({
+  name: "StatusPagePrivateUserSession",
+})
+@TableMetadata({
+  tableName: "StatusPagePrivateUserSession",
+  singularName: "Status Page Private User Session",
+  pluralName: "Status Page Private User Sessions",
+  icon: IconProp.Lock,
+  tableDescription:
+    "Stores status page private user sessions, refresh tokens, and device metadata for secure access control.",
+})
+export default class StatusPagePrivateUserSession extends BaseModel {
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Project that owns this private status page session.",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Project ID",
+    description: "Project identifier for this session.",
+    required: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageId",
+    type: TableColumnType.Entity,
+    modelType: StatusPage,
+    title: "Status Page",
+    description: "Status page associated with this session.",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPage;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageId" })
+  public statusPage?: StatusPage = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Status Page ID",
+    description: "Identifier for the status page.",
+    required: true,
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPagePrivateUserId",
+    type: TableColumnType.Entity,
+    modelType: StatusPagePrivateUser,
+    title: "Status Page Private User",
+    description: "Private user record associated with this session.",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPagePrivateUser;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "delete",
+    },
+  )
+  @JoinColumn({ name: "statusPagePrivateUserId" })
+  public statusPagePrivateUser?: StatusPagePrivateUser = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Status Page Private User ID",
+    description: "Identifier for the status page private user.",
+    required: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPagePrivateUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index({ unique: true })
+  @TableColumn({
+    type: TableColumnType.HashedString,
+    title: "Refresh Token",
+    description: "Hashed refresh token for the private user session.",
+    required: true,
+    hideColumnInDocumentation: true,
+  })
+  @Column({
+    type: ColumnType.HashedString,
+    length: ColumnLength.HashedString,
+    nullable: false,
+    unique: true,
+    transformer: HashedString.getDatabaseTransformer(),
+  })
+  public refreshToken?: HashedString = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Refresh Token Expires At",
+    description: "Expiration timestamp for the refresh token.",
+    required: true,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: false,
+  })
+  public refreshTokenExpiresAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Last Active At",
+    description: "Last time this session was active.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public lastActiveAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device Name",
+    description: "Friendly name for the device used to access the status page.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceName?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device Type",
+    description: "Type of device (desktop, mobile, etc).",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceType?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device OS",
+    description: "Operating system reported for this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceOS?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Browser",
+    description: "Browser or client application used for the session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceBrowser?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "IP Address",
+    description: "IP address recorded for this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public ipAddress?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "User Agent",
+    description: "User agent string supplied by the client.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public userAgent?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    title: "Is Revoked",
+    description: "Indicates if the session has been revoked.",
+    isDefaultValueColumn: true,
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isRevoked?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Revoked At",
+    description: "Timestamp when the session was revoked, if applicable.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public revokedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Revoked Reason",
+    description: "Reason provided for revoking this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public revokedReason?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    title: "Additional Info",
+    description: "Flexible JSON payload for storing structured metadata.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public additionalInfo?: JSONObject = undefined;
+}

Common/Models/DatabaseModels/TelemetryException.ts

@@ -8,7 +8,6 @@ import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
-import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -45,12 +44,6 @@ import TelemetryService from "./TelemetryService";
     Permission.EditTelemetryException,
   ],
 })
-@EnableWorkflow({
-  create: true,
-  delete: true,
-  update: true,
-  read: true,
-})
 @CrudApiEndpoint(new Route("/telemetry-exception-status"))
 @TableMetadata({
   tableName: "TelemetryException",

Common/Models/DatabaseModels/TelemetryService.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -505,6 +506,7 @@ export default class TelemetryService extends BaseModel {
       Permission.EditTelemetryService,
     ],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     title: "Service Color",

Common/Models/DatabaseModels/TelemetryUsageBilling.ts

@@ -39,7 +39,7 @@ export const DEFAULT_RETENTION_IN_DAYS: number = 15;
   pluralName: "Telemetry Usage Billings",
   icon: IconProp.Billing,
   tableDescription:
-    "Stores historical usage billing data for your telemetry data like Logs, Metrics, and Traces.",
+    "Stores historical usage billing data for your telemetry data like Logs, Metrics, Traces, and Exceptions.",
 })
 @Entity({
   name: "TelemetryUsageBilling",

Common/Models/DatabaseModels/User.ts

@@ -300,21 +300,6 @@ class User extends UserModel {
   })
   public twoFactorAuthEnabled?: boolean = undefined;
 
-  @ColumnAccessControl({
-    create: [],
-    read: [],
-
-    update: [],
-  })
-  @TableColumn({ type: TableColumnType.ShortText })
-  @Column({
-    type: ColumnType.ShortText,
-    length: ColumnLength.ShortText,
-    nullable: true,
-    unique: false,
-  })
-  public jwtRefreshToken?: string = undefined;
-
   @ColumnAccessControl({
     create: [],
     read: [],

Common/Models/DatabaseModels/UserNotificationRule.ts

@@ -6,6 +6,7 @@ import UserCall from "./UserCall";
 import UserEmail from "./UserEmail";
 import UserPush from "./UserPush";
 import UserSMS from "./UserSMS";
+import UserWhatsApp from "./UserWhatsApp";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
@@ -383,6 +384,53 @@ class UserNotificationRule extends BaseModel {
   })
   public userSmsId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userWhatsAppId",
+    type: TableColumnType.Entity,
+    modelType: UserWhatsApp,
+    title: "User WhatsApp",
+    description:
+      "Relation to User WhatsApp Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return UserWhatsApp;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userWhatsAppId" })
+  public userWhatsApp?: UserWhatsApp = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User WhatsApp ID",
+    description: "ID of User WhatsApp in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userWhatsAppId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [Permission.CurrentUser],
     read: [Permission.CurrentUser],

Common/Models/DatabaseModels/UserNotificationSetting.ts

@@ -273,6 +273,22 @@ class UserNotificationSetting extends BaseModel {
   })
   public alertBySMS?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [Permission.CurrentUser],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: false,
+  })
+  public alertByWhatsApp?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [Permission.CurrentUser],
     read: [Permission.CurrentUser],

Common/Models/DatabaseModels/UserOnCallLogTimeline.ts

@@ -13,6 +13,7 @@ import UserNotificationRule from "./UserNotificationRule";
 import UserPush from "./UserPush";
 import UserOnCallLog from "./UserOnCallLog";
 import UserSMS from "./UserSMS";
+import UserWhatsApp from "./UserWhatsApp";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
@@ -834,6 +835,53 @@ export default class UserOnCallLogTimeline extends BaseModel {
   })
   public userSmsId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userWhatsAppId",
+    type: TableColumnType.Entity,
+    modelType: UserWhatsApp,
+    title: "User WhatsApp",
+    description:
+      "Relation to User WhatsApp Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return UserWhatsApp;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userWhatsAppId" })
+  public userWhatsApp?: UserWhatsApp = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User WhatsApp ID",
+    description: "ID of User WhatsApp in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userWhatsAppId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [Permission.CurrentUser],

Common/Models/DatabaseModels/UserSession.ts

@@ -0,0 +1,318 @@
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import User from "./User";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import CurrentUserCanAccessRecordBy from "../../Types/Database/CurrentUserCanAccessRecordBy";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import HashedString from "../../Types/HashedString";
+import IconProp from "../../Types/Icon/IconProp";
+import { JSONObject } from "../../Types/JSON";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation({
+  isMasterAdminApiDocs: true,
+})
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [Permission.CurrentUser],
+  read: [Permission.CurrentUser],
+  delete: [Permission.CurrentUser],
+  update: [Permission.CurrentUser],
+})
+@CrudApiEndpoint(new Route("/user-session"))
+@Entity({
+  name: "UserSession",
+})
+@TableMetadata({
+  tableName: "UserSession",
+  singularName: "User Session",
+  pluralName: "User Sessions",
+  icon: IconProp.Lock,
+  tableDescription:
+    "Active user sessions with refresh tokens and device metadata for enhanced authentication security.",
+})
+@CurrentUserCanAccessRecordBy("userId")
+class UserSession extends BaseModel {
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User account this session belongs to.",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "delete",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "User ID",
+    description: "Identifier for the user that owns this session.",
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index({ unique: true })
+  @TableColumn({
+    type: TableColumnType.HashedString,
+    title: "Refresh Token",
+    description: "Hashed refresh token for this session.",
+    required: true,
+    hideColumnInDocumentation: true,
+  })
+  @Column({
+    type: ColumnType.HashedString,
+    length: ColumnLength.HashedString,
+    nullable: false,
+    unique: true,
+    transformer: HashedString.getDatabaseTransformer(),
+  })
+  public refreshToken?: HashedString = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Refresh Token Expires At",
+    description: "Expiration timestamp for the refresh token.",
+    required: true,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: false,
+  })
+  public refreshTokenExpiresAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Last Active At",
+    description: "Last time this session was used.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public lastActiveAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device Name",
+    description: "Friendly name for the device used to sign in.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceName?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device Type",
+    description: "Type of device (e.g., desktop, mobile).",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceType?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Device OS",
+    description: "Operating system reported for this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceOS?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Browser",
+    description: "Browser or client application used for this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public deviceBrowser?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "IP Address",
+    description: "IP address observed for this session.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public ipAddress?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "User Agent",
+    description: "Complete user agent string supplied by the client.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public userAgent?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    title: "Is Revoked",
+    description: "Marks whether the session has been explicitly revoked.",
+    isDefaultValueColumn: true,
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isRevoked?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Revoked At",
+    description: "Timestamp when the session was revoked, if applicable.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public revokedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Revoked Reason",
+    description: "Optional reason describing why the session was revoked.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public revokedReason?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    title: "Additional Info",
+    description:
+      "Flexible JSON payload for storing structured session metadata.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public additionalInfo?: JSONObject = undefined;
+}
+
+export default UserSession;

Common/Models/DatabaseModels/UserWhatsApp.ts

@@ -0,0 +1,288 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import CurrentUserCanAccessRecordBy from "../../Types/Database/CurrentUserCanAccessRecordBy";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import Phone from "../../Types/Phone";
+import Text from "../../Types/Text";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@TenantColumn("projectId")
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [Permission.CurrentUser],
+  read: [Permission.CurrentUser],
+  delete: [Permission.CurrentUser],
+  update: [Permission.CurrentUser],
+})
+@CrudApiEndpoint(new Route("/user-whatsapp"))
+@Entity({
+  name: "UserWhatsApp",
+})
+@TableMetadata({
+  tableName: "UserWhatsApp",
+  singularName: "WhatsApp Number",
+  pluralName: "WhatsApp Numbers",
+  icon: IconProp.WhatsApp,
+  tableDescription: "WhatsApp numbers used for WhatsApp notifications.",
+})
+@CurrentUserCanAccessRecordBy("userId")
+class UserWhatsApp extends BaseModel {
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    title: "WhatsApp Number",
+    required: true,
+    unique: false,
+    type: TableColumnType.Phone,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.Phone,
+    length: ColumnLength.Phone,
+    unique: false,
+    nullable: false,
+    transformer: Phone.getDatabaseTransformer(),
+  })
+  public phone?: Phone = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "user",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "Relation to User who this WhatsApp number belongs to",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description: "User ID who this WhatsApp number belongs to",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  @Index()
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    title: "Is Verified",
+    description: "Is this WhatsApp number verified?",
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: false,
+  })
+  public isVerified?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    title: "Verification Code",
+    description: "Temporary Verification Code",
+    isDefaultValueColumn: true,
+    computed: true,
+    required: true,
+    type: TableColumnType.ShortText,
+    forceGetDefaultValueOnCreate: () => {
+      return Text.generateRandomNumber(6);
+    },
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    length: ColumnLength.ShortText,
+  })
+  public verificationCode?: string = undefined;
+}
+
+export default UserWhatsApp;

Common/Models/DatabaseModels/WhatsAppLog.ts

@@ -0,0 +1,909 @@
+import Project from "./Project";
+import Incident from "./Incident";
+import Alert from "./Alert";
+import ScheduledMaintenance from "./ScheduledMaintenance";
+import StatusPage from "./StatusPage";
+import StatusPageAnnouncement from "./StatusPageAnnouncement";
+import User from "./User";
+import OnCallDutyPolicy from "./OnCallDutyPolicy";
+import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
+import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
+import Team from "./Team";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import Phone from "../../Types/Phone";
+import WhatsAppStatus from "../../Types/WhatsAppStatus";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadWhatsAppLog,
+  ],
+  delete: [],
+  update: [],
+})
+@CrudApiEndpoint(new Route("/whatsapp-log"))
+@Entity({
+  name: "WhatsAppLog",
+})
+@EnableWorkflow({
+  create: true,
+  delete: false,
+  update: false,
+})
+@TableMetadata({
+  tableName: "WhatsAppLog",
+  singularName: "WhatsApp Log",
+  pluralName: "WhatsApp Logs",
+  icon: IconProp.WhatsApp,
+  tableDescription:
+    "Logs of all the WhatsApp messages sent out to all users and subscribers for this project.",
+})
+export default class WhatsAppLog extends BaseModel {
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Phone,
+    title: "To Number",
+    description: "Phone Number WhatsApp message was sent to",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Phone,
+    length: ColumnLength.Phone,
+    transformer: Phone.getDatabaseTransformer(),
+  })
+  public toNumber?: Phone = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Phone,
+    title: "From Number",
+    description:
+      "Phone Number WhatsApp message was sent from (Business Number ID)",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Phone,
+    length: ColumnLength.Phone,
+    transformer: Phone.getDatabaseTransformer(),
+  })
+  public fromNumber?: Phone = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.VeryLongText,
+    title: "Message Text",
+    description: "Text content of the WhatsApp message",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.VeryLongText,
+  })
+  public messageText?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Status Message",
+    description: "Status Message (if any)",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public statusMessage?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "WhatsApp Message ID",
+    description: "Message ID returned by Meta's API",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public whatsAppMessageId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    title: "Status of the WhatsApp Message",
+    description: "Status of the WhatsApp message sent",
+    canReadOnRelationQuery: false,
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public status?: WhatsAppStatus = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Number,
+    title: "WhatsApp Cost",
+    description: "WhatsApp Message Cost in USD Cents",
+    canReadOnRelationQuery: false,
+    isDefaultValueColumn: true,
+    defaultValue: 0,
+  })
+  @Column({
+    nullable: false,
+    default: 0,
+    type: ColumnType.Number,
+  })
+  public whatsAppCostInUSDCents?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Incident associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Incident ID",
+    description: "ID of Incident associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User who initiated this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of User who initiated this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "alertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Alert associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "alertId" })
+  public alert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert ID",
+    description: "ID of Alert associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public alertId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "scheduledMaintenanceId",
+    type: TableColumnType.Entity,
+    modelType: ScheduledMaintenance,
+    title: "Scheduled Maintenance",
+    description: "Scheduled Maintenance associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return ScheduledMaintenance;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "scheduledMaintenanceId" })
+  public scheduledMaintenance?: ScheduledMaintenance = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Scheduled Maintenance ID",
+    description:
+      "ID of Scheduled Maintenance associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public scheduledMaintenanceId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageId",
+    type: TableColumnType.Entity,
+    modelType: StatusPage,
+    title: "Status Page",
+    description: "Status Page associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPage;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageId" })
+  public statusPage?: StatusPage = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page ID",
+    description: "ID of Status Page associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "statusPageAnnouncementId",
+    type: TableColumnType.Entity,
+    modelType: StatusPageAnnouncement,
+    title: "Status Page Announcement",
+    description:
+      "Status Page Announcement associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return StatusPageAnnouncement;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "statusPageAnnouncementId" })
+  public statusPageAnnouncement?: StatusPageAnnouncement = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Status Page Announcement ID",
+    description:
+      "ID of Status Page Announcement associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public statusPageAnnouncementId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "teamId",
+    type: TableColumnType.Entity,
+    modelType: Team,
+    title: "Team",
+    description: "Team associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Team;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "teamId" })
+  public team?: Team = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Team ID",
+    description: "ID of Team associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public teamId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicy,
+    title: "On-Call Duty Policy",
+    description: "On-Call Duty Policy associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicy;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyId" })
+  public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy ID",
+    description:
+      "ID of On-Call Duty Policy associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyEscalationRuleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicyEscalationRule,
+    title: "On-Call Duty Policy Escalation Rule",
+    description:
+      "On-Call Duty Policy Escalation Rule associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicyEscalationRule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyEscalationRuleId" })
+  public onCallDutyPolicyEscalationRule?: OnCallDutyPolicyEscalationRule =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Escalation Rule ID",
+    description:
+      "ID of On-Call Duty Policy Escalation Rule associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyEscalationRuleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyScheduleId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicySchedule,
+    title: "On-Call Duty Policy Schedule",
+    description:
+      "On-Call Duty Policy Schedule associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicySchedule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyScheduleId" })
+  public onCallDutyPolicySchedule?: OnCallDutyPolicySchedule = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Duty Policy Schedule ID",
+    description:
+      "ID of On-Call Duty Policy Schedule associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyScheduleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Server/API/AcmeChallengeAPI.ts

@@ -0,0 +1,64 @@
+import AcmeChallenge from "../../Models/DatabaseModels/AcmeChallenge";
+import NotFoundException from "../../Types/Exception/NotFoundException";
+import AcmeChallengeService, {
+  Service as AcmeChallengeServiceType,
+} from "../Services/AcmeChallengeService";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+  NextFunction,
+} from "../Utils/Express";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+
+export default class AcmeChallengeAPI extends BaseAPI<
+  AcmeChallenge,
+  AcmeChallengeServiceType
+> {
+  private wellKnownRouter: ExpressRouter;
+
+  public constructor() {
+    super(AcmeChallenge, AcmeChallengeService);
+
+    this.wellKnownRouter = Express.getRouter();
+
+    this.wellKnownRouter.get(
+      "/acme-challenge/.well-known/:token",
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const challenge: AcmeChallenge | null =
+            await AcmeChallengeService.findOneBy({
+              query: {
+                token: req.params["token"] as string,
+              },
+              select: {
+                challenge: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (!challenge) {
+            return next(new NotFoundException("Challenge not found"));
+          }
+
+          return Response.sendTextResponse(
+            req,
+            res,
+            challenge.challenge as string,
+          );
+        } catch (err) {
+          return next(err);
+        }
+      },
+    );
+
+    this.router.use("/", this.wellKnownRouter);
+  }
+
+  public getWellKnownRouter(): ExpressRouter {
+    return this.wellKnownRouter;
+  }
+}

Common/Server/API/EnterpriseLicenseAPI.ts

@@ -0,0 +1,102 @@
+import EnterpriseLicense from "../../Models/DatabaseModels/EnterpriseLicense";
+import BadDataException from "../../Types/Exception/BadDataException";
+import { JSONObject } from "../../Types/JSON";
+import EnterpriseLicenseService, {
+  Service as EnterpriseLicenseServiceType,
+} from "../Services/EnterpriseLicenseService";
+import UserMiddleware from "../Middleware/UserAuthorization";
+import JSONWebToken from "../Utils/JsonWebToken";
+import Response from "../Utils/Response";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
+import BaseAPI from "./BaseAPI";
+// import { Host } from "../EnvironmentConfig";
+
+export default class EnterpriseLicenseAPI extends BaseAPI<
+  EnterpriseLicense,
+  EnterpriseLicenseServiceType
+> {
+  public constructor() {
+    super(EnterpriseLicense, EnterpriseLicenseService);
+
+    this.router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/validate`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const licenseKey: string | undefined = req.body["licenseKey"];
+
+          if (!licenseKey) {
+            throw new BadDataException("License key is required");
+          }
+
+          //const serverHost: string = Host.toString();
+
+          /*
+           * if (!serverHost.includes("oneuptime.com")) {
+           *   throw new BadDataException(
+           *     "Enterprise license validation is only available on oneuptime.com",
+           *   );
+           * }
+           */
+
+          const license: EnterpriseLicense | null =
+            await EnterpriseLicenseService.findOneBy({
+              query: {
+                licenseKey: licenseKey,
+              },
+              select: {
+                companyName: true,
+                expiresAt: true,
+                licenseKey: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (!license) {
+            throw new BadDataException("License key is invalid");
+          }
+
+          if (!license.expiresAt) {
+            throw new BadDataException("License expiration is not set");
+          }
+
+          const now: number = Date.now();
+          const expiresAtMs: number = license.expiresAt.getTime();
+          const secondsUntilExpiry: number = Math.floor(
+            (expiresAtMs - now) / 1000,
+          );
+
+          if (secondsUntilExpiry <= 0) {
+            throw new BadDataException("License key has expired");
+          }
+
+          const payload: JSONObject = {
+            companyName: license.companyName || "",
+            expiresAt: license.expiresAt.toISOString(),
+            licenseKey: license.licenseKey || "",
+          };
+
+          const token: string = JSONWebToken.signJsonPayload(
+            payload,
+            Math.max(secondsUntilExpiry, 1),
+          );
+
+          return Response.sendJsonObjectResponse(req, res, {
+            companyName: payload["companyName"] as string,
+            expiresAt: payload["expiresAt"] as string,
+            licenseKey: payload["licenseKey"] as string,
+            token,
+          });
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+  }
+}

Common/Server/API/GlobalConfigAPI.ts

@@ -9,6 +9,15 @@ import {
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig";
+import ObjectID from "../../Types/ObjectID";
+import { JSONObject } from "../../Types/JSON";
+import BadDataException from "../../Types/Exception/BadDataException";
+import API from "../../Utils/API";
+import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
+import HTTPResponse from "../../Types/API/HTTPResponse";
+import PartialEntity from "../../Types/Database/PartialEntity";
+import { EnterpriseLicenseValidationUrl } from "../EnvironmentConfig";
+import UserMiddleware from "../Middleware/UserAuthorization";
 
 export default class GlobalConfigAPI extends BaseAPI<
   GlobalConfig,
@@ -45,5 +54,164 @@ export default class GlobalConfigAPI extends BaseAPI<
         }
       },
     );
+
+    this.router.get(
+      `${new this.entityType().getCrudApiPath()?.toString()}/license`,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const config: GlobalConfig | null =
+            await GlobalConfigService.findOneById({
+              id: ObjectID.getZeroObjectID(),
+              select: {
+                enterpriseCompanyName: true,
+                enterpriseLicenseExpiresAt: true,
+                enterpriseLicenseKey: true,
+                enterpriseLicenseToken: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          const responseBody: JSONObject = {
+            companyName: config?.enterpriseCompanyName || null,
+            expiresAt: config?.enterpriseLicenseExpiresAt
+              ? config.enterpriseLicenseExpiresAt.toISOString()
+              : null,
+            licenseKey: config?.enterpriseLicenseKey || null,
+            token: config?.enterpriseLicenseToken || null,
+          };
+
+          return Response.sendJsonObjectResponse(req, res, responseBody);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
+    this.router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/license`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const licenseKey: string =
+            (req.body["licenseKey"] as string | undefined)?.trim() || "";
+
+          if (!licenseKey) {
+            throw new BadDataException("License key is required");
+          }
+
+          const validationResponse:
+            | HTTPResponse<JSONObject>
+            | HTTPErrorResponse = await API.post<JSONObject>({
+            url: EnterpriseLicenseValidationUrl,
+            data: {
+              licenseKey,
+            },
+          });
+
+          if (!validationResponse.isSuccess()) {
+            const errorMessage: string =
+              validationResponse instanceof HTTPErrorResponse
+                ? validationResponse.message ||
+                  "Failed to validate license key."
+                : "Failed to validate license key.";
+            throw new BadDataException(errorMessage);
+          }
+
+          const payload: JSONObject = validationResponse.data as JSONObject;
+
+          const companyNameRaw: string =
+            (payload["companyName"] as string | undefined)?.trim() || "";
+          const expiresAtRaw: string =
+            (payload["expiresAt"] as string | undefined) || "";
+          const licenseKeyRaw: string =
+            (payload["licenseKey"] as string | undefined)?.trim() || licenseKey;
+          const licenseToken: string =
+            (payload["token"] as string | undefined) || "";
+
+          let licenseExpiry: Date | undefined = undefined;
+          if (expiresAtRaw) {
+            const parsedDate: Date = new Date(expiresAtRaw);
+
+            if (Number.isNaN(parsedDate.getTime())) {
+              throw new BadDataException(
+                "License expiration returned from server is invalid.",
+              );
+            }
+
+            licenseExpiry = parsedDate;
+          }
+
+          const updatePayload: PartialEntity<GlobalConfig> = {
+            enterpriseCompanyName: companyNameRaw || null,
+            enterpriseLicenseKey: licenseKeyRaw || null,
+            enterpriseLicenseExpiresAt: licenseExpiry || null,
+            enterpriseLicenseToken: licenseToken || null,
+          };
+
+          const globalConfigId: ObjectID = ObjectID.getZeroObjectID();
+
+          const existingConfig: GlobalConfig | null =
+            await GlobalConfigService.findOneById({
+              id: globalConfigId,
+              select: {
+                _id: true,
+              },
+              props: {
+                isRoot: true,
+                ignoreHooks: true,
+              },
+            });
+
+          if (existingConfig) {
+            await GlobalConfigService.updateOneById({
+              id: globalConfigId,
+              data: updatePayload,
+              props: {
+                isRoot: true,
+                ignoreHooks: true,
+              },
+            });
+          } else {
+            const newConfig: GlobalConfig = new GlobalConfig();
+            newConfig.id = globalConfigId;
+
+            if (companyNameRaw) {
+              newConfig.enterpriseCompanyName = companyNameRaw;
+            }
+
+            if (licenseKeyRaw) {
+              newConfig.enterpriseLicenseKey = licenseKeyRaw;
+            }
+
+            if (licenseToken) {
+              newConfig.enterpriseLicenseToken = licenseToken;
+            }
+
+            if (licenseExpiry) {
+              newConfig.enterpriseLicenseExpiresAt = licenseExpiry;
+            }
+
+            await GlobalConfigService.create({
+              data: newConfig,
+              props: {
+                isRoot: true,
+                ignoreHooks: true,
+              },
+            });
+          }
+
+          return Response.sendJsonObjectResponse(req, res, {
+            companyName: companyNameRaw || null,
+            expiresAt: licenseExpiry ? licenseExpiry.toISOString() : null,
+            licenseKey: licenseKeyRaw || null,
+            token: licenseToken || null,
+          });
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
   }
 }

Common/Server/API/MicrosoftTeamsAPI.ts

@@ -58,22 +58,31 @@ export default class MicrosoftTeamsAPI {
         "https://developer.microsoft.com/json-schemas/teams/v1.23/MicrosoftTeams.schema.json",
       manifestVersion: "1.23",
       version: AppVersion.toLowerCase().includes("unknown")
-        ? "1.1.0"
+        ? "1.5.0"
         : AppVersion,
       id: MicrosoftTeamsAppClientId,
       developer: {
-        name: "OneUptime",
+        name: "HackerBay Inc",
         websiteUrl: "https://oneuptime.com",
         privacyUrl: "https://oneuptime.com/legal/privacy",
         termsOfUseUrl: "https://oneuptime.com/legal/terms",
       },
+      publisherDocsUrl:
+        "https://oneuptime.com/docs/workspace-connections/microsoft-teams",
       name: {
         short: "OneUptime",
         full: "OneUptime - Complete Observability Platform",
       },
       description: {
-        short: "Monitor your apps, websites, APIs, and more with OneUptime",
-        full: "OneUptime is a complete open-source observability platform that helps you monitor your applications, websites, APIs, and infrastructure. Get alerted when things go wrong and maintain your SLAs.",
+        short: "Complete open-source monitoring and observability platform. ",
+        full: `<p>OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.</p>
+
+<p>In order to use the app, you need to have an active account with <a href="https://oneuptime.com" target="_blank">OneUptime</a>. Please send an email to <a href="mailto:support@oneuptime.com">support@oneuptime.com</a> if you need more details.</p>
+
+<p><strong>Create a new OneUptime Account:</strong> If you wish to sign up for a new account, you can do so by visiting <a href="https://oneuptime.com" target="_blank">OneUptime Sign Up</a>.</p>
+
+<p><strong>Help and Support:</strong> You can reach out to help and support via <a href="https://oneuptime.com/support" target="_blank">Support Page</a> or contact <a href="mailto:support@oneuptime.com">support@oneuptime.com</a>.</p>
+`,
       },
       // Default to size-specific names; route will adjust if fallbacks are used
       icons: {
@@ -614,9 +623,8 @@ export default class MicrosoftTeamsAPI {
                 projectId: new ObjectID(projectId),
                 workspaceType: WorkspaceType.MicrosoftTeams,
               });
-            const existingTenant: string | undefined = (
-              existingAuth?.miscData as any
-            )?.tenantId;
+            const existingTenant: string | undefined =
+              existingAuth?.workspaceProjectId;
             if (existingTenant) {
               tenantForConsent = existingTenant;
             }

Common/Server/API/NotificationAPI.ts

@@ -4,11 +4,11 @@ import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
+  NextFunction,
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
 import BadDataException from "../../Types/Exception/BadDataException";
-import Exception from "../../Types/Exception/Exception";
 import JSONFunctions from "../../Types/JSONFunctions";
 import ObjectID from "../../Types/ObjectID";
 import Permission, { UserPermission } from "../../Types/Permission";
@@ -19,7 +19,7 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/notification/recharge",
   UserMiddleware.getUserMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse) => {
+  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
     try {
       let amount: number | PositiveNumber = JSONFunctions.deserializeValue(
         req.body.amount,
@@ -106,8 +106,8 @@ router.post(
           ),
         );
       }
-    } catch (err: any) {
-      return Response.sendErrorResponse(req, res, err as Exception);
+    } catch (err) {
+      return next(err);
     }
 
     return Response.sendEmptySuccessResponse(req, res);

Common/Server/API/ProjectAPI.ts

@@ -20,11 +20,72 @@ import PositiveNumber from "../../Types/PositiveNumber";
 import Project from "../../Models/DatabaseModels/Project";
 import Reseller from "../../Models/DatabaseModels/Reseller";
 import TeamMember from "../../Models/DatabaseModels/TeamMember";
+import BadDataException from "../../Types/Exception/BadDataException";
+import Permission, { UserPermission } from "../../Types/Permission";
+import ObjectID from "../../Types/ObjectID";
+import { JSONObject } from "../../Types/JSON";
 
 export default class ProjectAPI extends BaseAPI<Project, ProjectServiceType> {
   public constructor() {
     super(Project, ProjectService);
 
+    this.router.put(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/change-plan`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          if (!IsBillingEnabled) {
+            throw new BadDataException(
+              "Billing is not enabled for this server",
+            );
+          }
+
+          const projectId: ObjectID = new ObjectID(req.params["id"] as string);
+
+          const body: JSONObject = (req.body as JSONObject) || {};
+          const data: JSONObject = (body["data"] as JSONObject) || {};
+          const paymentProviderPlanId: string | undefined = data[
+            "paymentProviderPlanId"
+          ] as string | undefined;
+
+          if (!paymentProviderPlanId) {
+            throw new BadDataException("Plan ID is required to change plan");
+          }
+
+          const permissions: Array<UserPermission> =
+            await this.getPermissionsForTenant(req);
+
+          const hasBillingPermission: boolean =
+            permissions.filter((permission: UserPermission) => {
+              return (
+                permission.permission.toString() ===
+                  Permission.ProjectOwner.toString() ||
+                permission.permission.toString() ===
+                  Permission.ManageProjectBilling.toString()
+              );
+            }).length > 0;
+
+          if (
+            !hasBillingPermission &&
+            !(req as OneUptimeRequest).userAuthorization?.isMasterAdmin
+          ) {
+            throw new BadDataException(
+              `You need ${Permission.ProjectOwner} or ${Permission.ManageProjectBilling} permission to change project plan`,
+            );
+          }
+
+          await ProjectService.changePlan({
+            projectId: projectId,
+            paymentProviderPlanId: paymentProviderPlanId,
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     /*
      * This API lists all the projects where user is its team member.
      * This API is usually used to show project selector dropdown in the UI

Common/Server/API/ProjectSSO.ts

@@ -1,7 +1,11 @@
 import ProjectSsoService, {
   Service as ProjectSsoServiceType,
 } from "../Services/ProjectSsoService";
-import { ExpressRequest, ExpressResponse } from "../Utils/Express";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
@@ -22,43 +26,47 @@ export default class ProjectSsoAPI extends BaseAPI<
       `${new this.entityType()
         .getCrudApiPath()
         ?.toString()}/:projectId/sso-list`,
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        const projectId: ObjectID = new ObjectID(
-          req.params["projectId"] as string,
-        );
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const projectId: ObjectID = new ObjectID(
+            req.params["projectId"] as string,
+          );
 
-        if (!projectId) {
-          return Response.sendErrorResponse(
+          if (!projectId) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid project id."),
+            );
+          }
+
+          const sso: Array<ProjectSSO> = await this.service.findBy({
+            query: {
+              projectId: projectId,
+              isEnabled: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            select: {
+              name: true,
+              description: true,
+              _id: true,
+            },
+            props: {
+              isRoot: true,
+            },
+          });
+
+          return Response.sendEntityArrayResponse(
             req,
             res,
-            new BadDataException("Invalid project id."),
+            sso,
+            new PositiveNumber(sso.length),
+            ProjectSSO,
           );
+        } catch (err) {
+          return next(err);
         }
-
-        const sso: Array<ProjectSSO> = await this.service.findBy({
-          query: {
-            projectId: projectId,
-            isEnabled: true,
-          },
-          limit: LIMIT_PER_PROJECT,
-          skip: 0,
-          select: {
-            name: true,
-            description: true,
-            _id: true,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-
-        return Response.sendEntityArrayResponse(
-          req,
-          res,
-          sso,
-          new PositiveNumber(sso.length),
-          ProjectSSO,
-        );
       },
     );
   }