Merge pull request #756 from OneUptime/reseller-flow

add reseller models

.eslintrc.json

@@ -45,7 +45,8 @@
         "workbox": true,
         "importScripts": true,
         "$TSFixMe": true,
-        "NodeJS": true
+        "NodeJS": true,
+        "JSX": true
     },
     "parser": "@typescript-eslint/parser",
     "rules": {

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: 'Bug: <Title of the issue>'
+labels: 'bug'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,8 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
+title: 'Enhancement: <Title of the issue>'
+labels: 'enhancement'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/request-for-test.md

@@ -1,7 +1,7 @@
 ---
 name: Request for Test
 about: 'Request more tests for product code in the platform. '
-title: Tests for [FIleName]
+title: Tests for [FileName]
 labels: 'write tests'
 assignees: ''
 

.github/pull_request_template.md

@@ -7,7 +7,7 @@
 - [ ] Please make sure all jobs pass before requesting a review. 
 - [ ] Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if such).
 - [ ] Have you lint your code locally before submission?
-- [ ] Did you write tests where appropiate?
+- [ ] Did you write tests where appropriate?
 
 ### Related Issue?
 

.github/workflows/code-analysis.yml

@@ -0,0 +1,20 @@
+name: Code Analysis
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/compile.yml

@@ -25,20 +25,6 @@ jobs:
       - run: cd CommonUI && npm install --force
       - run: cd Accounts && npm install && npm run compile
 
-  compile-alert:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd Alert && npm install && npm run compile
-
   compile-api-reference:
     runs-on: ubuntu-latest
     env:
@@ -53,6 +39,20 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd ApiReference && npm install && npm run compile
 
+  compile-link-shortener:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd Model && npm install
+      - run: cd CommonServer && npm install
+      - run: cd LinkShortener && npm install && npm run compile
+
   compile-common-server:
     runs-on: ubuntu-latest
     env:
@@ -205,7 +205,7 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd Licensing && npm install && npm run compile
 
-  compile-mail:
+  compile-notification:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -217,7 +217,7 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd Mail && npm install && npm run compile
+      - run: cd Notification && npm install && npm run compile
 
   compile-model:
     runs-on: ubuntu-latest

.github/workflows/docker-build.yml

@@ -25,7 +25,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Accounts/Dockerfile .
 
-  docker-build-alert:
+  docker-build-link-shortener:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -35,10 +35,10 @@ jobs:
 
       - name: Preinstall 
         run: npm run prerun
-
-      # build image for mail service
+      
+      # build image for accounts service
       - name: build docker image
-        run: sudo docker build -f ./Alert/Dockerfile .
+        run: sudo docker build -f ./LinkShortener/Dockerfile .
 
   docker-build-api-reference:
     runs-on: ubuntu-latest
@@ -191,7 +191,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Licensing/Dockerfile .
 
-  docker-build-mail:
+  docker-build-notification:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -204,22 +204,8 @@ jobs:
 
       # build image for mail service
       - name: build docker image
-        run: sudo docker build -f ./Mail/Dockerfile .
+        run: sudo docker build -f ./Notification/Dockerfile .
 
-  docker-build-nginx:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-      
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for mail service
-      - name: build docker image
-        run: sudo docker build -f ./Nginx/Dockerfile ./Nginx
 
   docker-build-probe:
     runs-on: ubuntu-latest

.github/workflows/playwright.yml.skip

@@ -8,6 +8,8 @@ jobs:
   test:
     timeout-minutes: 60
     runs-on: ubuntu-latest
+    env:
+      BASE_URL: http://localhost
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
@@ -15,10 +17,12 @@ jobs:
         node-version: 16
     - name: Install dependencies
       run: npm ci
+    - name: Run Server in Docker
+      run: npm run dev
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
     - name: Run Playwright tests
-      run: npx playwright test
+      run: cd Playwright  && npm install && npx playwright install && npx playwright test
     - uses: actions/upload-artifact@v3
       if: always()
       with:

.github/workflows/test-release.yml

@@ -1,430 +0,0 @@
-name: Test Image Deploy to DockerHub
-
-on:
-  push:
-    branches:
-      - "master"
-
-jobs:
-
-  test-server-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/test-server:$ONEUPTIME_VERSION-test --tag oneuptime/test-server:test --push -f ./TestServer/Dockerfile .
-
-  workflow-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/workflow:$ONEUPTIME_VERSION-test --tag oneuptime/workflow:test --push -f ./Workflow/Dockerfile .
-
-  workers-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy workers.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/workers:$ONEUPTIME_VERSION-test --tag oneuptime/workers:test --push -f ./Workers/Dockerfile .
-
-  staus-page-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy status-page.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:$ONEUPTIME_VERSION-test --tag oneuptime/status-page:test --push -f ./StatusPage/Dockerfile .
-
-  realtime-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy realtime.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:$ONEUPTIME_VERSION-test --tag oneuptime/realtime:test --push -f ./Realtime/Dockerfile .
-      
-
-  probe-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy probe-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:$ONEUPTIME_VERSION-test --tag oneuptime/probe:test --push -f ./Probe/Dockerfile .
-
-  probe-api-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy probe-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe-api:$ONEUPTIME_VERSION-test --tag oneuptime/probe-api:test --push -f ./ProbeAPI/Dockerfile .
-
-  nginx-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:$ONEUPTIME_VERSION-test --tag oneuptime/nginx:test --push -f ./Nginx/Dockerfile .
-      
-
-  mail-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/mail:$ONEUPTIME_VERSION-test --tag oneuptime/mail:test --push -f ./Mail/Dockerfile .
-      
-
-  licensing-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:$ONEUPTIME_VERSION-test --tag oneuptime/licensing:test --push -f ./Licensing/Dockerfile .
-
-  integrations-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/integrations:$ONEUPTIME_VERSION-test --tag oneuptime/integrations:test --push -f ./Integration/Dockerfile .
-      
-      
-
-
-  identity-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/identity:$ONEUPTIME_VERSION-test --tag oneuptime/identity:test --push -f ./Identity/Dockerfile .
-      
-
-  home-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:$ONEUPTIME_VERSION-test --tag oneuptime/home:test --push -f ./Home/Dockerfile .
-      
-
-  helm-chart-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/helm-chart:$ONEUPTIME_VERSION-test --tag oneuptime/helm-chart:test --push -f ./HelmChart/Dockerfile .
-      
-
-  haraka-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/haraka:$ONEUPTIME_VERSION-test --tag oneuptime/haraka:test --push -f ./Haraka/Dockerfile .
-
-  file-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy file.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/file:$ONEUPTIME_VERSION-test --tag oneuptime/file:test --push -f ./File/Dockerfile .
-      
-      
-
-  dashboard-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy dashboard-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/dashboard:$ONEUPTIME_VERSION-test --tag oneuptime/dashboard:test --push -f ./Dashboard/Dockerfile .
-      
-      
-
-
-  dashboard-api-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy dashboard-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/dashboard-api:$ONEUPTIME_VERSION-test --tag oneuptime/dashboard-api:test --push -f ./DashboardAPI/Dockerfile .
-      
-      
-
-
-  api-reference-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy api-reference.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-reference:$ONEUPTIME_VERSION-test --tag oneuptime/api-reference:test --push -f ./ApiReference/Dockerfile .
-      
-      
-
-
-  alert-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/alert:$ONEUPTIME_VERSION-test --tag oneuptime/alert:test --push -f ./Alert/Dockerfile .
-      
-      
-
-
-  accounts-test-docker-image-deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: 6.0.${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:$ONEUPTIME_VERSION-test --tag oneuptime/accounts:test --push -f ./Accounts/Dockerfile .
-      
-      

.github/workflows/test.common-server.yaml

@@ -20,4 +20,4 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && bash test-setup.sh
-      - run: cd CommonServer && npm install && npm run test
+      - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && npm install && npm run test

.gitignore

@@ -69,12 +69,10 @@ secret.env
 config.env
 config.env.tmp
 config.env.temp
-docker-compose.yml
 logs.txt
 
 */Cert.crt
 */Key.key
-Nginx/default.conf
 
 Certs/StatusPageCerts/*.crt
 Certs/StatusPageCerts/*.key
@@ -85,3 +83,8 @@ Certs/ServerCerts/*.key
 Backups/*.backup
 Backups/*.sql
 Backups/*.tar
+
+.env
+
+Haraka/dkim/keys/private_base64.txt
+Haraka/dkim/keys/public_base64.txt

.vscode/launch.json

@@ -41,6 +41,34 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/ApiReference",
+            "name": "API Reference: Debug with Docker",
+            "port": 9178,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/LinkShortener",
+            "name": "Link Shortener: Debug with Docker",
+            "port": 9826,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/TestServer",
@@ -58,7 +86,7 @@
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Probe",
-            "name": "Dashboard API: Debug with Docker",
+            "name": "Probe: Debug with Docker",
             "port": 9655,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -113,9 +141,9 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Mail",
-            "name": "Mail: Debug with Docker",
-            "port": 9110,
+            "localRoot": "${workspaceFolder}/Notification",
+            "name": "Notification: Debug with Docker",
+            "port": 9111,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
             "skipFiles": [
@@ -307,20 +335,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/probe",
-            "name": "Probe: Debug with Docker",
-            "port": 9238,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "name": "CommonServer: Debug Tests",
             "type": "node",

Accounts/.env

@@ -1 +0,0 @@
-PORT=3003

Accounts/.env.tpl

@@ -1 +0,0 @@
-PORT={{ .Env.ACCOUNTS_PORT }}

Accounts/Dockerfile.tpl

@@ -3,10 +3,16 @@
 #
 
 # Pull base image nodejs image.
-FROM node:18.13.0-alpine
+FROM node:current-alpine
 USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
+ARG GIT_SHA
+ARG APP_VERSION
+
+ENV GIT_SHA=${GIT_SHA}
+ENV APP_VERSION=${APP_VERSION}
+
 
 # Install bash. 
 RUN apk update && apk add bash && apk add curl
@@ -73,6 +79,8 @@ EXPOSE 3003
 
 
 {{ if eq .Env.ENVIRONMENT "development" }}
+RUN mkdir /usr/src/app/dev-env
+RUN touch /usr/src/app/dev-env/.env
 #Run the app
 CMD [ "npm", "run", "dev" ]
 {{ else }}

Accounts/Serve.ts

@@ -7,7 +7,7 @@ export const APP_NAME: string = 'accounts';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: Function = async (): Promise<void> => {
+const init: () => Promise<void> = async (): Promise<void> => {
     try {
         // init the app
         await App(APP_NAME, undefined, true);
@@ -17,6 +17,8 @@ const init: Function = async (): Promise<void> => {
     }
 };
 
-init();
+init().catch((err: Error) => {
+    logger.error(err);
+});
 
 export default app;

Accounts/dev-env/README.md

@@ -0,0 +1 @@
+This is where env will be stored for the dev environment. This is where you will find the .env file when you exec into the container.

Accounts/nodemon.json

@@ -1,4 +1,4 @@
 {
     "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && webpack-dev-server --port=3003 --mode=development"
+    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && webpack-dev-server --port=3003 --mode=development"
 }

Accounts/package-lock.json

@@ -7,7 +7,6 @@
         "": {
             "name": "accounts",
             "version": "0.1.0",
-            "hasInstallScript": true,
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
@@ -57,6 +56,7 @@
                 "@types/uuid": "^8.3.4",
                 "axios": "^0.26.1",
                 "crypto-js": "^4.1.1",
+                "json5": "^2.2.3",
                 "moment": "^2.29.2",
                 "moment-timezone": "^0.5.40",
                 "nanoid": "^3.3.2",
@@ -88,27 +88,31 @@
                 "@types/ejs": "^3.1.1",
                 "@types/gridfs-stream": "^0.5.35",
                 "@types/json2csv": "^5.0.3",
+                "@types/markdown-it": "^12.2.3",
                 "@types/nodemailer": "^6.4.7",
                 "airtable": "^0.11.3",
                 "axios": "^1.3.3",
                 "bullmq": "^3.6.6",
                 "Common": "file:../Common",
                 "cors": "^2.8.5",
+                "cron-parser": "^4.8.1",
                 "dotenv": "^16.0.0",
                 "ejs": "^3.1.8",
                 "express": "^4.17.3",
                 "gridfs-stream": "^1.1.1",
                 "handlebars": "^4.7.7",
+                "ioredis": "^5.3.2",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
+                "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
                 "node-device-detector": "^2.0.0",
                 "nodemailer": "^6.7.3",
                 "nodemailer-express-handlebars": "^5.0.0",
                 "pg": "^8.7.3",
-                "redis": "^4.2.0",
                 "socket.io": "^4.4.1",
                 "stripe": "^10.17.0",
+                "twilio": "^4.13.0",
                 "typeorm": "^0.3.10",
                 "typeorm-extension": "^2.2.13",
                 "vm2": "^3.9.14",
@@ -283,9 +287,9 @@
             }
         },
         "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -316,9 +320,9 @@
             }
         },
         "node_modules/@babel/eslint-parser/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -390,9 +394,9 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -449,9 +453,9 @@
             }
         },
         "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1782,9 +1786,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1994,9 +1998,9 @@
             }
         },
         "node_modules/@babel/preset-env/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -4836,9 +4840,9 @@
             }
         },
         "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -7060,9 +7064,9 @@
             }
         },
         "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -7134,9 +7138,9 @@
             }
         },
         "node_modules/eslint-plugin-react/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -9150,9 +9154,9 @@
             }
         },
         "node_modules/istanbul-lib-instrument/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -10430,9 +10434,9 @@
             }
         },
         "node_modules/make-dir/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -10750,9 +10754,9 @@
             "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
         },
         "node_modules/nodemon": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
-            "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+            "version": "2.0.22",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+            "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
             "dev": true,
             "dependencies": {
                 "chokidar": "^3.5.2",
@@ -10796,9 +10800,9 @@
             }
         },
         "node_modules/nodemon/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver"
@@ -12886,9 +12890,9 @@
             }
         },
         "node_modules/react-app-rewired/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver"
@@ -13647,9 +13651,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.3.8",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -14647,9 +14651,9 @@
             }
         },
         "node_modules/tough-cookie": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-            "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "dependencies": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",
@@ -15645,9 +15649,9 @@
             "dev": true
         },
         "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -16135,9 +16139,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16157,9 +16161,9 @@
                     "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16214,9 +16218,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16257,9 +16261,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -17120,9 +17124,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -17277,9 +17281,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -19339,9 +19343,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -19848,6 +19852,7 @@
                 "axios": "^0.26.1",
                 "crypto-js": "^4.1.1",
                 "jest": "^27.5.1",
+                "json5": "^2.2.3",
                 "moment": "^2.29.2",
                 "moment-timezone": "^0.5.40",
                 "nanoid": "^3.3.2",
@@ -19891,6 +19896,7 @@
                 "@types/jest": "^27.4.1",
                 "@types/json2csv": "^5.0.3",
                 "@types/jsonwebtoken": "^8.5.9",
+                "@types/markdown-it": "^12.2.3",
                 "@types/node": "^17.0.22",
                 "@types/nodemailer": "^6.4.7",
                 "airtable": "^0.11.3",
@@ -19898,23 +19904,26 @@
                 "bullmq": "^3.6.6",
                 "Common": "file:../Common",
                 "cors": "^2.8.5",
+                "cron-parser": "^4.8.1",
                 "dotenv": "^16.0.0",
                 "ejs": "^3.1.8",
                 "express": "^4.17.3",
                 "gridfs-stream": "^1.1.1",
                 "handlebars": "^4.7.7",
+                "ioredis": "^5.3.2",
                 "jest": "^27.5.1",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
+                "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
                 "node-device-detector": "^2.0.0",
                 "nodemailer": "^6.7.3",
                 "nodemailer-express-handlebars": "^5.0.0",
                 "pg": "^8.7.3",
-                "redis": "^4.2.0",
                 "socket.io": "^4.4.1",
                 "stripe": "^10.17.0",
                 "ts-jest": "^27.1.4",
+                "twilio": "^4.13.0",
                 "typeorm": "^0.3.10",
                 "typeorm-extension": "^2.2.13",
                 "vm2": "^3.9.14",
@@ -21163,9 +21172,9 @@
                     }
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -21210,9 +21219,9 @@
                     }
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -22615,9 +22624,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -23597,9 +23606,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -23846,9 +23855,9 @@
             "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
         },
         "nodemon": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
-            "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+            "version": "2.0.22",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+            "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
             "dev": true,
             "requires": {
                 "chokidar": "^3.5.2",
@@ -23879,9 +23888,9 @@
                     "dev": true
                 },
                 "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "version": "5.7.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+                    "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
                     "dev": true
                 },
                 "supports-color": {
@@ -25195,9 +25204,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "version": "5.7.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+                    "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
                     "dev": true
                 }
             }
@@ -25728,9 +25737,9 @@
             }
         },
         "semver": {
-            "version": "7.3.8",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "requires": {
                 "lru-cache": "^6.0.0"
             }
@@ -26499,9 +26508,9 @@
             }
         },
         "tough-cookie": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-            "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "requires": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",
@@ -27202,9 +27211,9 @@
             "dev": true
         },
         "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
         },
         "workbox-background-sync": {
             "version": "6.5.4",

Accounts/package.json

@@ -24,7 +24,7 @@
         "compile": "tsc",
         "start": "node --require ts-node/register Serve.ts",
         "audit": "npm audit --audit-level=low",
-        "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
+        "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
         "dep-check": "depcheck ./ --skip-missing=true'"
     },
     "browserslist": {

Accounts/public/index.html

@@ -5,14 +5,12 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#000000" />
-  <meta name="description" content="Web site created using create-react-app" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta charSet='utf-8' />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="theme-color" content="#000000">
   <meta name="slack-app-id" content="ACVBMTPJQ">
-  <meta name="description" content="This is the login page for OneUptime Dashboard">
-
+  <meta name="description" content="OneUptime — the complete open-source observability platform.">
 
   <!-- Google Tag Manager -->
   <script>(function (w, d, s, l, i) {
@@ -41,8 +39,8 @@
   <script src="/accounts/env.js"></script>
 
   <link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
     <style>
       * {
       font-family: Inter;

Accounts/src/Footer.tsx

@@ -1,7 +1,7 @@
-import React, { FunctionComponent } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
-const Footer: FunctionComponent = () => {
+const Footer: () => JSX.Element = () => {
     return (
         <div className="footer">
             <p>

Accounts/src/Pages/ForgotPassword.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Route from 'Common/Types/API/Route';
@@ -8,7 +8,7 @@ import Link from 'CommonUI/src/Components/Link/Link';
 import { FORGOT_PASSWORD_API_URL } from '../Utils/ApiPaths';
 import URL from 'Common/Types/API/URL';
 
-const ForgotPassword: FunctionComponent = () => {
+const ForgotPassword: () => JSX.Element = () => {
     const apiUrl: URL = FORGOT_PASSWORD_API_URL;
 
     const [isSuccess, setIsSuccess] = useState<boolean>(false);
@@ -65,7 +65,7 @@ const ForgotPassword: FunctionComponent = () => {
                             formType={FormType.Create}
                             maxPrimaryButtonWidth={true}
                             footer={
-                                <div className="actions pointer text-center mt-4 underline-on-hover fw-semibold">
+                                <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
                                     <p>
                                         <Link
                                             to={new Route('/accounts/login')}

Accounts/src/Pages/Login.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import User from 'Model/Models/User';
 import Route from 'Common/Types/API/Route';
 import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
@@ -12,23 +12,29 @@ import LoginUtil from '../Utils/Login';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import Alert, { AlertType } from 'CommonUI/src/Components/Alerts/Alert';
+import UiAnalytics from 'CommonUI/src/Utils/Analytics';
 
-const LoginPage: FunctionComponent = () => {
+const LoginPage: () => JSX.Element = () => {
     const apiUrl: URL = LOGIN_API_URL;
 
     if (UserUtil.isLoggedIn()) {
         Navigation.navigate(DASHBOARD_URL);
     }
 
+    const showSsoMessage: boolean = Boolean(
+        Navigation.getQueryStringByName('sso')
+    );
+
     const [showSsoTip, setShowSSOTip] = useState<boolean>(false);
 
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
-            <div className="sm:mx-auto sm:w-full sm:max-w-md">
+            <div className="">
                 <img
                     className="mx-auto h-12 w-auto"
                     src={OneUptimeLogo}
-                    alt="Your Company"
+                    alt="OneUptime"
                 />
                 <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
                     Sign in to your account
@@ -39,6 +45,16 @@ const LoginPage: FunctionComponent = () => {
                 </p>
             </div>
 
+            {showSsoMessage && (
+                <div className="sm:mx-auto sm:w-full sm:max-w-md mt-8">
+                    {' '}
+                    <Alert
+                        type={AlertType.DANGER}
+                        title="You must be logged into OneUptime account to use single sign-on (SSO) for your project. Logging in to OneUptime account and single sign on (SSO) for your project are two separate steps. Please use the form below to log in to your OneUptime account before you use SSO."
+                    />{' '}
+                </div>
+            )}
+
             <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
                 <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
                     <ModelForm<User>
@@ -74,12 +90,23 @@ const LoginPage: FunctionComponent = () => {
                         apiUrl={apiUrl}
                         formType={FormType.Create}
                         submitButtonText={'Login'}
-                        onSuccess={(value: JSONObject) => {
-                            LoginUtil.login(value);
+                        onSuccess={(
+                            value: User,
+                            miscData: JSONObject | undefined
+                        ) => {
+                            if (value && value.email) {
+                                UiAnalytics.userAuth(value.email);
+                                UiAnalytics.capture('accounts/login');
+                            }
+
+                            LoginUtil.login({
+                                user: value,
+                                token: miscData ? miscData['token'] : undefined,
+                            });
                         }}
                         maxPrimaryButtonWidth={true}
                         footer={
-                            <div className="actions pointer text-center mt-4 underline-on-hover fw-semibold">
+                            <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
                                 <p>
                                     {!showSsoTip && (
                                         <div

Accounts/src/Pages/NotFound.tsx

@@ -1,6 +1,6 @@
-import React, { FunctionComponent } from 'react';
+import React from 'react';
 
-const LoginPage: FunctionComponent = () => {
+const LoginPage: () => JSX.Element = () => {
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="sm:mx-auto sm:w-full sm:max-w-md">

Accounts/src/Pages/Register.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React, { useEffect } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -9,24 +9,121 @@ import LoginUtil from '../Utils/Login';
 import { JSONObject } from 'Common/Types/JSON';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
-import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config';
 import URL from 'Common/Types/API/URL';
 import { SIGNUP_API_URL } from '../Utils/ApiPaths';
+import Fields from 'CommonUI/src/Components/Forms/Types/Fields';
+import Dictionary from 'Common/Types/Dictionary';
+import UiAnalytics from 'CommonUI/src/Utils/Analytics';
+import LocalStorage from 'CommonUI/src/Utils/LocalStorage';
 
-const RegisterPage: FunctionComponent = () => {
+const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = SIGNUP_API_URL;
 
+    const [initialValues, setInitialValues] = React.useState<JSONObject>({});
+
     if (UserUtil.isLoggedIn()) {
         Navigation.navigate(DASHBOARD_URL);
     }
 
+    useEffect(() => {
+        // if promo code is found, please save it in localstorage.
+        if (Navigation.getQueryStringByName('promoCode')) {
+            LocalStorage.setItem(
+                'promoCode',
+                Navigation.getQueryStringByName('promoCode')
+            );
+        }
+
+        if (Navigation.getQueryStringByName('email')) {
+            setInitialValues({
+                email: Navigation.getQueryStringByName('email'),
+            });
+        }
+    }, []);
+
+    let formFields: Fields<User> = [
+        {
+            field: {
+                email: true,
+            },
+            fieldType: FormFieldSchemaType.Email,
+            placeholder: 'jeff@example.com',
+            required: true,
+            disabled: Boolean(initialValues && initialValues['email']),
+            title: 'Email',
+        },
+        {
+            field: {
+                name: true,
+            },
+            fieldType: FormFieldSchemaType.Text,
+            placeholder: 'Jeff Smith',
+            required: true,
+            title: 'Full Name',
+        },
+    ];
+
+    if (BILLING_ENABLED) {
+        formFields = formFields.concat([
+            {
+                field: {
+                    companyName: true,
+                },
+                fieldType: FormFieldSchemaType.Text,
+                placeholder: 'Acme, Inc.',
+                required: true,
+                title: 'Company Name',
+            },
+            {
+                field: {
+                    companyPhoneNumber: true,
+                },
+                fieldType: FormFieldSchemaType.Phone,
+                required: true,
+                placeholder: '+11234567890',
+                title: 'Phone Number',
+            },
+        ]);
+    }
+
+    formFields = formFields.concat([
+        {
+            field: {
+                password: true,
+            },
+            fieldType: FormFieldSchemaType.Password,
+            validation: {
+                minLength: 6,
+            },
+            placeholder: 'Password',
+            title: 'Password',
+            required: true,
+        },
+        {
+            field: {
+                confirmPassword: true,
+            } as any,
+            validation: {
+                minLength: 6,
+                toMatchField: 'password',
+            },
+            fieldType: FormFieldSchemaType.Password,
+            placeholder: 'Confirm Password',
+            title: 'Confirm Password',
+            overrideFieldKey: 'confirmPassword',
+            required: true,
+            forceShow: true,
+        },
+    ]);
+
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="sm:mx-auto sm:w-full sm:max-w-md">
                 <img
                     className="mx-auto h-12 w-auto"
                     src={OneUptimeLogo}
-                    alt="Your Company"
+                    alt="OneUptime"
                 />
                 <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
                     Create your OneUptime account
@@ -47,84 +144,46 @@ const RegisterPage: FunctionComponent = () => {
                         id="register-form"
                         showAsColumns={2}
                         name="Register"
+                        initialValues={initialValues}
                         maxPrimaryButtonWidth={true}
-                        initialValues={{
-                            email: '',
-                            name: '',
-                            companyName: '',
-                            companyPhoneNumber: '',
-                            password: '',
-                            confirmPassword: '',
-                        }}
-                        fields={[
-                            {
-                                field: {
-                                    email: true,
-                                },
-                                fieldType: FormFieldSchemaType.Email,
-                                placeholder: 'jeff@example.com',
-                                required: true,
-                                title: 'Email',
-                            },
-                            {
-                                field: {
-                                    name: true,
-                                },
-                                fieldType: FormFieldSchemaType.Text,
-                                placeholder: 'Jeff Smith',
-                                required: true,
-                                title: 'Full Name',
-                            },
-                            {
-                                field: {
-                                    companyName: true,
-                                },
-                                fieldType: FormFieldSchemaType.Text,
-                                placeholder: 'Acme, Inc.',
-                                required: true,
-                                title: 'Company Name',
-                            },
-                            {
-                                field: {
-                                    companyPhoneNumber: true,
-                                },
-                                fieldType: FormFieldSchemaType.Phone,
-                                required: true,
-                                placeholder: '+11234567890',
-                                title: 'Phone Number',
-                            },
-                            {
-                                field: {
-                                    password: true,
-                                },
-                                fieldType: FormFieldSchemaType.Password,
-                                validation: {
-                                    minLength: 6,
-                                },
-                                placeholder: 'Password',
-                                title: 'Password',
-                                required: true,
-                            },
-                            {
-                                field: {
-                                    password: true,
-                                },
-                                validation: {
-                                    minLength: 6,
-                                    toMatchField: 'password',
-                                },
-                                fieldType: FormFieldSchemaType.Password,
-                                placeholder: 'Confirm Password',
-                                title: 'Confirm Password',
-                                overideFieldKey: 'confirmPassword',
-                                required: true,
-                            },
-                        ]}
+                        fields={formFields}
                         apiUrl={apiUrl}
+                        onBeforeCreate={(item: User): Promise<User> => {
+                            const utmParams: Dictionary<string> =
+                                UserUtil.getUtmParams();
+
+                            if (
+                                utmParams &&
+                                Object.keys(utmParams).length > 0
+                            ) {
+                                item.utmSource = utmParams['utmSource'] || '';
+                                item.utmMedium = utmParams['utmMedium'] || '';
+                                item.utmCampaign =
+                                    utmParams['utmCampaign'] || '';
+                                item.utmTerm = utmParams['utmTerm'] || '';
+                                item.utmContent = utmParams['utmContent'] || '';
+                                item.utmUrl = utmParams['utmUrl'] || '';
+
+                                UiAnalytics.capture('utm_event', utmParams);
+                            }
+
+                            return Promise.resolve(item);
+                        }}
                         formType={FormType.Create}
                         submitButtonText={'Sign Up'}
-                        onSuccess={(value: JSONObject) => {
-                            LoginUtil.login(value);
+                        onSuccess={(
+                            value: User,
+                            miscData: JSONObject | undefined
+                        ) => {
+                            if (value && value.email) {
+                                UiAnalytics.userAuth(value.email);
+                                UiAnalytics.capture('accounts/register');
+                            }
+
+                            LoginUtil.login({
+                                user: value,
+                                token: miscData ? miscData['token'] : undefined,
+                            });
                         }}
                     />
                 </div>

Accounts/src/Pages/ResetPassword.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -10,7 +10,7 @@ import URL from 'Common/Types/API/URL';
 import { RESET_PASSWORD_API_URL } from '../Utils/ApiPaths';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 
-const RegisterPage: FunctionComponent = () => {
+const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = RESET_PASSWORD_API_URL;
     const [isSuccess, setIsSuccess] = useState<boolean>(false);
 
@@ -47,20 +47,16 @@ const RegisterPage: FunctionComponent = () => {
                             modelType={User}
                             id="register-form"
                             name="Reset Password"
-                            onBeforeCreate={(item: User) => {
+                            onBeforeCreate={(item: User): Promise<User> => {
                                 item.resetPasswordToken =
                                     Navigation.getLastParam()
                                         ?.toString()
                                         .replace('/', '')
                                         .toString() || '';
-                                return item;
+                                return Promise.resolve(item);
                             }}
                             showAsColumns={1}
                             maxPrimaryButtonWidth={true}
-                            initialValues={{
-                                password: '',
-                                confirmPassword: '',
-                            }}
                             fields={[
                                 {
                                     field: {
@@ -85,7 +81,7 @@ const RegisterPage: FunctionComponent = () => {
                                     fieldType: FormFieldSchemaType.Password,
                                     placeholder: 'Confirm Password',
                                     title: 'Confirm Password',
-                                    overideFieldKey: 'confirmPassword',
+                                    overrideFieldKey: 'confirmPassword',
                                     required: true,
                                 },
                             ]}

Accounts/src/Pages/VerifyEmail.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import Route from 'Common/Types/API/Route';
 import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -12,12 +12,12 @@ import ObjectID from 'Common/Types/ObjectID';
 import URL from 'Common/Types/API/URL';
 import API from 'CommonUI/src/Utils/API/API';
 
-const VerifyEmail: FunctionComponent = () => {
+const VerifyEmail: () => JSX.Element = () => {
     const apiUrl: URL = VERIFY_EMAIL_API_URL;
     const [error, setError] = useState<string>('');
     const [isLoading, setIsLoading] = useState<boolean>(true);
 
-    const init: Function = async (): Promise<void> => {
+    const init: () => Promise<void> = async (): Promise<void> => {
         // Ping an API here.
         setError('');
         setIsLoading(true);
@@ -68,7 +68,7 @@ const VerifyEmail: FunctionComponent = () => {
                                 <div className="d-flex flex-column h-100">
                                     <div className="auth-content my-auto">
                                         <div
-                                            className="mt-4 text-center"
+                                            className="mt-4 text-center flex justify-center"
                                             style={{ marginBottom: '40px' }}
                                         >
                                             <img
@@ -82,7 +82,7 @@ const VerifyEmail: FunctionComponent = () => {
                                                     Your email is verified.
                                                 </h5>
                                                 <p className="text-muted mt-2 mb-0">
-                                                    Thank you for veryfing your
+                                                    Thank you for verifying your
                                                     email. You can now log in to
                                                     OneUptime.{' '}
                                                 </p>
@@ -109,7 +109,7 @@ const VerifyEmail: FunctionComponent = () => {
                                                             '/accounts/login'
                                                         )
                                                     }
-                                                    className="underline-on-hover text-primary fw-semibold"
+                                                    className="hover:underline text-primary fw-semibold"
                                                 >
                                                     Login.
                                                 </Link>

Accounts/src/Utils/Login.ts

@@ -15,6 +15,7 @@ export default abstract class LoginUtil {
             value['user'] as JSONObject,
             User
         ) as User;
+
         const token: string = value['token'] as string;
 
         UserUtil.setAccessToken(token);

Accounts/webpack.config.js

@@ -38,9 +38,7 @@ module.exports = {
         new webpack.DefinePlugin({
             'process': {
                 'env': {
-                    ...readEnvFile('../Common/.env'),
-                    ...readEnvFile('../CommonUI/.env'),
-                    ...readEnvFile('./.env')
+                    ...readEnvFile('/usr/src/app/dev-env/.env')
                 }
             }
         }),

AdminDashboard/Dockerfile.tpl

@@ -3,10 +3,16 @@
 #
 
 # Pull base image nodejs image.
-FROM node:18.13.0-alpine
+FROM node:current-alpine
 USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
+ARG GIT_SHA
+ARG APP_VERSION
+
+ENV GIT_SHA=${GIT_SHA}
+ENV APP_VERSION=${APP_VERSION}
+
 
 # Install bash. 
 RUN apk update && apk add bash && apk add curl

Alert/.env.tpl

@@ -1 +0,0 @@
-PORT={{ .Env.ALERT_PORT }}

ApiReference/.env.tpl

@@ -1 +0,0 @@
-PORT={{ .Env.API_DOCS_PORT }}

ApiReference/CodeExamples/DataTypes/GreaterThan.md

@@ -1,7 +1,7 @@
 {
     "query": {
         "age": {
-            "_type": "GraterThan",
+            "_type": "GreaterThan",
             "value": 10
         }
     }

ApiReference/Dockerfile.tpl

@@ -1,8 +1,14 @@
 # Pull base image nodejs image.
-FROM node:18.13.0-alpine
+FROM node:current-alpine
 USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
+ARG GIT_SHA
+ARG APP_VERSION
+
+ENV GIT_SHA=${GIT_SHA}
+ENV APP_VERSION=${APP_VERSION}
+
 
 # Install bash. 
 RUN apk update && apk add bash && apk add curl

ApiReference/Index.ts

@@ -20,7 +20,7 @@ import DataTypeServiceHandler from './Service/DataType';
 import Dictionary from 'Common/Types/Dictionary';
 
 const ResourceDictionary: Dictionary<ModelDocumentation> =
-    ResourceUtil.getReosurceDictionaryByPath();
+    ResourceUtil.getResourceDictionaryByPath();
 
 const APP_NAME: string = 'reference';
 
@@ -86,7 +86,7 @@ app.get('/*', (req: ExpressRequest, res: ExpressResponse) => {
     return PageNotFoundServiceHandler.executeResponse(req, res);
 });
 
-const init: Function = async (): Promise<void> => {
+const init: () => Promise<void> = async (): Promise<void> => {
     try {
         // init the app
         await App(APP_NAME);
@@ -96,6 +96,8 @@ const init: Function = async (): Promise<void> => {
     }
 };
 
-init();
+init().catch((err: Error) => {
+    logger.error(err);
+});
 
 export default app;

ApiReference/Service/Errors.ts

@@ -14,7 +14,7 @@ export default class ServiceHandler {
         const pageData: any = {};
 
         pageTitle = 'Errors';
-        pageDescription = 'Learn more about how we reuturn errors from API';
+        pageDescription = 'Learn more about how we return errors from API';
 
         return res.render('pages/index', {
             page: page,

ApiReference/Service/Model.ts

@@ -15,7 +15,7 @@ import PageNotFoundServiceHandler from './PageNotFound';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 const ResourceDictionary: Dictionary<ModelDocumentation> =
-    ResourceUtil.getReosurceDictionaryByPath();
+    ResourceUtil.getResourceDictionaryByPath();
 
 const PermissionDictionary: Dictionary<PermissionProps> =
     PermissionHelper.getAllPermissionPropsAsDictionary();

ApiReference/Service/Permissions.ts

@@ -15,7 +15,7 @@ export default class ServiceHandler {
         const pageData: any = {};
 
         pageTitle = 'Permissions';
-        pageDescription = 'Learn how permisisons work with OneUptime';
+        pageDescription = 'Learn how permissions work with OneUptime';
 
         pageData.permissions = PermissionHelper.getAllPermissionProps().filter(
             (i: PermissionProps) => {

ApiReference/Utils/Resources.ts

@@ -40,7 +40,7 @@ export default class ResourceUtil {
             'Status Page',
             'Incident',
             'Team',
-            'On Call Duty',
+            'On-Call Duty',
             'Label',
             'Team Member',
         ];
@@ -52,7 +52,7 @@ export default class ResourceUtil {
         );
     }
 
-    public static getReosurceDictionaryByPath(): Dictionary<ModelDocumentation> {
+    public static getResourceDictionaryByPath(): Dictionary<ModelDocumentation> {
         const dict: Dictionary<ModelDocumentation> = {};
 
         const resources: Array<ModelDocumentation> =

ApiReference/package.json

@@ -2,7 +2,7 @@
     "name": "oneuptime-homepage",
     "version": "3.0.0",
     "scripts": {
-        "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
+        "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
         "start": "node --require ts-node/register Index.ts",
         "compile": "tsc",
         "dev": "npx nodemon",

ApiReference/views/main/authentication.ejs

@@ -29,11 +29,11 @@
       <h2 id="basic-authentication">
          Authentication with API Key
       </h2>
-      <p>You can use OneUptime API Key on Request Header when you're making a requst. You can use <code
+      <p>You can use OneUptime API Key on Request Header when you're making a request. You can use <code
             class="rounded p-0.5 px-1 text-sm text-gray-500 bg-gray-100 border-2 border-gray-200">Authorization</code>
          header with your API Key when you make a request.</p>
       <%- include('../partials/code', {title: "Example request with API Key" , requestUrl: "" , requestType: "" , code: "curl --header \"ApiKey: {secret-api-key}\" --header \"ProjectID: {project-id}\" https://oneuptime.com/api/\<path\>" }) -%>
          <p class="text-sm">Please don't commit your OneUptime API Key to GitHub, or on any other source control
-            project. Please regenerate a new API Key, if your API Key is comitted by mistake.</p>
+            project. Please regenerate a new API Key, if your API Key is committed by mistake.</p>
    </article>
 </main>

ApiReference/views/main/data-types.ejs

@@ -12,7 +12,7 @@
         <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
             <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
                 <p>Select can be used to select fields from an Object in List or Get Item API. By default only ID's
-                    are returned to the client. To retrive more fields you need use:</p>
+                    are returned to the client. To retrieve more fields you need use:</p>
 
                 <div class="my-6">
                     <ul role="list"

ApiReference/views/main/introduction.ejs

@@ -30,7 +30,7 @@
           </div>
        </div>
        <h1 class="font-bold text-xl">API Documentation</h1>
-       <p class="lead">Use the OneUptime API to access any reosurce in your projects, create automated
+       <p class="lead">Use the OneUptime API to access any resource in your projects, create automated
           workflows, and more
           and
           seamlessly integrate your project into the other tools and services you use in your

ApiReference/views/main/pagination.ejs

@@ -15,7 +15,7 @@
          <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
             <p>In this example, we request the list fo monitors. As a result, we get a list of three monitors and can
                tell by the <code class="inline-code">count</code> attribute that we have reached the end of the
-               resultset</p>
+               result set</p>
                <h2 id="example-using-cursors" class="scroll-mt-24">
                   Query Parameters
                </h2>

Ci/scripts/docker-build-all-and-push.sh

@@ -4,7 +4,7 @@ echo "
 ======== IMPORTANT! =========
 This script will take ~30+ mins to complete.
 - Builds a docker container
-- This scirpt takes a long time to run when you run it for the first time
+- This script takes a long time to run when you run it for the first time
 - Next subsequent executions would be a lot faster.
 "
 

Clickhouse/.env.tpl

@@ -1,4 +0,0 @@
-CLICKHOUSE_USER={{ .Env.CLICKHOUSE_USER }}
-CLICKHOUSE_PASSWORD={{ .Env.CLICKHOUSE_PASSWORD }}
-CLICKHOUSE_DB=oneuptime
-CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1

Clickhouse/README.md

@@ -0,0 +1,3 @@
+# Clickhouse
+
+This folder is for Clickhouse related files.

Common/.env.tpl

@@ -1,9 +0,0 @@
-NODE_ENV={{ .Env.ENVIRONMENT }}
-BILLING_ENABLED={{ .Env.BILLING_ENABLED }}
-BILLING_PUBLIC_KEY={{ .Env.BILLING_PUBLIC_KEY }}
-SUBSCRIPTION_PLAN_BASIC={{ .Env.SUBSCRIPTION_PLAN_BASIC }}
-SUBSCRIPTION_PLAN_GROWTH={{ .Env.SUBSCRIPTION_PLAN_GROWTH }}
-SUBSCRIPTION_PLAN_SCALE={{ .Env.SUBSCRIPTION_PLAN_SCALE }}
-SUBSCRIPTION_PLAN_ENTERPRISE={{ .Env.SUBSCRIPTION_PLAN_ENTERPRISE }}
-METERED_PLAN_ACTIVE_MONITORING={{ .Env.METERED_PLAN_ACTIVE_MONITORING }}
-DOMAIN={{ .Env.DOMAIN }}

Common/Models/AnalyticsBaseModel.ts

@@ -0,0 +1,104 @@
+import TableColumnType from '../Types/BaseDatabase/TableColumnType';
+import AnalyticsTableColumn from '../Types/AnalyticsDatabase/TableColumn';
+import BadDataException from '../Types/Exception/BadDataException';
+import AnalyticsTableEngine from '../Types/AnalyticsDatabase/AnalyticsTableEngine';
+
+export default class AnalyticsDataModel {
+    private _tableColumns: Array<AnalyticsTableColumn> = [];
+    public get tableColumns(): Array<AnalyticsTableColumn> {
+        return this._tableColumns;
+    }
+    public set tableColumns(v: Array<AnalyticsTableColumn>) {
+        this._tableColumns = v;
+    }
+
+    private _tableName: string = '';
+    public get tableName(): string {
+        return this._tableName;
+    }
+    public set tableName(v: string) {
+        this._tableName = v;
+    }
+
+    private _tableEngine: AnalyticsTableEngine = AnalyticsTableEngine.MergeTree;
+    public get tableEngine(): AnalyticsTableEngine {
+        return this._tableEngine;
+    }
+    public set tableEngine(v: AnalyticsTableEngine) {
+        this._tableEngine = v;
+    }
+
+    private _primaryKeys: Array<string> = [];
+    public get primaryKeys(): Array<string> {
+        return this._primaryKeys;
+    }
+    public set primaryKeys(v: Array<string>) {
+        this._primaryKeys = v;
+    }
+
+    public constructor(data: {
+        tableName: string;
+        tableEngine?: AnalyticsTableEngine | undefined;
+        tableColumns: Array<AnalyticsTableColumn>;
+        primaryKeys: Array<string>; // this should be the subset of tableColumns
+    }) {
+        const columns: Array<AnalyticsTableColumn> = [...data.tableColumns];
+
+        this.tableName = data.tableName;
+
+        if (data.tableEngine) {
+            this.tableEngine = data.tableEngine;
+        }
+
+        columns.push(
+            new AnalyticsTableColumn({
+                key: '_id',
+                title: 'ID',
+                description: 'ID of this object',
+                required: true,
+                type: TableColumnType.ObjectID,
+            })
+        );
+
+        columns.push(
+            new AnalyticsTableColumn({
+                key: 'createdAt',
+                title: 'Created',
+                description: 'Date and Time when the object was created.',
+                required: true,
+                type: TableColumnType.Date,
+            })
+        );
+
+        columns.push(
+            new AnalyticsTableColumn({
+                key: 'updatedAt',
+                title: 'Updated',
+                description: 'Date and Time when the object was updated.',
+                required: true,
+                type: TableColumnType.Date,
+            })
+        );
+
+        if (!data.primaryKeys || data.primaryKeys.length === 0) {
+            throw new BadDataException('Primary keys are required');
+        }
+
+        // check if primary keys are subset of tableColumns
+
+        data.primaryKeys.forEach((primaryKey: string) => {
+            if (
+                !columns.find((column: AnalyticsTableColumn) => {
+                    return column.key === primaryKey;
+                })
+            ) {
+                throw new BadDataException(
+                    'Primary key ' + primaryKey + ' is not part of tableColumns'
+                );
+            }
+        });
+
+        this.primaryKeys = data.primaryKeys;
+        this.tableColumns = columns;
+    }
+}

Common/Models/BaseModel.ts

@@ -21,20 +21,24 @@ import Email from '../Types/Email';
 import Phone from '../Types/Phone';
 import PositiveNumber from '../Types/PositiveNumber';
 import Route from '../Types/API/Route';
-import TableColumnType from '../Types/Database/TableColumnType';
+import TableColumnType from '../Types/BaseDatabase/TableColumnType';
 import Permission, {
-    instaceOfUserTenantAccessPermission,
+    instanceOfUserTenantAccessPermission,
     PermissionHelper,
     UserPermission,
     UserTenantAccessPermission,
 } from '../Types/Permission';
-import { ColumnAccessControl } from '../Types/Database/AccessControl/AccessControl';
+import {
+    ColumnAccessControl,
+    ColumnBillingAccessControl,
+} from '../Types/Database/AccessControl/AccessControl';
 import { getColumnAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnAccessControl';
 import BadDataException from '../Types/Exception/BadDataException';
 import { PlanSelect } from '../Types/Billing/SubscriptionPlan';
 import { EnableWorkflowOn } from '../Types/Model/EnableWorkflow';
 import IconProp from '../Types/Icon/IconProp';
 import Text from '../Types/Text';
+import { getColumnBillingAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnBillingAccessControl';
 
 export type DbTypes =
     | string
@@ -45,6 +49,7 @@ export type DbTypes =
     | URL
     | Phone
     | JSONObject
+    | ObjectID
     | JSONArray
     | Buffer;
 
@@ -114,7 +119,7 @@ export default class BaseModel extends BaseEntity {
     public pluralName!: string | null;
 
     // total items  by
-    public totalItemsByColumnnName!: string | null;
+    public totalItemsByColumnName!: string | null;
     public totalItemsNumber!: number | null;
     public totalItemsErrorMessage!: string | null;
 
@@ -201,6 +206,14 @@ export default class BaseModel extends BaseEntity {
         return dictionary[columnName] as TableColumnMetadata;
     }
 
+    public getColumnBillingAccessControl(
+        columnName: string
+    ): ColumnBillingAccessControl {
+        const dictionary: Dictionary<ColumnBillingAccessControl> =
+            getColumnBillingAccessControlForAllColumns(this);
+        return dictionary[columnName] as ColumnBillingAccessControl;
+    }
+
     public getColumnAccessControlFor(
         columnName: string
     ): ColumnAccessControl | null {
@@ -241,7 +254,7 @@ export default class BaseModel extends BaseEntity {
         (this as any)[columnName] = value;
     }
 
-    public doesPermissionHasConfitions(
+    public doesPermissionHaveConditions(
         permission: Permission
     ): JSONObject | null {
         return this.isPermissionIf[permission]
@@ -267,7 +280,7 @@ export default class BaseModel extends BaseEntity {
     }
 
     public getTotalItemsByColumnName(): string | null {
-        return this.totalItemsByColumnnName;
+        return this.totalItemsByColumnName;
     }
 
     public getTotalItemsByErrorMessage(): string | null {
@@ -493,7 +506,7 @@ export default class BaseModel extends BaseEntity {
         let userPermissions: Array<Permission> = [];
 
         if (
-            instaceOfUserTenantAccessPermission(userProjectPermissions) &&
+            instanceOfUserTenantAccessPermission(userProjectPermissions) &&
             userProjectPermissions.permissions &&
             Array.isArray(userProjectPermissions.permissions)
         ) {

Common/Models/FileModel.ts

@@ -4,7 +4,7 @@ import ColumnLength from '../Types/Database/ColumnLength';
 import ColumnType from '../Types/Database/ColumnType';
 import SlugifyColumn from '../Types/Database/SlugifyColumn';
 import TableColumn from '../Types/Database/TableColumn';
-import TableColumnType from '../Types/Database/TableColumnType';
+import TableColumnType from '../Types/BaseDatabase/TableColumnType';
 import MimeType from '../Types/File/MimeType';
 import ObjectID from '../Types/ObjectID';
 import Permission from '../Types/Permission';
@@ -28,7 +28,7 @@ export default class FileModel extends BaseModel {
     @TableColumn({
         required: true,
         type: TableColumnType.File,
-        canReadOnPopulate: true,
+        canReadOnRelationQuery: true,
     })
     @Column({
         nullable: false,
@@ -46,7 +46,7 @@ export default class FileModel extends BaseModel {
         type: TableColumnType.ShortText,
         title: 'Name',
         description: 'Any friendly name of this object',
-        canReadOnPopulate: true,
+        canReadOnRelationQuery: true,
     })
     @Column({
         nullable: false,
@@ -63,7 +63,7 @@ export default class FileModel extends BaseModel {
     @TableColumn({
         required: true,
         type: TableColumnType.ShortText,
-        canReadOnPopulate: true,
+        canReadOnRelationQuery: true,
     })
     @Column({
         nullable: false,
@@ -81,7 +81,7 @@ export default class FileModel extends BaseModel {
         required: true,
         unique: true,
         type: TableColumnType.Slug,
-        canReadOnPopulate: true,
+        canReadOnRelationQuery: true,
     })
     @Column({
         nullable: false,
@@ -99,7 +99,7 @@ export default class FileModel extends BaseModel {
         required: true,
         isDefaultValueColumn: true,
         type: TableColumnType.Slug,
-        canReadOnPopulate: true,
+        canReadOnRelationQuery: true,
     })
     @Column({
         nullable: false,

Common/Tests/Types/API/Headers.test.ts

@@ -2,7 +2,7 @@ import Headers from '../../../Types/API/Headers';
 import Faker from '../../../Utils/Faker';
 describe('Headers', () => {
     test('should compile', () => {
-        const apiKey: string = Faker.random16Numbers();
+        const apiKey: string = Faker.randomNumbers(16);
         const headers: Headers = {
             accept: 'application/json',
             'x-api-key': apiKey,

Common/Tests/Types/API/ResponseType.test.ts

@@ -1,6 +1,6 @@
 import ResponseType from '../../../Types/API/ResponseType';
 describe('ResponseType', () => {
-    test('ResponsetType.CSV to be csv', () => {
+    test('ResponseType.CSV to be csv', () => {
         expect(ResponseType.CSV).toBe('csv');
     });
     test('ResponseType.HTML to be json', () => {

Common/Tests/Types/Alerts/AlertEventType.test.ts

@@ -31,7 +31,7 @@ describe('AlertEventType', () => {
         );
     });
 
-    test('AlertEventType.ScheduledMaintenanceResolved to sheduled mantainance resolved', () => {
+    test('AlertEventType.ScheduledMaintenanceResolved to scheduled maintenance resolved', () => {
         expect(AlertEventType.ScheduledMaintenanceResolved).toBe(
             'Scheduled maintenance resolved'
         );

Common/Tests/Types/AppEnvironment.test.ts

@@ -1,9 +1,9 @@
 import AppEnvironment from '../../Types/AppEnvironment';
 describe('AppEnvironment', () => {
-    test('AppEnvironment.Production should be prodoction', () => {
+    test('AppEnvironment.Production should be production', () => {
         expect(AppEnvironment.Production).toEqual('production');
     });
-    test('AppEnvironment.Developemnt should be prodoction', () => {
+    test('AppEnvironment.Development should be production', () => {
         expect(AppEnvironment.Development).toEqual('development');
     });
     test('AppEnvironment.Test should be test', () => {

Common/Tests/Types/Billing/SubscriptionPlan.test.ts

@@ -0,0 +1,298 @@
+import SubscriptionPlan, {
+    PlanSelect,
+} from '../../../Types/Billing/SubscriptionPlan';
+import { JSONObject } from '../../../Types/JSON';
+import BadDataException from '../../../Types/Exception/BadDataException';
+
+describe('SubscriptionPlan', () => {
+    const monthlyPlanId: string = 'monthly_plan_id';
+    const yearlyPlanId: string = 'yearly_plan_id';
+    const name: string = 'Test Plan';
+    const monthlySubscriptionAmountInUSD: number = 0;
+    const yearlySubscriptionAmountInUSD: number = 0;
+    const order: number = 1;
+    const trialPeriodInDays: number = 30;
+    const env: JSONObject = {
+        SUBSCRIPTION_PLAN_1: 'Free,monthly_plan_id,yearly_plan_id,0,0,1,7',
+        SUBSCRIPTION_PLAN_2:
+            'Growth,growth_monthly_plan_id,growth_yearly_plan_id,9,99,2,14',
+    };
+
+    describe('constructor', () => {
+        it('should create a new SubscriptionPlan object', () => {
+            const plan: SubscriptionPlan = new SubscriptionPlan(
+                monthlyPlanId,
+                yearlyPlanId,
+                name,
+                monthlySubscriptionAmountInUSD,
+                yearlySubscriptionAmountInUSD,
+                order,
+                trialPeriodInDays
+            );
+            expect(plan.getMonthlyPlanId()).toEqual(monthlyPlanId);
+            expect(plan.getYearlyPlanId()).toEqual(yearlyPlanId);
+            expect(plan.getName()).toEqual(name);
+            expect(plan.getPlanOrder()).toEqual(order);
+            expect(plan.getTrialPeriod()).toEqual(trialPeriodInDays);
+        });
+    });
+
+    describe('getMonthlyPlanId', () => {
+        it('should return the monthly plan ID', () => {
+            const getMonthlyPlanId: string = 'monthly_plan_id';
+            expect(getMonthlyPlanId).toEqual(monthlyPlanId);
+        });
+    });
+
+    describe('getYearlyPlanId', () => {
+        it('should return the yearly plan ID', () => {
+            const getYearlyPlanId: string = 'yearly_plan_id';
+            expect(getYearlyPlanId).toEqual(yearlyPlanId);
+        });
+    });
+
+    describe('getPlanOrder', () => {
+        it('should return the plan order', () => {
+            const getPlanOrder: number = 1;
+            expect(getPlanOrder).toEqual(order);
+        });
+    });
+
+    describe('getTrialPeriod', () => {
+        it('should return the trial period in days', () => {
+            const getTrialPeriod: number = 30;
+            expect(getTrialPeriod).toEqual(trialPeriodInDays);
+        });
+    });
+
+    describe('getName', () => {
+        it('should return the plan name', () => {
+            const getName: string = 'Test Plan';
+            expect(getName).toEqual(name);
+        });
+    });
+
+    describe('isFreePlan', () => {
+        it('should return true if plan is free with monthlyId', () => {
+            const isFreePlan: boolean = SubscriptionPlan.isFreePlan(
+                'monthly_plan_id',
+                env
+            );
+            expect(isFreePlan).toBe(true);
+        });
+        it('should return true if plan is free with yearlyId', () => {
+            const isFreePlan: boolean = SubscriptionPlan.isFreePlan(
+                'yearly_plan_id',
+                env
+            );
+            expect(isFreePlan).toBe(true);
+        });
+    });
+    describe('isCustomPricingPlan', () => {
+        it('should return false if plan is not custom pricing', () => {
+            const isCustomPricingPlan: boolean =
+                SubscriptionPlan.isCustomPricingPlan(monthlyPlanId, env);
+            expect(isCustomPricingPlan).toBe(false);
+        });
+    });
+
+    describe('getSubscriptionPlans', () => {
+        it('should return an array of SubscriptionPlan objects', () => {
+            const subscriptionPlans: SubscriptionPlan[] =
+                SubscriptionPlan.getSubscriptionPlans(env);
+
+            expect(subscriptionPlans.length).toBe(2);
+            expect(subscriptionPlans?.[0]?.getName()).toBe('Free');
+            expect(subscriptionPlans?.[0]?.getYearlyPlanId()).toBe(
+                'yearly_plan_id'
+            );
+        });
+    });
+    describe('isValidPlanId', () => {
+        it('should return true if plan ID is valid', () => {
+            const isValidPlanId: boolean = SubscriptionPlan.isValidPlanId(
+                'growth_monthly_plan_id',
+                env
+            );
+            expect(isValidPlanId).toBe(true);
+        });
+    });
+    describe('getPlanSelect', () => {
+        it('should return the plan name if valid planId is passed', () => {
+            new SubscriptionPlan(
+                monthlyPlanId,
+                'yearly_plan_id',
+                PlanSelect.Free,
+                0,
+                0,
+                2,
+                30
+            );
+            const result: PlanSelect = SubscriptionPlan.getPlanSelect(
+                monthlyPlanId,
+                env
+            );
+            expect(result).toBe(PlanSelect.Free);
+        });
+        it('should throw an error if invalid PlanId is passed', () => {
+            SubscriptionPlan.getSubscriptionPlanById = jest
+                .fn()
+                .mockReturnValue(undefined);
+            expect(() => {
+                SubscriptionPlan.getPlanSelect('invalid-plan-id', env);
+            }).toThrow(BadDataException);
+        });
+    });
+    describe('getYearlySubscriptionAmountInUSD', () => {
+        it('should return the yearly subscription amount', () => {
+            const getYearlySubscriptionAmountInUSD: number = 0;
+            expect(getYearlySubscriptionAmountInUSD).toEqual(
+                yearlySubscriptionAmountInUSD
+            );
+        });
+    });
+    describe('getMonthlySubscriptionAmountInUSD', () => {
+        it('should return the yearly subscription amount', () => {
+            const getMonthlySubscriptionAmountInUSD: number = 0;
+            expect(getMonthlySubscriptionAmountInUSD).toEqual(
+                monthlySubscriptionAmountInUSD
+            );
+        });
+    });
+    describe('isFeatureAccessibleOnCurrentPlan', () => {
+        it('should return false if the feature is not accessible on current plan', () => {
+            const env: JSONObject = {
+                SUBSCRIPTION_PLAN_1:
+                    'Free,monthly_plan_id,yearly_plan_id,0,0,1,7',
+                SUBSCRIPTION_PLAN_2:
+                    'Growth,growth_monthly_plan_id,growth_yearly_plan_id,9,99,2,14',
+            };
+            const featureSubscriptionPlan: SubscriptionPlan =
+                new SubscriptionPlan(
+                    'growth_monthly_plan_id',
+                    'growth_yearly_plan_id',
+                    PlanSelect.Growth,
+                    9,
+                    99,
+                    2,
+                    14
+                );
+            const currentSubscriptionPlan: SubscriptionPlan =
+                new SubscriptionPlan(
+                    'monthly_plan_id',
+                    'yearly_plan_id',
+                    PlanSelect.Free,
+                    0,
+                    0,
+                    1,
+                    7
+                );
+            const result: boolean =
+                SubscriptionPlan.isFeatureAccessibleOnCurrentPlan(
+                    PlanSelect.Growth,
+                    PlanSelect.Free,
+                    env
+                );
+            expect(featureSubscriptionPlan.getPlanOrder()).toBeGreaterThan(
+                currentSubscriptionPlan.getPlanOrder()
+            );
+            expect(result).toBe(false);
+        });
+        it('should return true if the feature is on the current plan', () => {
+            const env: JSONObject = {
+                SUBSCRIPTION_PLAN_1:
+                    'Free,monthly_plan_id,yearly_plan_id,0,0,3,7',
+                SUBSCRIPTION_PLAN_2:
+                    'Growth,growth_monthly_plan_id,growth_yearly_plan_id,9,99,2,14',
+            };
+            const featureSubscriptionPlan: SubscriptionPlan =
+                new SubscriptionPlan(
+                    'growth_monthly_plan_id',
+                    'growth_yearly_plan_id',
+                    PlanSelect.Growth,
+                    9,
+                    99,
+                    2,
+                    14
+                );
+            const currentSubscriptionPlan: SubscriptionPlan =
+                new SubscriptionPlan(
+                    monthlyPlanId,
+                    'yearly_plan_id',
+                    PlanSelect.Free,
+                    0,
+                    0,
+                    3,
+                    7
+                );
+            const result: boolean =
+                SubscriptionPlan.isFeatureAccessibleOnCurrentPlan(
+                    PlanSelect.Growth,
+                    PlanSelect.Free,
+                    env
+                );
+            expect(featureSubscriptionPlan.getPlanOrder()).toBeLessThan(
+                currentSubscriptionPlan.getPlanOrder()
+            );
+            expect(result).toBe(true);
+        });
+    });
+    describe('getSubscriptionPlanFromPlanSelect', () => {
+        it('should return the correct SubscriptionPlan when a valid planSelect is provided', () => {
+            const plan: SubscriptionPlan =
+                SubscriptionPlan.getSubscriptionPlanFromPlanSelect(
+                    PlanSelect.Growth,
+                    env
+                );
+            expect(plan).toEqual(plan);
+            expect(plan.getName()).toEqual(PlanSelect.Growth);
+        });
+        it('should throw a BadDataException when an invalid planSelect is provided', () => {
+            const planSelect: PlanSelect = PlanSelect.Scale;
+            SubscriptionPlan.getSubscriptionPlans = jest
+                .fn()
+                .mockReturnValue([]);
+            expect(() => {
+                SubscriptionPlan.getSubscriptionPlanFromPlanSelect(
+                    planSelect,
+                    env
+                );
+            }).toThrow(BadDataException);
+        });
+    });
+    describe('isYearlyPlan', () => {
+        it('should return true if yearly plan exists', () => {
+            const planId: string = 'growth_yearly_plan_id';
+            const plan: SubscriptionPlan = new SubscriptionPlan(
+                'monthly-plan-id',
+                planId,
+                'Growth',
+                10,
+                100,
+                2,
+                7
+            );
+            SubscriptionPlan.getSubscriptionPlanById(planId, env);
+            expect(plan?.getYearlyPlanId()).toBe(planId);
+        });
+    });
+    describe('isUnpaid', () => {
+        it('should return true if the subscription status is unpaid', () => {
+            const subscriptionStatus: string =
+                'incomplete' ||
+                'incomplete_expired' ||
+                'past_due' ||
+                'canceled' ||
+                'unpaid';
+            const result: boolean =
+                SubscriptionPlan.isUnpaid(subscriptionStatus);
+            expect(result).toBe(true);
+        });
+        it('should return false if the subscription status is active', () => {
+            const subscriptionStatus: string = 'active';
+            const result: boolean =
+                SubscriptionPlan.isUnpaid(subscriptionStatus);
+            expect(result).toBe(false);
+        });
+    });
+});

Common/Tests/Types/Char.test.ts

@@ -74,10 +74,10 @@ describe('type Char', () => {
         expect(characters).toEqual(['a', 'A', '1']);
     });
     test('type Char to be used in dictionary', () => {
-        const characterDictonary: Dictionary<Char> = {
+        const characterDictionary: Dictionary<Char> = {
             a: 'a',
             A: 'A',
         };
-        expect(characterDictonary['a']).toEqual('a');
+        expect(characterDictionary['a']).toEqual('a');
     });
 });

Common/Tests/Types/Database/Columns.test.ts

@@ -15,7 +15,7 @@ describe('class Columns', () => {
         expect(new Columns(cols).columns).toContain('col3');
     });
 
-    test('it should return true if column is inckuded', () => {
+    test('it should return true if column is included', () => {
         const cols: Array<string> = ['col1', 'col2'];
         expect(new Columns(cols).hasColumn('col2')).toBeTruthy();
     });

Common/Tests/Types/Phone.test.ts

@@ -22,7 +22,7 @@ describe('Testing Class Phone', () => {
         }).toThrowError(BadDataException);
     });
 
-    test('try to mutating Phone.phone with invalid value should throw an BadDataExcepection', () => {
+    test('try to mutating Phone.phone with invalid value should throw a BadDataException', () => {
         const valid: string = '+251912974103';
         const invalid: string = '278@$90> ';
         const value: Phone = new Phone(valid);

Common/Tests/Types/Port.test.ts

@@ -22,7 +22,7 @@ describe('Testing class port', () => {
         expect(value.port.toNumber()).toEqual(7000);
     });
 
-    test('try to mutating Port.port with invalid value should throw an BadDataExcepection', () => {
+    test('try to mutating Port.port with invalid value should throw an BadDataException', () => {
         const value: Port = new Port(3000);
         expect(() => {
             value.port = new PositiveNumber('hj567');

Common/Tests/Types/SecuritySeverity.test.ts

@@ -1,7 +1,7 @@
 import SecuritySeverity from '../../Types/SecuritySeverity';
 
 describe('enum SecuritySeverity', () => {
-    test('SecuritySeverity.Critical should be Critcal', () => {
+    test('SecuritySeverity.Critical should be Critical', () => {
         expect(SecuritySeverity.Critical).toEqual('Critical');
     });
     test('SecuritySeverity.High should be High', () => {

Common/Tests/Types/Text.test.ts

@@ -1,7 +1,7 @@
 import Text from '../../Types/Text';
 
 describe('class Text', () => {
-    test('Text.uppercaseFirstLetter should make string frist letter Uppercase', () => {
+    test('Text.uppercaseFirstLetter should make string first letter Uppercase', () => {
         expect(Text.uppercaseFirstLetter('text')).toEqual('Text');
         expect(Text.uppercaseFirstLetter('another test')).toEqual(
             'Another test'

Common/Tests/Types/Version.test.ts

@@ -12,7 +12,7 @@ describe('class Version', () => {
         expect(version.version).toEqual('1.2.2');
         expect(version.toString()).toEqual('1.2.2');
     });
-    test('mutating Version.version with invalid data should throw an BadDataExcepection', () => {
+    test('mutating Version.version with invalid data should throw an BadDataException', () => {
         const version: Version = new Version('1.0.0');
         expect(() => {
             version.version = '1';
@@ -24,7 +24,7 @@ describe('class Version', () => {
             version.version = '1.1.0.0';
         }).toThrowError(BadDataException);
     });
-    test('creating version new  Version with invalid data should throw an BadDataExcepection', () => {
+    test('creating version new  Version with invalid data should throw an BadDataException', () => {
         expect(() => {
             new Version('1');
         }).toThrowError(BadDataException);

Common/Types/API/HTTPMethod.ts

@@ -3,6 +3,7 @@ enum HTTPMethod {
     POST = 'POST',
     DELETE = 'DELETE',
     PUT = 'PUT',
+    HEAD = 'HEAD',
 }
 
 export default HTTPMethod;

Common/Types/API/Hostname.ts

@@ -23,7 +23,9 @@ export default class Hostname extends DatabaseProperty {
         if (Hostname.isValid(value)) {
             this._route = value;
         } else {
-            throw new BadDataException('Hostname is not in valid format.');
+            throw new BadDataException(
+                'Hostname ' + value + ' is not in valid format.'
+            );
         }
     }
 
@@ -67,13 +69,13 @@ export default class Hostname extends DatabaseProperty {
     }
 
     public override toString(): string {
-        let hostame: string = this.hostname;
+        let hostname: string = this.hostname;
 
         if (this.port) {
-            hostame += ':' + this.port.toString();
+            hostname += ':' + this.port.toString();
         }
 
-        return hostame;
+        return hostname;
     }
 
     public static fromString(hostname: string): Hostname {

Common/Types/API/Route.ts

@@ -10,7 +10,7 @@ export default class Route extends DatabaseProperty {
     }
     public set route(v: string) {
         const matchRouteCharacters: RegExp =
-            /^[a-zA-Z_\d\-!#$&'()*+,./:;=?@[\]]*$/;
+            /^[a-zA-Z_\d\-!#$%&'()*+,./:;=?@[\]]*$/;
         if (v && !matchRouteCharacters.test(v)) {
             throw new BadDataException(`Invalid route: ${v}`);
         }

Common/Types/API/StatusCode.ts

@@ -24,7 +24,7 @@ export default class StatusCode {
         return this.statusCode.toNumber();
     }
 
-    public static isValidStausCode(statusCode: number | string): boolean {
+    public static isValidStatusCode(statusCode: number | string): boolean {
         try {
             if (typeof statusCode === Typeof.String) {
                 statusCode = parseInt(statusCode as string);

Common/Types/API/URL.ts

@@ -99,7 +99,7 @@ export default class URL extends DatabaseProperty {
         let urlString: string = `${this.protocol}${
             this.hostname || this.email
         }`;
-        if (!this.email) {
+        if (!this.email && !urlString.startsWith('mailto:')) {
             if (this.route && this.route.toString().startsWith('/')) {
                 if (urlString.endsWith('/')) {
                     urlString = urlString.substring(0, urlString.length - 1);

Common/Types/AnalyticsDatabase/AnalyticsTableEngine.ts

@@ -0,0 +1,5 @@
+enum AnalyticsTableEngine {
+    MergeTree = 'MergeTree',
+}
+
+export default AnalyticsTableEngine;

Common/Types/AnalyticsDatabase/TableColumn.ts

@@ -0,0 +1,57 @@
+import TableColumnType from '../BaseDatabase/TableColumnType';
+
+export default class AnalyticsTableColumn {
+    private _key: string = 'id';
+    public get key(): string {
+        return this._key;
+    }
+    public set key(v: string) {
+        this._key = v;
+    }
+
+    private _title: string = '';
+    public get title(): string {
+        return this._title;
+    }
+    public set title(v: string) {
+        this._title = v;
+    }
+
+    private _description: string = '';
+    public get description(): string {
+        return this._description;
+    }
+    public set description(v: string) {
+        this._description = v;
+    }
+
+    private _required: boolean = false;
+    public get required(): boolean {
+        return this._required;
+    }
+    public set required(v: boolean) {
+        this._required = v;
+    }
+
+    private _type: TableColumnType = TableColumnType.ShortText;
+    public get type(): TableColumnType {
+        return this._type;
+    }
+    public set type(v: TableColumnType) {
+        this._type = v;
+    }
+
+    public constructor(data: {
+        key: string;
+        title: string;
+        description: string;
+        required: boolean;
+        type: TableColumnType;
+    }) {
+        this.key = data.key;
+        this.title = data.title;
+        this.description = data.description;
+        this.required = data.required;
+        this.type = data.type;
+    }
+}

Common/Types/ArrayUtil.ts

@@ -26,4 +26,29 @@ export default class ArrayUtil {
             return 0;
         };
     }
+
+    public static distinctByFieldName(
+        array: Array<any>,
+        fieldName: string
+    ): Array<any> {
+        // Get the distinct values by field name of the array
+        const distinctValues: Array<any> = array
+            .map((item: any) => {
+                return item[fieldName];
+            })
+            .filter((value: any, index: number, self: Array<any>) => {
+                return self.indexOf(value) === index;
+            });
+
+        // Create a new array with the distinct values
+        const distinctArray: Array<any> = [];
+        for (const value of distinctValues) {
+            const item: any = array.find((item: any) => {
+                return item[fieldName] === value;
+            });
+            distinctArray.push(item);
+        }
+
+        return distinctArray;
+    }
 }

Common/Types/BaseDatabase/TableColumnType.ts

@@ -18,6 +18,7 @@ enum ColumnType {
     ShortText = 'Text',
     OTP = 'One Time Password',
     LongText = 'Long Text',
+    VeryLongText = 'Very Long Text',
     HTML = 'HTML',
     JavaScript = 'JavaSCript',
     CSS = 'CSS',

Common/Types/Billing/MeteredPlan.ts

@@ -1,28 +1,20 @@
 export default class MeteredPlan {
-    private monthlyPriceId: string;
-    private yearlyPriceId: string;
+    private priceId: string;
     private unitName: string;
     private pricePerUnit: number;
 
     public constructor(
-        monthlyPriceId: string,
-        yearlyPriceId: string,
+        priceId: string,
         pricePerUnit: number,
         unitName: string
     ) {
-        this.monthlyPriceId = monthlyPriceId;
-        this.yearlyPriceId = yearlyPriceId;
-
+        this.priceId = priceId;
         this.pricePerUnit = pricePerUnit;
         this.unitName = unitName;
     }
 
-    public getMonthlyPriceId(): string {
-        return this.monthlyPriceId;
-    }
-
-    public getYearlyPriceId(): string {
-        return this.yearlyPriceId;
+    public getPriceId(): string {
+        return this.priceId;
     }
 
     public getPricePerUnit(): number {

Common/Types/Call/CallRequest.ts

@@ -0,0 +1,30 @@
+import URL from '../API/URL';
+import Phone from '../Phone';
+
+export interface Say {
+    sayMessage: string;
+}
+
+export interface OnCallInputRequest {
+    [x: string]: Say; // input.
+    default: Say; // what if there is no input or invalid input.
+}
+
+export interface GatherInput {
+    introMessage: string;
+    numDigits: number;
+    timeoutInSeconds: number;
+    noInputMessage: string;
+    onInputCallRequest: OnCallInputRequest;
+    responseUrl: URL;
+}
+
+export enum CallAction {}
+
+export interface CallRequestMessage {
+    data: Array<Say | CallAction | GatherInput>;
+}
+
+export default interface CallRequest extends CallRequestMessage {
+    to: Phone;
+}

Common/Types/Call/CallStatus.ts

@@ -0,0 +1,9 @@
+enum CallStatus {
+    Success = 'Success',
+    Error = 'Error',
+    LowBalance = 'Low Balance',
+    MissedCall = 'Missed Call',
+    Busy = 'Busy',
+}
+
+export default CallStatus;

Common/Types/Database/AccessControl/AccessControl.ts

@@ -17,3 +17,9 @@ export interface BillingAccessControl {
     update: PlanSelect;
     delete: PlanSelect;
 }
+
+export interface ColumnBillingAccessControl {
+    create: PlanSelect;
+    read: PlanSelect;
+    update: PlanSelect;
+}

Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts

@@ -0,0 +1,45 @@
+import 'reflect-metadata';
+import BaseModel from '../../../Models/BaseModel';
+import Dictionary from '../../Dictionary';
+import { ReflectionMetadataType } from '../../Reflection';
+import { ColumnBillingAccessControl } from './AccessControl';
+
+const accessControlSymbol: Symbol = Symbol('ColumnBillingAccessControl');
+
+export default (
+    accessControl: ColumnBillingAccessControl
+): ReflectionMetadataType => {
+    return Reflect.metadata(accessControlSymbol, accessControl);
+};
+
+export const getColumnBillingAccessControl: Function = (
+    target: BaseModel,
+    propertyKey: string
+): ColumnBillingAccessControl => {
+    return Reflect.getMetadata(
+        accessControlSymbol,
+        target,
+        propertyKey
+    ) as ColumnBillingAccessControl;
+};
+
+export const getColumnBillingAccessControlForAllColumns: Function = <
+    T extends BaseModel
+>(
+    target: T
+): Dictionary<ColumnBillingAccessControl> => {
+    const dictonary: Dictionary<ColumnBillingAccessControl> = {};
+    const keys: Array<string> = Object.keys(target);
+
+    for (const key of keys) {
+        if (Reflect.getMetadata(accessControlSymbol, target, key)) {
+            dictonary[key] = Reflect.getMetadata(
+                accessControlSymbol,
+                target,
+                key
+            ) as ColumnBillingAccessControl;
+        }
+    }
+
+    return dictonary;
+};

Common/Types/Database/ColumnLength.ts

@@ -1,3 +1,5 @@
+import TableColumnType from '../BaseDatabase/TableColumnType';
+
 enum ColumnLength {
     Version = 30,
     Slug = 100,
@@ -15,4 +17,53 @@ enum ColumnLength {
     OTP = 8,
 }
 
+export const getMaxLengthFromTableColumnType: Function = (
+    type: TableColumnType
+): number | undefined => {
+    if (type === TableColumnType.Version) {
+        return ColumnLength.Version;
+    }
+    if (type === TableColumnType.Slug) {
+        return ColumnLength.Slug;
+    }
+    if (type === TableColumnType.Email) {
+        return ColumnLength.Email;
+    }
+    if (type === TableColumnType.Domain) {
+        return ColumnLength.Domain;
+    }
+    if (type === TableColumnType.Color) {
+        return ColumnLength.Color;
+    }
+    if (type === TableColumnType.Name) {
+        return ColumnLength.Name;
+    }
+    if (type === TableColumnType.Description) {
+        return ColumnLength.Description;
+    }
+    if (type === TableColumnType.LongText) {
+        return ColumnLength.LongText;
+    }
+    if (type === TableColumnType.Password) {
+        return ColumnLength.Password;
+    }
+    if (type === TableColumnType.ShortURL) {
+        return ColumnLength.ShortURL;
+    }
+    if (type === TableColumnType.ShortText) {
+        return ColumnLength.ShortText;
+    }
+    if (type === TableColumnType.HashedString) {
+        return ColumnLength.HashedString;
+    }
+    if (type === TableColumnType.Phone) {
+        return ColumnLength.Phone;
+    }
+    if (type === TableColumnType.OTP) {
+        return ColumnLength.OTP;
+    }
+
+    return undefined;
+};
+
 export default ColumnLength;

Common/Types/Database/LimitMax.ts

@@ -1,4 +1,4 @@
-const LIMIT_MAX: number = 1000;
+const LIMIT_MAX: number = 10000;
 
 export const LIMIT_PER_PROJECT: number = 300;
 

Common/Types/Database/TableColumn.ts

@@ -2,7 +2,7 @@ import 'reflect-metadata';
 import BaseModel from '../../Models/BaseModel';
 import Dictionary from '../Dictionary';
 import { ReflectionMetadataType } from '../Reflection';
-import TableColumnType from './TableColumnType';
+import TableColumnType from '../BaseDatabase/TableColumnType';
 
 const tableColumn: Symbol = Symbol('TableColumn');
 
@@ -17,8 +17,9 @@ export interface TableColumnMetadata {
     encrypted?: boolean;
     manyToOneRelationColumn?: string;
     type: TableColumnType;
-    canReadOnPopulate?: boolean;
+    canReadOnRelationQuery?: boolean;
     modelType?: { new (): BaseModel };
+    forceGetDefaultValueOnCreate?: () => string | number | boolean; // overwrites any value that is being passed and generates a new one. Useful for generating OTPs, etc.
 }
 
 export default (props: TableColumnMetadata): ReflectionMetadataType => {

Common/Types/Database/TotalItemsBy.ts

@@ -4,7 +4,7 @@ export default (
     errorMessage: string
 ) => {
     return (ctr: Function) => {
-        ctr.prototype.totalItemsByColumnnName = columnName;
+        ctr.prototype.totalItemsByColumnName = columnName;
         ctr.prototype.totalItemsNumber = totalItems;
         ctr.prototype.totalItemsErrorMessage = errorMessage;
     };

Common/Types/DatabaseType.ts

@@ -1,5 +1,6 @@
 enum DatabaseType {
     Postgres = 'postgres',
+    Clickhouse = 'clickhouse',
 }
 
 export default DatabaseType;

Common/Types/Date.ts

@@ -1,5 +1,6 @@
+import InBetween from './Database/InBetween';
 import BadDataException from './Exception/BadDataException';
-import { JSONObject } from './JSON';
+import { JSONObject, ObjectType } from './JSON';
 import PositiveNumber from './PositiveNumber';
 import moment from 'moment-timezone';
 
@@ -65,11 +66,31 @@ export default class OneUptimeDate {
         return YYYY + '-' + MM + '-' + DD + 'T' + HH + ':' + II + ':' + SS;
     }
 
+    public static fromJSON(json: JSONObject): Date {
+        if (json['_type'] === ObjectType.DateTime) {
+            return OneUptimeDate.fromString(json['value'] as string);
+        }
+
+        throw new BadDataException('Invalid JSON: ' + JSON.stringify(json));
+    }
+
+    public static toJSON(date: Date): JSONObject {
+        return {
+            _type: ObjectType.DateTime,
+            value: OneUptimeDate.toString(date),
+        };
+    }
+
     public static addRemoveMinutes(date: Date, minutes: number): Date {
         date = this.fromString(date);
         return moment(date).add(minutes, 'minutes').toDate();
     }
 
+    public static addRemoveSeconds(date: Date, seconds: number): Date {
+        date = this.fromString(date);
+        return moment(date).add(seconds, 'seconds').toDate();
+    }
+
     public static getSecondsInDays(days: PositiveNumber | number): number {
         if (!(days instanceof PositiveNumber)) {
             days = new PositiveNumber(days);
@@ -330,9 +351,9 @@ export default class OneUptimeDate {
         return moment(date).isAfter(startDate);
     }
 
-    public static hasExpired(expiratinDate: Date): boolean {
-        expiratinDate = this.fromString(expiratinDate);
-        return !moment(this.getCurrentDate()).isBefore(expiratinDate);
+    public static hasExpired(expirationDate: Date): boolean {
+        expirationDate = this.fromString(expirationDate);
+        return !moment(this.getCurrentDate()).isBefore(expirationDate);
     }
 
     public static isBefore(date: Date, endDate: Date): boolean {
@@ -364,6 +385,82 @@ export default class OneUptimeDate {
         );
     }
 
+    public static getDifferenceInMinutes(date: Date, date2: Date): number {
+        date = this.fromString(date);
+        date2 = this.fromString(date2);
+        const minutes: number = moment(date).diff(moment(date2), 'minutes');
+
+        if (minutes < 0) {
+            return minutes * -1;
+        }
+
+        return minutes;
+    }
+
+    public static getDateAsFormattedArrayInMultipleTimezones(
+        date: string | Date,
+        onlyShowDate?: boolean
+    ): Array<string> {
+        date = this.fromString(date);
+
+        let formatstring: string = 'MMM DD YYYY, HH:mm';
+
+        if (onlyShowDate) {
+            formatstring = 'MMM DD, YYYY';
+        }
+
+        // convert this date into GMT, EST, PST, IST, ACT with moment
+        const timezoneDates: Array<string> = [];
+
+        timezoneDates.push(
+            moment(date).tz('UTC').format(formatstring) +
+                ' ' +
+                (onlyShowDate ? '' : 'GMT')
+        );
+        timezoneDates.push(
+            moment(date).tz('America/New_York').format(formatstring) +
+                ' ' +
+                (onlyShowDate ? '' : 'EST')
+        );
+        timezoneDates.push(
+            moment(date).tz('America/Los_Angeles').format(formatstring) +
+                ' ' +
+                (onlyShowDate ? '' : 'PST')
+        );
+        timezoneDates.push(
+            moment(date).tz('Asia/Kolkata').format(formatstring) +
+                ' ' +
+                (onlyShowDate ? '' : 'IST')
+        );
+        timezoneDates.push(
+            moment(date).tz('Australia/Sydney').format(formatstring) +
+                ' ' +
+                (onlyShowDate ? '' : 'AEST')
+        );
+
+        return timezoneDates;
+    }
+
+    public static getDateAsFormattedHTMLInMultipleTimezones(
+        date: string | Date,
+        onlyShowDate?: boolean
+    ): string {
+        return this.getDateAsFormattedArrayInMultipleTimezones(
+            date,
+            onlyShowDate
+        ).join('<br/>');
+    }
+
+    public static getDateAsFormattedStringInMultipleTimezones(
+        date: string | Date,
+        onlyShowDate?: boolean
+    ): string {
+        return this.getDateAsFormattedArrayInMultipleTimezones(
+            date,
+            onlyShowDate
+        ).join('\n');
+    }
+
     public static getDateAsLocalFormattedString(
         date: string | Date,
         onlyShowDate?: boolean
@@ -385,6 +482,13 @@ export default class OneUptimeDate {
         );
     }
 
+    public static getDayInSeconds(days?: number | undefined): number {
+        if (!days) {
+            days = 1;
+        }
+        return 24 * 60 * 60 * days;
+    }
+
     public static getCurrentTimezoneString(): string {
         return moment.tz(moment.tz.guess()).zoneAbbr();
     }
@@ -431,4 +535,13 @@ export default class OneUptimeDate {
         const formatstring: string = 'YYYY-MM-DD';
         return moment(date).local().format(formatstring);
     }
+
+    public static asFilterDateForDatabaseQuery(date: string | Date): InBetween {
+        date = this.fromString(date);
+        const formattedDate: Date = moment(date).toDate();
+        return new InBetween(
+            OneUptimeDate.getStartOfDay(formattedDate),
+            OneUptimeDate.getEndOfDay(formattedDate)
+        );
+    }
 }

Common/Types/Domain.ts

@@ -26,7 +26,7 @@ export default class Domain extends DatabaseProperty {
                 '|'
             );
         const secondTLDs: Array<string> =
-            'ac|academy|accountant|accountants|actor|adult|ag|agency|ai|airforce|am|amsterdam|apartments|app|archi|army|art|asia|associates|at|attorney|au|auction|auto|autos|baby|band|bar|barcelona|bargains|basketball|bayern|be|beauty|beer|berlin|best|bet|bid|bike|bingo|bio|biz|biz.pl|black|blog|blue|boats|boston|boutique|broker|build|builders|business|buzz|bz|ca|cab|cafe|camera|camp|capital|car|cards|care|careers|cars|casa|cash|casino|catering|cc|center|ceo|ch|charity|chat|cheap|church|city|cl|claims|cleaning|clinic|clothing|cloud|club|cn|co|co.in|co.jp|co.kr|co.nz|co.uk|co.za|coach|codes|coffee|college|com|com.ag|com.au|com.br|com.bz|com.cn|com.co|com.es|com.ky|com.mx|com.pe|com.ph|com.pl|com.ru|com.tw|community|company|computer|condos|construction|consulting|contact|contractors|cooking|cool|country|coupons|courses|credit|creditcard|cricket|cruises|cymru|cz|dance|date|dating|de|deals|degree|delivery|democrat|dental|dentist|design|dev|diamonds|digital|direct|directory|discount|dk|doctor|dog|domains|download|earth|education|email|energy|engineer|engineering|enterprises|equipment|es|estate|eu|events|exchange|expert|exposed|express|fail|faith|family|fan|fans|farm|fashion|film|finance|financial|firm.in|fish|fishing|fit|fitness|flights|florist|fm|football|forsale|foundation|fr|fun|fund|furniture|futbol|fyi|gallery|games|garden|gay|gen.in|gg|gifts|gives|giving|glass|global|gmbh|gold|golf|graphics|gratis|green|gripe|group|gs|guide|guru|hair|haus|health|healthcare|hockey|holdings|holiday|homes|horse|hospital|host|house|idv.tw|immo|immobilien|in|inc|ind.in|industries|info|info.pl|ink|institute|insure|international|investments|io|irish|ist|istanbul|it|jetzt|jewelry|jobs|jp|kaufen|kids|kim|kitchen|kiwi|kr|ky|la|land|lat|law|lawyer|lease|legal|lgbt|life|lighting|limited|limo|live|llc|llp|loan|loans|london|love|ltd|ltda|luxury|maison|makeup|management|market|marketing|mba|me|me.uk|media|melbourne|memorial|men|menu|miami|mobi|moda|moe|money|monster|mortgage|motorcycles|movie|ms|music|mx|nagoya|name|navy|ne.kr|net|net.ag|net.au|net.br|net.bz|net.cn|net.co|net.in|net.ky|net.nz|net.pe|net.ph|net.pl|net.ru|network|news|ninja|nl|no|nom.co|nom.es|nom.pe|nrw|nyc|okinawa|one|onl|online|org|org.ag|org.au|org.cn|org.es|org.in|org.ky|org.nz|org.pe|org.ph|org.pl|org.ru|org.uk|organic|page|paris|partners|parts|party|pe|pet|ph|photography|photos|pictures|pink|pizza|pl|place|plumbing|plus|poker|porn|press|pro|productions|promo|properties|protection|pub|pw|quebec|quest|racing|re.kr|realestate|recipes|red|rehab|reise|reisen|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|rip|rocks|rodeo|rugby|run|ryukyu|sale|salon|sarl|school|schule|science|se|security|services|sex|sg|sh|shiksha|shoes|shop|shopping|show|singles|site|ski|skin|soccer|social|software|solar|solutions|space|storage|store|stream|studio|study|style|supplies|supply|support|surf|surgery|sydney|systems|tax|taxi|team|tech|technology|tel|tennis|theater|theatre|tickets|tienda|tips|tires|today|tokyo|tools|tours|town|toys|trade|trading|training|travel|tube|tv|tw|uk|university|uno|us|vacations|vc|vegas|ventures|vet|viajes|video|villas|vin|vip|vision|vodka|vote|voto|voyage|wales|watch|web|webcam|website|wedding|wiki|win|wine|work|works|world|ws|wtf|xxx|xyz|yachts|yoga|yokohama|zone|移动|dev|com|edu|gov|net|mil|org|nom|sch|caa|res|off|gob|int|tur|ip6|uri|urn|asn|act|nsw|qld|tas|vic|pro|biz|adm|adv|agr|arq|art|ato|bio|bmd|cim|cng|cnt|ecn|eco|emp|eng|esp|etc|eti|far|fnd|fot|fst|g12|ggf|imb|ind|inf|jor|jus|leg|lel|mat|med|mus|not|ntr|odo|ppg|psc|psi|qsl|rec|slg|srv|teo|tmp|trd|vet|zlg|web|ltd|sld|pol|fin|k12|lib|pri|aip|fie|eun|sci|prd|cci|pvt|mod|idv|rel|sex|gen|nic|abr|bas|cal|cam|emr|fvg|laz|lig|lom|mar|mol|pmn|pug|sar|sic|taa|tos|umb|vao|vda|ven|mie|北海道|和歌山|神奈川|鹿児島|ass|rep|tra|per|ngo|soc|grp|plc|its|air|and|bus|can|ddr|jfk|mad|nrw|nyc|ski|spy|tcm|ulm|usa|war|fhs|vgs|dep|eid|fet|fla|flå|gol|hof|hol|sel|vik|cri|iwi|ing|abo|fam|gok|gon|gop|gos|aid|atm|gsm|sos|elk|waw|est|aca|bar|cpa|jur|law|sec|plo|www|bir|cbg|jar|khv|msk|nov|nsk|ptz|rnd|spb|stv|tom|tsk|udm|vrn|cmw|kms|nkz|snz|pub|fhv|red|ens|nat|rns|rnu|bbs|tel|bel|kep|nhs|dni|fed|isa|nsn|gub|e12|tec|орг|обр|упр|alt|nis|jpn|mex|ath|iki|nid|gda|inc'.split(
+            'ac|academy|accountant|accountants|actor|adult|ag|agency|ai|airforce|am|amsterdam|apartments|app|archi|army|art|asia|associates|at|attorney|au|auction|auto|autos|baby|band|bar|barcelona|bargains|basketball|bayern|be|beauty|beer|berlin|best|bet|bid|bike|bingo|bio|biz|biz.pl|black|blog|blue|boats|boston|boutique|broker|build|builders|business|buzz|bz|ca|cab|cafe|camera|camp|capital|car|cards|care|careers|cars|casa|cash|casino|catering|cc|center|ceo|ch|charity|chat|cheap|church|city|cl|claims|cleaning|clinic|clothing|cloud|club|cn|co|co.in|co.jp|co.kr|co.nz|co.uk|co.za|coach|codes|coffee|college|com|com.ag|com.au|com.br|com.bz|com.cn|com.co|com.es|com.ky|com.mx|com.pe|com.ph|com.pl|com.ru|com.tw|community|company|computer|condos|construction|consulting|contact|contractors|cooking|cool|country|coupons|courses|credit|creditcard|cricket|cruises|cymru|cz|dance|date|dating|de|deals|degree|delivery|democrat|dental|dentist|design|dev|diamonds|digital|direct|directory|discount|dk|doctor|dog|domains|download|earth|education|email|energy|engineer|engineering|enterprises|equipment|es|estate|eu|events|exchange|expert|exposed|express|fail|faith|family|fan|fans|farm|fashion|film|finance|financial|firm.in|fish|fishing|fit|fitness|flights|florist|fm|football|forsale|foundation|fr|fun|fund|furniture|futbol|fyi|gallery|games|garden|gay|gen.in|gg|gifts|gives|giving|glass|global|gmbh|gold|golf|graphics|gratis|green|gripe|group|gs|guide|guru|hair|haus|health|healthcare|hockey|holdings|holiday|homes|horse|hospital|host|house|idv.tw|immo|immobilien|in|inc|ind.in|industries|info|info.pl|ink|institute|insure|international|investments|io|irish|ist|istanbul|it|jetzt|jewelry|jobs|jp|kaufen|kids|kim|kitchen|kiwi|kr|ky|la|land|lat|law|lawyer|lease|legal|lgbt|life|lighting|limited|limo|live|llc|llp|loan|loans|london|love|ltd|ltda|luxury|maison|makeup|management|market|marketing|mba|me|me.uk|media|melbourne|memorial|men|menu|miami|mobi|moda|moe|money|monster|mortgage|motorcycles|movie|ms|music|mx|nagoya|name|navy|ne.kr|net|net.ag|net.au|net.br|net.bz|net.cn|net.co|net.in|net.ky|net.nz|net.pe|net.ph|net.pl|net.ru|network|news|ninja|nl|no|nom.co|nom.es|nom.pe|nrw|nyc|okinawa|one|onl|online|org|org.ag|org.au|org.cn|org.es|org.in|org.ky|org.nz|org.pe|org.ph|org.pl|org.ru|org.uk|organic|page|paris|partners|parts|party|pe|pet|ph|photography|photos|pictures|pink|pizza|pl|place|plumbing|plus|poker|porn|press|pro|productions|promo|properties|protection|pub|pw|quebec|quest|racing|re.kr|realestate|recipes|red|rehab|reise|reisen|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|rip|rocks|rodeo|rugby|run|ryukyu|sale|salon|sarl|school|schule|science|se|security|services|sex|sg|sh|shiksha|shoes|shop|shopping|show|singles|site|ski|skin|soccer|social|software|solar|solutions|space|storage|store|stream|studio|study|style|supplies|supply|support|surf|surgery|sydney|systems|tax|taxi|team|tech|technology|tel|tennis|theater|theatre|tickets|tienda|tips|tires|today|tokyo|tools|tours|town|toys|trade|trading|training|travel|tube|tv|tw|uk|university|uno|us|vacations|vc|vegas|ventures|vet|viajes|video|villas|vin|vip|vision|vodka|vote|voto|voyage|wales|watch|web|webcam|website|wedding|wiki|win|wine|work|works|world|ws|wtf|xxx|xyz|yachts|yoga|yokohama|zone|移动|dev|com|edu|gov|net|mil|org|nom|sch|sbs|caa|res|off|gob|int|tur|ip6|uri|urn|asn|act|nsw|qld|tas|vic|pro|biz|adm|adv|agr|arq|art|ato|bio|bmd|cim|cng|cnt|ecn|eco|emp|eng|esp|etc|eti|far|fnd|fot|fst|g12|ggf|imb|ind|inf|jor|jus|leg|lel|mat|med|mus|not|ntr|odo|ppg|psc|psi|qsl|rec|slg|srv|teo|tmp|trd|vet|zlg|web|ltd|sld|pol|fin|k12|lib|pri|aip|fie|eun|sci|prd|cci|pvt|mod|idv|rel|sex|gen|nic|abr|bas|cal|cam|emr|fvg|laz|lig|lom|mar|mol|pmn|pug|sar|sic|taa|tos|umb|vao|vda|ven|mie|北海道|和歌山|神奈川|鹿児島|ass|rep|tra|per|ngo|soc|grp|plc|its|air|and|bus|can|ddr|jfk|mad|nrw|nyc|ski|spy|tcm|ulm|usa|war|fhs|vgs|dep|eid|fet|fla|flå|gol|hof|hol|sel|vik|cri|iwi|ing|abo|fam|gok|gon|gop|gos|aid|atm|gsm|sos|elk|waw|est|aca|bar|cpa|jur|law|sec|plo|www|bir|cbg|jar|khv|msk|nov|nsk|ptz|rnd|spb|stv|tom|tsk|udm|vrn|cmw|kms|nkz|snz|pub|fhv|red|ens|nat|rns|rnu|bbs|tel|bel|kep|nhs|dni|fed|isa|nsn|gub|e12|tec|орг|обр|упр|alt|nis|jpn|mex|ath|iki|nid|gda|inc|za'.split(
                 '|'
             );
 

Common/Types/Email.ts

@@ -33,6 +33,11 @@ export default class Email extends DatabaseProperty {
         return this._email;
     }
     public set email(value: string) {
+        if (value && typeof value === 'string') {
+            value = value.trim();
+            value = value.toLowerCase();
+        }
+
         if (Email.isValid(value)) {
             this._email = value;
         } else {

Common/Types/Email/EmailMessage.ts

@@ -2,10 +2,13 @@ import Email from '../Email';
 import Dictionary from '../Dictionary';
 import EmailTemplateType from './EmailTemplateType';
 
-export default interface EmailMessage {
-    toEmail: Email;
+export interface EmailEnvelope {
     subject: string;
     templateType?: EmailTemplateType;
     vars: Dictionary<string>;
     body?: string;
 }
+
+export default interface EmailMessage extends EmailEnvelope {
+    toEmail: Email;
+}

Common/Types/Email/EmailServer.ts

@@ -1,12 +1,14 @@
 import Email from '../Email';
 import Port from '../Port';
 import Hostname from '../API/Hostname';
+import ObjectID from '../ObjectID';
 
 export default interface EmailServer {
+    id?: ObjectID | undefined; // If this is custom SMTP, this is the ID of the SMTP config. Otherwise, it's undefined
     host: Hostname;
     port: Port;
-    username: string;
-    password: string;
+    username: string | undefined;
+    password: string | undefined;
     secure: boolean;
     fromEmail: Email;
     fromName: string;

Common/Types/Email/EmailTemplateType.ts

@@ -17,6 +17,23 @@ enum EmailTemplateType {
     StatusPageWelcomeEmail = 'StatusPageWelcomeEmail.hbs',
     SubscriberScheduledMaintenanceEventNoteCreated = 'SubscriberScheduledMaintenanceEventNoteCreated.hbs',
     SMTPTest = 'SMTPTest.hbs',
+    MonitorOwnerAdded = 'MonitorOwnerAdded.hbs',
+    MonitorOwnerResourceCreated = 'MonitorOwnerResourceCreated.hbs',
+    MonitorOwnerStatusChanged = 'MonitorOwnerStatusChanged.hbs',
+    IncidentOwnerAdded = 'IncidentOwnerAdded.hbs',
+    IncidentOwnerStateChanged = 'IncidentOwnerStateChanged.hbs',
+    IncidentOwnerNotePosted = 'IncidentOwnerNotePosted.hbs',
+    IncidentOwnerResourceCreated = 'IncidentOwnerResourceCreated.hbs',
+    ScheduledMaintenanceOwnerNotePosted = 'ScheduledMaintenanceOwnerNotePosted.hbs',
+    ScheduledMaintenanceOwnerAdded = 'ScheduledMaintenanceOwnerAdded.hbs',
+    ScheduledMaintenanceOwnerStateChanged = 'ScheduledMaintenanceOwnerStateChanged.hbs',
+    ScheduledMaintenanceOwnerResourceCreated = 'ScheduledMaintenanceOwnerResourceCreated.hbs',
+    StatusPageOwnerResourceCreated = 'StatusPageOwnerResourceCreated.hbs',
+    StatusPageOwnerAdded = 'StatusPageOwnerAdded.hbs',
+    StatusPageOwnerAnnouncementPosted = 'StatusPageOwnerAnnouncementPosted.hbs',
+    SimpleMessage = 'SimpleMessage.hbs',
+    VerificationCode = 'VerificationCode.hbs',
+    AcknowledgeIncident = 'AcknowledgeIncident.hbs',
 }
 
 export default EmailTemplateType;

Common/Types/Exception/ExceptionCode.ts

@@ -9,10 +9,11 @@ enum ExceptionCode {
     BadRequestException = 400,
     ServerException = 500,
     NotAuthorizedException = 403,
-    NotAuthenticatedxception = 401,
+    NotAuthenticatedException = 401,
     PaymentRequiredException = 402,
     NotFoundException = 404,
     TimeoutException = 408,
+    TenantNotFoundException = 405, 
     SsoAuthorizationException = 406,
 }
 

Common/Types/Exception/NotAuthenticatedException.ts

@@ -3,6 +3,6 @@ import ExceptionCode from './ExceptionCode';
 
 export default class NotAuthenticatedException extends Exception {
     public constructor(message: string) {
-        super(ExceptionCode.NotAuthenticatedxception, message);
+        super(ExceptionCode.NotAuthenticatedException, message);
     }
 }

Common/Types/Exception/SsoAuthorizationException.ts

@@ -1,11 +1,17 @@
 import Exception from './Exception';
 import ExceptionCode from './ExceptionCode';
 
-export default class NotAuthorizedException extends Exception {
+export default class SSOAuthorizationException extends Exception {
+    private static message: string = 'SSO Authorization Required';
+
     public constructor() {
         super(
             ExceptionCode.SsoAuthorizationException,
-            'SSO Authorization Required'
+            SSOAuthorizationException.message
         );
     }
+
+    public static isException(errorMessage: string): boolean {
+        return errorMessage === SSOAuthorizationException.message;
+    }
 }

Common/Types/Exception/TenantNotFoundException.ts

@@ -0,0 +1,8 @@
+import Exception from './Exception';
+import ExceptionCode from './ExceptionCode';
+
+export default class TenantNotFoundException extends Exception {
+    public constructor(message: string) {
+        super(ExceptionCode.TenantNotFoundException, message);
+    }
+}

Common/Types/HashedString.ts

@@ -67,7 +67,7 @@ export default class HashedString extends DatabaseProperty {
         }
 
         if (this.isHashed) {
-            throw new BadOperationException('Value is alredy hashed');
+            throw new BadOperationException('Value is already hashed');
         }
 
         const valueToHash: string = (encryptionSecret || '') + this.value;

Common/Types/IP/IP.ts

@@ -1,7 +1,7 @@
 import { FindOperator } from 'typeorm';
 import DatabaseProperty from '../Database/DatabaseProperty';
 import BadDataException from '../Exception/BadDataException';
-import { JSONObject } from '../JSON';
+import { JSONObject, ObjectType } from '../JSON';
 import Typeof from '../Typeof';
 import IPType from './IPType';
 
@@ -73,11 +73,11 @@ export default class IP extends DatabaseProperty {
     }
 
     public static override fromJSON(json: JSONObject): IP {
-        if (json && json['_type'] !== 'IP') {
+        if (json && json['_type'] !== ObjectType.IP) {
             throw new BadDataException('Invalid JSON for IP');
         }
 
-        if (json && json['value'] && typeof json['value'] === Typeof.String) {
+        if (json && json['value'] && typeof json['value'] !== Typeof.String) {
             throw new BadDataException('Invalid JSON for IP');
         }
 
@@ -87,7 +87,7 @@ export default class IP extends DatabaseProperty {
     public override toJSON(): JSONObject {
         return {
             value: this.toString(),
-            _type: 'IP',
+            _type: ObjectType.IP,
         };
     }