script for helm upload to cloudsmith

.github/workflows/check-be-pull-request.yml

@@ -1,41 +0,0 @@
-name: Check Backend Pull Request
-
-on:
-  pull_request:
-    types: [ opened, synchronize ]
-    paths:
-      - 'backend/**'
-      - '!backend/README.md'
-      - '!backend/.*'
-      - 'backend/.eslintrc.js'
-
-
-jobs:
-
-  check-be-pr:
-    name: Check
-    runs-on: ubuntu-latest
-
-    steps:
-      -
-        name: ☁️ Checkout source
-        uses: actions/checkout@v3
-      -
-        name: 🔧 Setup Node 16
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: 'npm'
-          cache-dependency-path: backend/package-lock.json
-      -
-        name: 📦 Install dependencies
-        run: npm ci --only-production --ignore-scripts
-        working-directory: backend
-      # -
-      #   name: 🧪 Run tests
-      #   run: npm run test:ci
-      #   working-directory: backend
-      -
-        name: 🏗️ Run build
-        run: npm run build
-        working-directory: backend

.github/workflows/check-fe-pull-request.yml

@@ -1,41 +0,0 @@
-name: Check Frontend Pull Request
-
-on:
-  pull_request:
-    types: [ opened, synchronize ]
-    paths:
-      - 'frontend/**'
-      - '!frontend/README.md'
-      - '!frontend/.*'
-      - 'frontend/.eslintrc.js'
-
-
-jobs:
-
-  check-fe-pr:
-    name: Check
-    runs-on: ubuntu-latest
-
-    steps:
-      -
-        name: ☁️ Checkout source
-        uses: actions/checkout@v3
-      -
-        name: 🔧 Setup Node 16
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      -
-        name: 📦 Install dependencies
-        run: npm ci --only-production --ignore-scripts
-        working-directory: frontend
-      # -
-      #   name: 🧪 Run tests
-      #   run: npm run test:ci
-      #   working-directory: frontend
-      -
-        name: 🏗️ Run build
-        run: npm run build
-        working-directory: frontend

.github/workflows/docker-image.yml

@@ -3,88 +3,35 @@ name: Push to Docker Hub
 on: [workflow_dispatch]
 
 jobs:
-
-  backend-image:
-    name: Build backend image
+  docker:
     runs-on: ubuntu-latest
-
     steps:
-      - 
-        name: ☁️ Checkout source
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v2
       -
-        name: 🔧 Set up QEMU
+        name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       -
-        name: 🔧 Set up Docker Buildx
+        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       -
-        name: 🐋 Login to Docker Hub
+        name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # -
-      #   name: 📦 Build backend and export to Docker
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     load: true
-      #     context: backend
-      #     tags: infisical/backend:test
-      # -
-      #   name: 🧪 Test backend image
-      #   run: |
-      #     docker run --rm infisical/backend:test
       -
-        name: 🏗️ Build backend and push
+        name: Build and push backend
         uses: docker/build-push-action@v3
         with:
           push: true
           context: backend
-          tags: infisical/backend:latest
-          platforms: linux/amd64,linux/arm64
-
-
-  frontend-image:
-    name: Build frontend image
-    runs-on: ubuntu-latest
-
-    steps:
-      - 
-        name: ☁️ Checkout source
-        uses: actions/checkout@v3
+          tags: infisical/backend:test
       -
-        name: 🔧 Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: 🔧 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: 🐋 Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # -
-      #   name: 📦 Build frontend and export to Docker
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     load: true
-      #     context: frontend
-      #     tags: infisical/frontend:test
-      #     build-args: |
-      #       POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
-      # -
-      #   name: 🧪 Test frontend image
-      #   run: |
-      #     docker run --rm infisical/frontend:test
-      -
-        name: 🏗️ Build frontend and push
+        name: Build and push frontend
         uses: docker/build-push-action@v3
         with:
           push: true
+          file: frontend/Dockerfile.dev
           context: frontend
-          tags: infisical/frontend:latest
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
+          tags: infisical/frontend:test

.github/workflows/helm-chart-release.yaml

@@ -0,0 +1,33 @@
+name: Release Charts
+
+on: [workflow_dispatch]
+
+jobs:
+  release:
+    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
+    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.10.0
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.4.1
+        with:
+          charts_dir: helm-charts
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/helm_chart_release.yml

@@ -1,22 +0,0 @@
-name: Release Helm Charts
-
-on: [workflow_dispatch]
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.10.0
-      - name: Install python
-        uses: actions/setup-python@v4
-      - name: Install Cloudsmith CLI
-        run: pip install --upgrade cloudsmith-cli
-      - name: Build and push helm package to Cloudsmith
-        run: cd helm-charts && sh upload-to-cloudsmith.sh
-        env:
-          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

.github/workflows/release_build.yml

@@ -1,4 +1,4 @@
-name: Go releaser
+name: goreleaser
 
 on:
   push:

README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img width="300" src="/img/logoname-black.svg#gh-light-mode-only" alt="infisical">
+  <img width="300" src="/img/logoname-black.svg#gh-light-mode-only" alt="ifnisical">
   <img width="300" src="/img/logoname-white.svg#gh-dark-mode-only" alt="infisical">
 </h1>
 <p align="center">
@@ -48,17 +48,11 @@
 
 And more.
 
-## 🚀 Get started
+## Get started
 
 To quickly get started, visit our [get started guide](https://infisical.com/docs/getting-started/introduction).
 
-<p>
-  <a href="https://infisical.com/docs/self-hosting/overview" target="_blank"><img src="https://user-images.githubusercontent.com/78047717/206356882-2b773eed-b0da-4725-ae2f-83e3cd7f2713.png" height=120 /> </a>
-  <a href="https://www.youtube.com/watch?v=JS3OKYU2078" target="_blank"><img src="https://user-images.githubusercontent.com/78047717/206356600-8833b128-6cae-408c-a703-07b2fc6aff4b.png" height=120 /> </a>
-  <a href="https://app.infisical.com/signup" target="_blank"><img src="https://user-images.githubusercontent.com/78047717/206355970-f4c09062-b88f-452a-94e0-9c61a0651170.png" height=120></a>
-</p>
-
-## 🔥 What's cool about this?
+## What's cool about this?
 
 Infisical makes secret management simple and end-to-end encrypted by default. We're on a mission to make it more accessible to all developers, <i>not just security teams</i>. 
 
@@ -68,22 +62,20 @@ If you care about efficiency and security, then Infisical is right for you.
 
 We are currently working hard to make Infisical more extensive. Need any integrations or want a new feature? Feel free to [create an issue](https://github.com/Infisical/infisical/issues) or [contribute](https://infisical.com/docs/contributing/overview) directly to the repository.
 
-## 🌱 Contributing
+## Contributing
 
 Whether it's big or small, we love contributions ❤️ Check out our guide to see how to [get started](https://infisical.com/docs/contributing/overview).
 
-Not sure where to get started? You can:
-- [Book a free, non-pressure pairing sessions with one of our teammates](mailto:tony@infisical.com?subject=Pairing%20session&body=I'd%20like%20to%20do%20a%20pairing%20session!)!
-- Join our <a href="https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g">Slack</a>, and ask us any questions there.
+Not sure where to get started? [Book a free, non-pressure pairing sessions with one of our teammates](mailto:tony@infisical.com?subject=Pairing%20session&body=I'd%20like%20to%20do%20a%20pairing%20session!)!
 
-## 💚 Community & Support
+## Community & Support
 
 - [Slack](https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g) (For live discussion with the community and the Infisical team)
 - [GitHub Discussions](https://github.com/Infisical/infisical/discussions) (For help with building and deeper conversations about features)
 - [GitHub Issues](https://github.com/Infisical/infisical-cli/issues) (For any bugs and errors you encounter using Infisical)
 - [Twitter](https://twitter.com/infisical) (Get news fast) 
 
-## 🐥 Status
+## Status
 
 - [x] Public Alpha: Anyone can sign up over at [infisical.com](https://infisical.com) but go easy on us, there are kinks and we're just getting started.
 - [ ] Public Beta: Stable enough for most non-enterprise use-cases.
@@ -91,13 +83,13 @@ Not sure where to get started? You can:
 
 We're currently in Public Alpha.
 
-## 🚨 Stay Up-to-Date
+## Stay Up-to-Date
 
 Infisical officially launched as v.1.0 on November 21st, 2022. However, a lot of new features are coming very quickly. Watch **releases** of this repository to be notified about future updates:
 
 ![infisical-star-github](https://github.com/Infisical/infisical/blob/main/.github/images/star-infisical.gif?raw=true)
 
-## 🔌 Integrations
+## Integrations
 
 We're currently setting the foundation and building [integrations](https://infisical.com/docs/integrations/overview) so secrets can be synced everywhere. Any help is welcome! :)
 
@@ -269,15 +261,15 @@ We're currently setting the foundation and building [integrations](https://infis
 </table>
 
 
-## 🏘 Open-source vs. paid
+## Open-source vs. paid
 
 This repo is entirely MIT licensed, with the exception of the `ee` directory which will contain premium enterprise features requiring a Infisical license in the future. We're currently focused on developing non-enterprise offerings first that should suit most use-cases.
 
-## 🛡 Security
+## Security
 
 Looking to report a security vulnerability? Please don't post about it in GitHub issue. Instead, refer to our [SECURITY.md](./SECURITY.md) file.
 
-## 🦸 Contributors
+## Contributors 🦸
 
 [//]: contributor-faces
 
@@ -285,4 +277,4 @@ Looking to report a security vulnerability? Please don't post about it in GitHub
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 
-<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/reginaldbondoc"><img src="https://avatars.githubusercontent.com/u/7693108?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/SH5H"><img src="https://avatars.githubusercontent.com/u/25437192?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/asharonbaltazar"><img src="https://avatars.githubusercontent.com/u/58940073?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/edgarrmondragon"><img src="https://avatars.githubusercontent.com/u/16805946?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="50" height="50" alt=""/></a> 
+<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/reginaldbondoc"><img src="https://avatars.githubusercontent.com/u/7693108?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/SH5H"><img src="https://avatars.githubusercontent.com/u/25437192?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="50" height="50" alt=""/></a> 

backend/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@sentry/node": "^7.14.0",
-        "@sentry/tracing": "^7.19.0",
+        "@sentry/tracing": "^7.14.0",
         "@types/crypto-js": "^4.1.1",
         "axios": "^1.1.3",
         "bigint-conversion": "^2.2.2",
@@ -19,13 +19,13 @@
         "crypto-js": "^4.1.1",
         "dotenv": "^16.0.1",
         "express": "^4.18.1",
-        "express-rate-limit": "^6.7.0",
+        "express-rate-limit": "^6.5.1",
         "express-validator": "^6.14.2",
         "handlebars": "^4.7.7",
         "helmet": "^5.1.1",
         "jsonwebtoken": "^8.5.1",
         "jsrp": "^0.2.4",
-        "mongoose": "^6.7.2",
+        "mongoose": "^6.7.1",
         "nodemailer": "^6.8.0",
         "posthog-node": "^2.1.0",
         "query-string": "^7.1.1",
@@ -33,7 +33,7 @@
         "stripe": "^10.7.0",
         "tweetnacl": "^1.0.3",
         "tweetnacl-util": "^0.15.1",
-        "typescript": "^4.9.3"
+        "typescript": "^4.8.4"
       },
       "devDependencies": {
         "@posthog/plugin-scaffold": "^1.3.4",
@@ -2608,13 +2608,13 @@
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz",
-      "integrity": "sha512-yG7Tx32WqOkEHVotFLrumCcT9qlaSDTkFNZ+yLSvZXx74ifsE781DzBA9W7K7bBdYO3op+p2YdsOKzf3nPpAyQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.17.4.tgz",
+      "integrity": "sha512-cR+Gsir9c/tzFWxvk4zXkMQy6tNRHEYixHrb88XIjZVYDqDS9l2/bKs5nJusdmaUeLtmPp5Et2o7RJyS7gvKTQ==",
       "dependencies": {
-        "@sentry/core": "7.19.0",
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
+        "@sentry/core": "7.17.4",
+        "@sentry/types": "7.17.4",
+        "@sentry/utils": "7.17.4",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
@@ -2624,80 +2624,14 @@
         "node": ">=8"
       }
     },
-    "node_modules/@sentry/node/node_modules/@sentry/core": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz",
-      "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==",
-      "dependencies": {
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/node/node_modules/@sentry/types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz",
-      "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/node/node_modules/@sentry/utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz",
-      "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==",
-      "dependencies": {
-        "@sentry/types": "7.19.0",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@sentry/tracing": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.19.0.tgz",
-      "integrity": "sha512-SWY17M3TsgBePaGowUcSqBwaT0TJQzuNexVnLojuU0k6F57L9hubvP9zaoosoCfARXQ/3NypAFWnlJyf570rFQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.17.4.tgz",
+      "integrity": "sha512-9Fz6DI16ddnd970mlB5MiCNRSmSXp4SVZ1Yv3L22oS3kQeNxjBTE+htYNwJzSPrQp9aL/LqTYwlnrCy24u9XQA==",
       "dependencies": {
-        "@sentry/core": "7.19.0",
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/core": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz",
-      "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==",
-      "dependencies": {
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz",
-      "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz",
-      "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==",
-      "dependencies": {
-        "@sentry/types": "7.19.0",
+        "@sentry/core": "7.17.4",
+        "@sentry/types": "7.17.4",
+        "@sentry/utils": "7.17.4",
         "tslib": "^1.9.3"
       },
       "engines": {
@@ -4583,9 +4517,9 @@
       }
     },
     "node_modules/express-rate-limit": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.7.0.tgz",
-      "integrity": "sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.6.0.tgz",
+      "integrity": "sha512-HFN2+4ZGdkQOS8Qli4z6knmJFnw6lZed67o6b7RGplWeb1Z0s8VXaj3dUgPIdm9hrhZXTRpCTHXA0/2Eqex0vA==",
       "engines": {
         "node": ">= 12.9.0"
       },
@@ -6518,9 +6452,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.2.tgz",
-      "integrity": "sha512-lrP2V5U1qhaf+z33fiIn7aYAZZ1fVDly+TkFRjTujNBF/FIHESATj2RbgAOSlWqv32fsZXkXejXzeVfjbv35Ow==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.1.tgz",
+      "integrity": "sha512-qbagtqSyvIhUz4EWzXC00EA0DJHFrQwlzTlNGX5DjiESoJiPKqkEga1k9hviFKRFgBna+OlW54mkdi+0+AqxCw==",
       "dependencies": {
         "bson": "^4.7.0",
         "kareem": "2.4.1",
@@ -10574,9 +10508,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
-      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -13124,80 +13058,28 @@
       }
     },
     "@sentry/node": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz",
-      "integrity": "sha512-yG7Tx32WqOkEHVotFLrumCcT9qlaSDTkFNZ+yLSvZXx74ifsE781DzBA9W7K7bBdYO3op+p2YdsOKzf3nPpAyQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.17.4.tgz",
+      "integrity": "sha512-cR+Gsir9c/tzFWxvk4zXkMQy6tNRHEYixHrb88XIjZVYDqDS9l2/bKs5nJusdmaUeLtmPp5Et2o7RJyS7gvKTQ==",
       "requires": {
-        "@sentry/core": "7.19.0",
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
+        "@sentry/core": "7.17.4",
+        "@sentry/types": "7.17.4",
+        "@sentry/utils": "7.17.4",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
         "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/core": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz",
-          "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==",
-          "requires": {
-            "@sentry/types": "7.19.0",
-            "@sentry/utils": "7.19.0",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz",
-          "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA=="
-        },
-        "@sentry/utils": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz",
-          "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==",
-          "requires": {
-            "@sentry/types": "7.19.0",
-            "tslib": "^1.9.3"
-          }
-        }
       }
     },
     "@sentry/tracing": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.19.0.tgz",
-      "integrity": "sha512-SWY17M3TsgBePaGowUcSqBwaT0TJQzuNexVnLojuU0k6F57L9hubvP9zaoosoCfARXQ/3NypAFWnlJyf570rFQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.17.4.tgz",
+      "integrity": "sha512-9Fz6DI16ddnd970mlB5MiCNRSmSXp4SVZ1Yv3L22oS3kQeNxjBTE+htYNwJzSPrQp9aL/LqTYwlnrCy24u9XQA==",
       "requires": {
-        "@sentry/core": "7.19.0",
-        "@sentry/types": "7.19.0",
-        "@sentry/utils": "7.19.0",
+        "@sentry/core": "7.17.4",
+        "@sentry/types": "7.17.4",
+        "@sentry/utils": "7.17.4",
         "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/core": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz",
-          "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==",
-          "requires": {
-            "@sentry/types": "7.19.0",
-            "@sentry/utils": "7.19.0",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz",
-          "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA=="
-        },
-        "@sentry/utils": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz",
-          "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==",
-          "requires": {
-            "@sentry/types": "7.19.0",
-            "tslib": "^1.9.3"
-          }
-        }
       }
     },
     "@sentry/types": {
@@ -14641,9 +14523,9 @@
       }
     },
     "express-rate-limit": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.7.0.tgz",
-      "integrity": "sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.6.0.tgz",
+      "integrity": "sha512-HFN2+4ZGdkQOS8Qli4z6knmJFnw6lZed67o6b7RGplWeb1Z0s8VXaj3dUgPIdm9hrhZXTRpCTHXA0/2Eqex0vA==",
       "requires": {}
     },
     "express-validator": {
@@ -16082,9 +15964,9 @@
       }
     },
     "mongoose": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.2.tgz",
-      "integrity": "sha512-lrP2V5U1qhaf+z33fiIn7aYAZZ1fVDly+TkFRjTujNBF/FIHESATj2RbgAOSlWqv32fsZXkXejXzeVfjbv35Ow==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.1.tgz",
+      "integrity": "sha512-qbagtqSyvIhUz4EWzXC00EA0DJHFrQwlzTlNGX5DjiESoJiPKqkEga1k9hviFKRFgBna+OlW54mkdi+0+AqxCw==",
       "requires": {
         "bson": "^4.7.0",
         "kareem": "2.4.1",
@@ -18943,9 +18825,9 @@
       }
     },
     "typescript": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
-      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA=="
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
     },
     "uglify-js": {
       "version": "3.17.4",

backend/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@sentry/node": "^7.14.0",
-    "@sentry/tracing": "^7.19.0",
+    "@sentry/tracing": "^7.14.0",
     "@types/crypto-js": "^4.1.1",
     "axios": "^1.1.3",
     "bigint-conversion": "^2.2.2",
@@ -10,13 +10,13 @@
     "crypto-js": "^4.1.1",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^6.5.1",
     "express-validator": "^6.14.2",
     "handlebars": "^4.7.7",
     "helmet": "^5.1.1",
     "jsonwebtoken": "^8.5.1",
     "jsrp": "^0.2.4",
-    "mongoose": "^6.7.2",
+    "mongoose": "^6.7.1",
     "nodemailer": "^6.8.0",
     "posthog-node": "^2.1.0",
     "query-string": "^7.1.1",
@@ -24,7 +24,7 @@
     "stripe": "^10.7.0",
     "tweetnacl": "^1.0.3",
     "tweetnacl-util": "^0.15.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.8.4"
   },
   "name": "infisical-api",
   "version": "1.0.0",

backend/src/helpers/signup.ts

@@ -66,7 +66,7 @@ const checkEmailVerification = async ({
 			email,
 			token: code
 		});
-	
+
 		if (!token) throw new Error('Failed to find email verification token');
 	} catch (err) {
 		Sentry.setUser(null);
@@ -106,7 +106,7 @@ const initializeDefaultOrg = async ({
 
 		// initialize a default workspace inside the new organization
 		const workspace = await createWorkspace({
-			name: `Example Project`,
+			name: `${user.firstName}'s Project`,
 			organizationId: organization._id.toString()
 		});
 

backend/src/models/token.ts

@@ -18,7 +18,7 @@ const tokenSchema = new Schema<IToken>({
 	},
 	createdAt: {
 		type: Date,
-		expires: parseInt(EMAIL_TOKEN_LIFETIME),
+		expires: EMAIL_TOKEN_LIFETIME,
 		default: Date.now
 	}
 });

cli/packages/cmd/export.go

@@ -1,140 +0,0 @@
-/*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-*/
-package cmd
-
-import (
-	"encoding/csv"
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/Infisical/infisical-merge/packages/models"
-	"github.com/Infisical/infisical-merge/packages/util"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-const (
-	FormatDotenv string = "dotenv"
-	FormatJson   string = "json"
-	FormatCSV    string = "csv"
-)
-
-// exportCmd represents the export command
-var exportCmd = &cobra.Command{
-	Use:                   "export",
-	Short:                 "Used to export environment variables to a file",
-	DisableFlagsInUseLine: true,
-	Example:               "infisical export --env=prod --format=json > secrets.json",
-	Args:                  cobra.NoArgs,
-	PreRun:                toggleDebug,
-	Run: func(cmd *cobra.Command, args []string) {
-		envName, err := cmd.Flags().GetString("env")
-		if err != nil {
-			log.Errorln("Unable to parse the environment flag")
-			log.Debugln(err)
-			return
-		}
-
-		shouldExpandSecrets, err := cmd.Flags().GetBool("expand")
-		if err != nil {
-			log.Errorln("Unable to parse the substitute flag")
-			log.Debugln(err)
-			return
-		}
-
-		projectId, err := cmd.Flags().GetString("projectId")
-		if err != nil {
-			log.Errorln("Unable to parse the project id flag")
-			log.Debugln(err)
-			return
-		}
-
-		format, err := cmd.Flags().GetString("format")
-		if err != nil {
-			log.Errorln("Unable to parse the format flag")
-			log.Debugln(err)
-			return
-		}
-
-		envsFromApi, err := util.GetAllEnvironmentVariables(projectId, envName)
-		if err != nil {
-			log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
-			log.Debugln(err)
-			return
-		}
-
-		var output string
-		if shouldExpandSecrets {
-			substitutions := util.SubstituteSecrets(envsFromApi)
-			output, err = formatEnvs(substitutions, format)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-		} else {
-			output, err = formatEnvs(envsFromApi, format)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-		}
-		fmt.Print(output)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(exportCmd)
-	exportCmd.Flags().StringP("env", "e", "dev", "Set the environment (dev, prod, etc.) from which your secrets should be pulled from")
-	exportCmd.Flags().String("projectId", "", "The project ID from which your secrets should be pulled from")
-	exportCmd.Flags().Bool("expand", true, "Parse shell parameter expansions in your secrets")
-	exportCmd.Flags().StringP("format", "f", "dotenv", "Set the format of the output file (dotenv, json, csv)")
-}
-
-// Format according to the format flag
-func formatEnvs(envs []models.SingleEnvironmentVariable, format string) (string, error) {
-	switch strings.ToLower(format) {
-	case FormatDotenv:
-		return formatAsDotEnv(envs), nil
-	case FormatJson:
-		return formatAsJson(envs), nil
-	case FormatCSV:
-		return formatAsCSV(envs), nil
-	default:
-		return "", fmt.Errorf("invalid format flag: %s", format)
-	}
-}
-
-// Format environment variables as a CSV file
-func formatAsCSV(envs []models.SingleEnvironmentVariable) string {
-	csvString := &strings.Builder{}
-	writer := csv.NewWriter(csvString)
-	writer.Write([]string{"Key", "Value"})
-	for _, env := range envs {
-		writer.Write([]string{env.Key, env.Value})
-	}
-	writer.Flush()
-	return csvString.String()
-}
-
-// Format environment variables as a dotenv file
-func formatAsDotEnv(envs []models.SingleEnvironmentVariable) string {
-	var dotenv string
-	for _, env := range envs {
-		dotenv += fmt.Sprintf("%s='%s'\n", env.Key, env.Value)
-	}
-	return dotenv
-}
-
-// Format environment variables as a JSON file
-func formatAsJson(envs []models.SingleEnvironmentVariable) string {
-	// Dump as a json array
-	json, err := json.Marshal(envs)
-	if err != nil {
-		log.Errorln("Unable to marshal environment variables to JSON")
-		log.Debugln(err)
-		return ""
-	}
-	return string(json)
-}

cli/packages/cmd/init.go

@@ -36,7 +36,7 @@ var initCmd = &cobra.Command{
 			return
 		}
 
-		if util.WorkspaceConfigFileExistsInCurrentPath() {
+		if util.WorkspaceConfigFileExists() {
 			shouldOverride, err := shouldOverrideWorkspacePrompt()
 			if err != nil {
 				log.Errorln("Unable to parse your answer")

cli/packages/cmd/login.go

@@ -114,7 +114,7 @@ func init() {
 
 func askForLoginCredentials() (email string, password string, err error) {
 	validateEmail := func(input string) error {
-		matched, err := regexp.MatchString("^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$", input)
+		matched, err := regexp.MatchString("^[\\w!#$%&'*+/=?`{|}~^-]+(?:\\.[\\w!#$%&'*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", input)
 		if err != nil || !matched {
 			return errors.New("this doesn't look like an email address")
 		}

cli/packages/cmd/root.go

@@ -15,7 +15,7 @@ var rootCmd = &cobra.Command{
 	Short:             "Infisical CLI is used to inject environment variables into any process",
 	Long:              `Infisical is a simple, end-to-end encrypted service that enables teams to sync and manage their environment variables across their development life cycle.`,
 	CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true},
-	Version:           "0.1.10",
+	Version:           "0.1.6",
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

cli/packages/cmd/run.go

@@ -47,17 +47,53 @@ var runCmd = &cobra.Command{
 			return
 		}
 
-		secrets, err := util.GetAllEnvironmentVariables(projectId, envName)
-		if err != nil {
-			log.Debugln(err)
-			return
+		var envsFromApi []models.SingleEnvironmentVariable
+		infisicalToken := os.Getenv(util.INFISICAL_TOKEN_NAME)
+		if infisicalToken == "" {
+			hasUserLoggedInbefore, loggedInUserEmail, err := util.IsUserLoggedIn()
+			if err != nil {
+				log.Info("Unexpected issue occurred while checking login status. To see more details, add flag --debug")
+				log.Debugln(err)
+				return
+			}
+
+			if !hasUserLoggedInbefore {
+				log.Infoln("No logged in user. To login, please run command [infisical login]")
+				return
+			}
+
+			userCreds, err := util.GetUserCredsFromKeyRing(loggedInUserEmail)
+			if err != nil {
+				log.Infoln("Unable to get user creds from key ring")
+				log.Debug(err)
+				return
+			}
+
+			if !util.WorkspaceConfigFileExists() {
+				log.Infoln("Your project is not connected to a project yet. Run command [infisical init]")
+				return
+			}
+
+			envsFromApi, err = util.GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
+			if err != nil {
+				log.Errorln("Something went wrong when pulling secrets using your logged in credentials. If the issue persists, double check your project id/try logging in again.")
+				log.Debugln(err)
+				return
+			}
+		} else {
+			envsFromApi, err = util.GetSecretsFromAPIUsingInfisicalToken(infisicalToken, envName, projectId)
+			if err != nil {
+				log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
+				log.Debugln(err)
+				return
+			}
 		}
 
 		if shouldExpandSecrets {
-			secretsWithSubstitutions := util.SubstituteSecrets(secrets)
-			execCmd(args[0], args[1:], secretsWithSubstitutions)
+			substitutions := util.SubstituteSecrets(envsFromApi)
+			execCmd(args[0], args[1:], substitutions)
 		} else {
-			execCmd(args[0], args[1:], secrets)
+			execCmd(args[0], args[1:], envsFromApi)
 		}
 
 	},
@@ -72,12 +108,9 @@ func init() {
 
 // Credit: inspired by AWS Valut
 func execCmd(command string, args []string, envs []models.SingleEnvironmentVariable) error {
-	numberOfSecretsInjected := fmt.Sprintf("\u2713 Injected %v Infisical secrets into your application process successfully", len(envs))
-
-	log.Infof("\x1b[%dm%s\x1b[0m", 32, numberOfSecretsInjected)
+	log.Infof("\x1b[%dm%s\x1b[0m", 32, "\u2713 Injected Infisical secrets into your application process successfully")
+	log.Debugln("Secrets to inject:", envs)
 	log.Debugf("executing command: %s %s \n", command, strings.Join(args, " "))
-	log.Debugln("Secrets injected:", envs)
-
 	cmd := exec.Command(command, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout

cli/packages/models/error.go

@@ -5,13 +5,10 @@ import log "github.com/sirupsen/logrus"
 // Custom error type so that we can give helpful messages in CLI
 type Error struct {
 	Err             error
+	DebugMessage    string
 	FriendlyMessage string
 }
 
 func (e *Error) printFriendlyMessage() {
 	log.Infoln(e.FriendlyMessage)
 }
-
-func (e *Error) printDebuError() {
-	log.Debugln(e.Err)
-}

cli/packages/util/config.go

@@ -56,7 +56,7 @@ func ConfigFileExists() bool {
 	}
 }
 
-func WorkspaceConfigFileExistsInCurrentPath() bool {
+func WorkspaceConfigFileExists() bool {
 	if _, err := os.Stat(INFISICAL_WORKSPACE_CONFIG_FILE_NAME); err == nil {
 		return true
 	} else {
@@ -90,65 +90,3 @@ func GetFullConfigFilePath() (fullPathToFile string, fullPathToDirectory string,
 	fullDirPath := fmt.Sprintf("%s/%s", homeDir, CONFIG_FOLDER_NAME)
 	return fullPath, fullDirPath, err
 }
-
-// Given a path to a workspace config, unmarshal workspace config
-func GetWorkspaceConfigByPath(path string) (workspaceConfig models.WorkspaceConfigFile, err error) {
-	workspaceConfigFileAsBytes, err := os.ReadFile(path)
-	if err != nil {
-		return models.WorkspaceConfigFile{}, fmt.Errorf("GetWorkspaceConfigByPath: Unable to read workspace config file because [%s]", err)
-	}
-
-	var workspaceConfigFile models.WorkspaceConfigFile
-	err = json.Unmarshal(workspaceConfigFileAsBytes, &workspaceConfigFile)
-	if err != nil {
-		return models.WorkspaceConfigFile{}, fmt.Errorf("GetWorkspaceConfigByPath: Unable to unmarshal workspace config file because [%s]", err)
-	}
-
-	return workspaceConfigFile, nil
-}
-
-// Will get the list of .infisical.json files that are located
-// within the root of each sub folder from where the CLI is ran from
-func GetAllWorkSpaceConfigsStartingFromCurrentPath() (workspaces []models.WorkspaceConfigFile, err error) {
-	currentDir, err := os.Getwd()
-	if err != nil {
-		return nil, fmt.Errorf("GetAllProjectConfigs: unable to get the current directory because [%s]", err)
-	}
-
-	files, err := os.ReadDir(currentDir)
-	if err != nil {
-		return nil, fmt.Errorf("GetAllProjectConfigs: unable to read the contents of the current directory because [%s]", err)
-	}
-
-	listOfWorkSpaceConfigs := []models.WorkspaceConfigFile{}
-	for _, file := range files {
-		if !file.IsDir() && file.Name() == INFISICAL_WORKSPACE_CONFIG_FILE_NAME {
-			pathToWorkspaceConfigFile := currentDir + "/" + INFISICAL_WORKSPACE_CONFIG_FILE_NAME
-
-			workspaceConfig, err := GetWorkspaceConfigByPath(pathToWorkspaceConfigFile)
-			if err != nil {
-				return nil, fmt.Errorf("GetAllProjectConfigs: Unable to get config file because [%s]", err)
-			}
-
-			listOfWorkSpaceConfigs = append(listOfWorkSpaceConfigs, workspaceConfig)
-
-		} else if file.IsDir() {
-			pathToSubFolder := currentDir + "/" + file.Name()
-			pathToMaybeWorkspaceConfigFile := pathToSubFolder + "/" + INFISICAL_WORKSPACE_CONFIG_FILE_NAME
-
-			_, err := os.Stat(pathToMaybeWorkspaceConfigFile)
-			if err != nil {
-				continue // workspace config file doesn't exist
-			}
-
-			workspaceConfig, err := GetWorkspaceConfigByPath(pathToMaybeWorkspaceConfigFile)
-			if err != nil {
-				return nil, fmt.Errorf("GetAllProjectConfigs: Unable to get config file because [%s]", err)
-			}
-
-			listOfWorkSpaceConfigs = append(listOfWorkSpaceConfigs, workspaceConfig)
-		}
-	}
-
-	return listOfWorkSpaceConfigs, nil
-}

cli/packages/util/crypto.go

@@ -3,9 +3,12 @@ package util
 import (
 	"crypto/aes"
 	"crypto/cipher"
+
+	log "github.com/sirupsen/logrus"
 )
 
 func DecryptSymmetric(key []byte, encryptedPrivateKey []byte, tag []byte, IV []byte) ([]byte, error) {
+	log.Debugln("Key:", key, "encryptedPrivateKey", encryptedPrivateKey, "tag", tag, "IV", IV)
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err

cli/packages/util/secrets.go

@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"os"
 	"regexp"
 	"strings"
 
@@ -14,7 +13,19 @@ import (
 	"golang.org/x/crypto/nacl/box"
 )
 
-func getSecretsByWorkspaceIdAndEnvName(httpClient resty.Client, envName string, workspace models.WorkspaceConfigFile, userCreds models.UserCredentials) (listOfSecrets []models.SingleEnvironmentVariable, err error) {
+func GetSecretsFromAPIUsingCurrentLoggedInUser(envName string, userCreds models.UserCredentials) ([]models.SingleEnvironmentVariable, error) {
+	log.Debugln("envName", envName, "userCreds", userCreds)
+	// check if user has configured a workspace
+	workspace, err := GetWorkSpaceFromFile()
+	if err != nil {
+		return nil, fmt.Errorf("Unable to read workspace file:", err)
+	}
+
+	// create http client
+	httpClient := resty.New().
+		SetAuthToken(userCreds.JTWToken).
+		SetHeader("Accept", "application/json")
+
 	var pullSecretsRequestResponse models.PullSecretsResponse
 	response, err := httpClient.
 		R().
@@ -23,11 +34,14 @@ func getSecretsByWorkspaceIdAndEnvName(httpClient resty.Client, envName string,
 		SetResult(&pullSecretsRequestResponse).
 		Get(fmt.Sprintf("%v/v1/secret/%v", INFISICAL_URL, workspace.WorkspaceId)) // need to change workspace id
 
+	log.Debugln("Response from get secrets:", response)
+
 	if err != nil {
 		return nil, err
 	}
 
 	if response.StatusCode() > 299 {
+		log.Debugln(response)
 		return nil, fmt.Errorf(response.Status())
 	}
 
@@ -52,7 +66,7 @@ func getSecretsByWorkspaceIdAndEnvName(httpClient resty.Client, envName string,
 		return nil, err
 	}
 
-	// log.Debugln("workspaceKey", workspaceKey, "nonce", nonce, "senderPublicKey", senderPublicKey, "currentUsersPrivateKey", currentUsersPrivateKey)
+	log.Debugln("workspaceKey", workspaceKey, "nonce", nonce, "senderPublicKey", senderPublicKey, "currentUsersPrivateKey", currentUsersPrivateKey)
 	workspaceKeyInBytes, _ := box.Open(nil, workspaceKey, (*[24]byte)(nonce), (*[32]byte)(senderPublicKey), (*[32]byte)(currentUsersPrivateKey))
 	var listOfEnv []models.SingleEnvironmentVariable
 
@@ -86,32 +100,6 @@ func getSecretsByWorkspaceIdAndEnvName(httpClient resty.Client, envName string,
 	return listOfEnv, nil
 }
 
-func GetSecretsFromAPIUsingCurrentLoggedInUser(envName string, userCreds models.UserCredentials) ([]models.SingleEnvironmentVariable, error) {
-	log.Debugln("GetSecretsFromAPIUsingCurrentLoggedInUser", "envName", envName, "userCreds", userCreds)
-	// check if user has configured a workspace
-	workspaces, err := GetAllWorkSpaceConfigsStartingFromCurrentPath()
-	if err != nil {
-		return nil, fmt.Errorf("Unable to read workspace file(s):", err)
-	}
-
-	// create http client
-	httpClient := resty.New().
-		SetAuthToken(userCreds.JTWToken).
-		SetHeader("Accept", "application/json")
-
-	secrets := []models.SingleEnvironmentVariable{}
-	for _, workspace := range workspaces {
-		secretsFromAPI, err := getSecretsByWorkspaceIdAndEnvName(*httpClient, envName, workspace, userCreds)
-		if err != nil {
-			return nil, fmt.Errorf("GetSecretsFromAPIUsingCurrentLoggedInUser: Unable to get secrets by workspace id and env name")
-		}
-
-		secrets = append(secrets, secretsFromAPI...)
-	}
-
-	return secrets, nil
-}
-
 func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string, projectId string) ([]models.SingleEnvironmentVariable, error) {
 	if infisicalToken == "" || projectId == "" || envName == "" {
 		return nil, errors.New("infisical token, project id and or environment name cannot be empty")
@@ -138,6 +126,7 @@ func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string,
 	}
 
 	if response.StatusCode() > 299 {
+		log.Debugln(response)
 		return nil, fmt.Errorf(response.Status())
 	}
 
@@ -195,60 +184,6 @@ func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string,
 	return listOfEnv, nil
 }
 
-func GetAllEnvironmentVariables(projectId string, envName string) ([]models.SingleEnvironmentVariable, error) {
-	infisicalToken := os.Getenv(INFISICAL_TOKEN_NAME)
-
-	if infisicalToken == "" {
-		hasUserLoggedInbefore, loggedInUserEmail, err := IsUserLoggedIn()
-		if err != nil {
-			log.Info("Unexpected issue occurred while checking login status. To see more details, add flag --debug")
-			log.Debugln(err)
-			return nil, err
-		}
-
-		if !hasUserLoggedInbefore {
-			log.Infoln("No logged in user. To login, please run command [infisical login]")
-			return nil, fmt.Errorf("user not logged in")
-		}
-
-		userCreds, err := GetUserCredsFromKeyRing(loggedInUserEmail)
-		if err != nil {
-			log.Infoln("Unable to get user creds from key ring")
-			log.Debug(err)
-			return nil, err
-		}
-
-		workspaceConfigs, err := GetAllWorkSpaceConfigsStartingFromCurrentPath()
-		if err != nil {
-			return nil, fmt.Errorf("unable to check if you have a %s file in your current directory", INFISICAL_WORKSPACE_CONFIG_FILE_NAME)
-		}
-
-		if len(workspaceConfigs) == 0 {
-			log.Infoln("Your local project is not connected to a Infisical project yet. Run command [infisical init]")
-			return nil, fmt.Errorf("project not initialized")
-		}
-
-		envsFromApi, err := GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
-		if err != nil {
-			log.Errorln("Something went wrong when pulling secrets using your logged in credentials. If the issue persists, double check your project id/try logging in again.")
-			log.Debugln(err)
-			return nil, err
-		}
-
-		return envsFromApi, nil
-
-	} else {
-		envsFromApi, err := GetSecretsFromAPIUsingInfisicalToken(infisicalToken, envName, projectId)
-		if err != nil {
-			log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
-			log.Debugln(err)
-			return nil, err
-		}
-
-		return envsFromApi, nil
-	}
-}
-
 func GetWorkSpacesFromAPI(userCreds models.UserCredentials) (workspaces []models.Workspace, err error) {
 	// create http client
 	httpClient := resty.New().

docker-compose.dev.yml

@@ -23,6 +23,7 @@ services:
     build:
       context: ./backend
       dockerfile: Dockerfile
+    image: infisical/backend
     volumes:
       - ./backend/src:/app/src
       - ./backend/nodemon.json:/app/nodemon.json
@@ -42,6 +43,7 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile.dev
+    image: infisical/frontend
     volumes:
       - ./frontend/pages:/app/pages
       - ./frontend/public:/app/public
@@ -50,8 +52,12 @@ services:
     env_file: .env
     environment:
       - NEXT_PUBLIC_ENV=development
+      - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
+      - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
+      - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
       - NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
       - NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
+      - NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
     networks:
       - infisical-dev
 
@@ -72,8 +78,6 @@ services:
     container_name: infisical-dev-mongo-express
     image: mongo-express
     restart: always
-    depends_on:
-      - mongo
     env_file: .env
     environment:
       - ME_CONFIG_MONGODB_ADMINUSERNAME=${MONGO_USERNAME}
@@ -89,4 +93,4 @@ volumes:
     driver: local
 
 networks:
-  infisical-dev:
+  infisical-dev:

docker-compose.yml

@@ -17,10 +17,14 @@ services:
       - infisical
   
   backend:
+    platform: linux/amd64
     container_name: infisical-backend
     restart: unless-stopped
     depends_on:
       - mongo
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
     image: infisical/backend
     command: npm run start
     env_file: .env
@@ -30,17 +34,24 @@ services:
       - infisical
   
   frontend:
+    platform: linux/amd64
     container_name: infisical-frontend
     restart: unless-stopped
     depends_on:
       - backend
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile.prod
     image: infisical/frontend
     env_file: .env
     environment:
-      # - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
-      - INFISICAL_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
+      - NEXT_PUBLIC_ENV=production
+      - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
+      - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
+      - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
       - NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
       - NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
+      - NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
     networks:
       - infisical
 
@@ -62,4 +73,4 @@ volumes:
     driver: local
 
 networks:
-  infisical:
+  infisical:

docs/cli/commands/export.mdx

@@ -1,33 +0,0 @@
----
-title: "infisical export"
----
-
-```bash
-infisical export [options]
-```
-
-## Description
-
-Export environment variables from the platform into a file format.
-
-## Options
-
-| Option        | Description                                                                                                                                  | Default value |
-| ------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| `--env`       | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod`                                  | `dev`         |
-| `--projectId` | Only required if injecting via the [service token method](../token). If you are not using service token, the project id will be automatically retrieved from the `.infisical.json` located at the root of your local project.  | `None`        |
-| `--expand`    | Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`)                                                                         | `true`        |
-| `--format`    | Format of the output file. Accepted values: `dotenv`, `csv` and `json`                                                                       | `dotenv`      |
-
-## Examples
-
-```bash
-# Export variables to a .env file
-infisical export > .env
-
-# Export variables to a CSV file
-infisical export --format=csv > secrets.csv
-
-# Export variables to a JSON file
-infisical export --format=json > secrets.json
-```

docs/cli/overview.mdx

@@ -1,5 +1,5 @@
 ---
-title: "Install"
+title: "Overview"
 ---
 
 Prerequisite: Set up an account with [Infisical Cloud](https://app.infisical.com) or via a [self-hosted installation](/self-hosting/overview).

docs/getting-started/dashboard/integrations.mdx

@@ -4,11 +4,8 @@ title: "Integrations"
 
 Integrations allow environment variables to be synced across your entire infrastructure from local development to CI/CD and production.
 
-We're still early with integrations, but expect more soon. 
-
-<Card title="View integrations documentation" icon="link" href="/integrations/overview">
-  View all available integrations and their guide
-</Card>
+We're still early with integrations, but expect more soon.
 
 ![integrations](../../images/project-integrations.png)
 
+Check out our [integrations](/integrations/overview).

docs/getting-started/dashboard/token.mdx

@@ -4,16 +4,13 @@ title: "Infisical Token"
 
 An Infisical Token is needed to authenticate the CLI when there isn't an easy way to input your login credentials.
 
-It's useful for your CI/CD environments and integrations such as [Docker](/integrations/platforms/docker) and [Docker Compose](/integrations/platforms/docker-compose).
-
-To generate the the token, head over to your project settings as shown below.
+It's useful for the [Docker](/integrations/platforms/docker) and [Docker Compose](/integrations/platforms/docker-compose) integrations.
 
+It's possible to generate the token in the settings of a project.
 
 ![token add](../../images/project-token-add.png)
 
 <Note>
   The token grants read-only access to a particular environment and project for
-  a specified amount of time. Once the token is expired, the CLI using it will no longer be able to make
-  requests with it.
+  a specified amount of time.
 </Note>
-

docs/integrations/frameworks/django.mdx

@@ -10,18 +10,15 @@ Prerequisites:
 ## Initialize Infisical for your [Django](https://www.djangoproject.com) project
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Django project
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
 infisical run -- python manage.py runserver
 ```

docs/integrations/frameworks/express.mdx

@@ -16,18 +16,30 @@ The steps apply to the following non-exhaustive list of frameworks:
 ## Initialize Infisical for your app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "start": "infisical run -- node index.js"
+    "dev": "infisical run -- nodemon index.js" // if using nodemon for dev
+}
+...
+```
+
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
+npm run start
 
-# Example
-infisical run -- npm run dev
+# or start development server
+
+npm run dev
 ```

docs/integrations/frameworks/fiber.mdx

@@ -7,21 +7,4 @@ Prerequisites:
 - Set up and add envars to [Infisical Cloud](https://app.infisical.com)
 - [Install the CLI](/cli/overview)
 
-## Initialize Infisical for your [Fiber](https://gofiber.io/) app
-
-```bash
-# navigate to the root of your of your project 
-cd /path/to/project
-
-# then initialize Infisical
-infisical init
-```
-
-## Start your application as usual but with Infisical
-
-```bash
-infisical run -- <your application start command>
-
-# Example 
-infisical run -- go run server.go
-```
+Coming soon.

docs/integrations/frameworks/flask.mdx

@@ -10,18 +10,15 @@ Prerequisites:
 ## Initialize Infisical for your [Flask](https://flask.palletsprojects.com/en/2.2.x) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Flask app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example 
 infisical run -- flask run
 ```

docs/integrations/frameworks/gatsby.mdx

@@ -10,20 +10,31 @@ Prerequisites:
 ## Initialize Infisical for your [Gatsby](https://www.gatsbyjs.com) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "develop": "infisical run -- gatsby develop",
+    "start": "infisical run -- gatsby develop",
+    "build": "infisical run -- gatsby build",
+    "serve": "infisical run -- gatsby serve",
+    "clean": "infisical run -- gatsby clean"
+}
+...
+```
+
+## Start your development server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
-infisical run -- npm run develop
+npm run develop
 ```
 
 <Note>

docs/integrations/frameworks/laravel.mdx

@@ -7,21 +7,4 @@ Prerequisites:
 - Set up and add envars to [Infisical Cloud](https://app.infisical.com)
 - [Install the CLI](/cli/overview)
 
-## Initialize Infisical for your [Laravel](https://laravel.com/) app
-
-```bash
-# navigate to the root of your of your project 
-cd /path/to/project
-
-# then initialize Infisical
-infisical init
-```
-
-## Start your application as usual but with Infisical
-
-```bash
-infisical run -- <your application start command>
-
-# Example 
-infisical run -- php artisan serve
-```
+Instructions coming soon.

docs/integrations/frameworks/nestjs.mdx

@@ -10,18 +10,41 @@ Prerequisites:
 ## Initialize Infisical for your [NestJS](https://nestjs.com) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Next.js app
 cd /path/to/project
 
-# then initialize infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "prebuild": "rimraf dist",
+    "build": "nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "infisical run -- nest start",
+    "start:dev": "infisical run -- nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json"
+}
+...
+```
+
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
+npm run start
 
-# Example
-infisical run -- npm run start:dev
+# or start development server
+
+npm run start:dev
 ```

docs/integrations/frameworks/nextjs.mdx

@@ -10,20 +10,33 @@ Prerequisites:
 ## Initialize Infisical for your [Next.js](https://nextjs.org) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Next.js app
 cd /path/to/project
 
-# then initialize infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "dev": "infisical run -- next dev",
+    "build": "infisical run -- next build",
+    "start": "infisical run -- next start"
+}
+...
+```
+
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
+npm run build && npm run start
 
-# Example
-infisical run -- npm run dev
+# or start development server
+
+npm run dev
 ```
 
 <Note>

docs/integrations/frameworks/nuxt.mdx

@@ -10,18 +10,27 @@ Prerequisites:
 ## Initialize Infisical for your [Nuxt](https://nuxtjs.org) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Nuxt app
 cd /path/to/project
 
-# then initialize infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "dev": "infisical run -- nuxt",
+    "build": "infisical run -- nuxt build",
+    "start": "infisical run -- nuxt start"
+}
+...
+```
+
+## Start your development server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
-infisical run -- npm run dev
+npm run dev
 ```

docs/integrations/frameworks/rails.mdx

@@ -10,18 +10,15 @@ Prerequisites:
 ## Initialize Infisical for your [Rails](https://rubyonrails.org) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Rails app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example 
 infisical run -- bin/rails server
 ```

docs/integrations/frameworks/react.mdx

@@ -10,18 +10,28 @@ Prerequisites:
 ## Initialize Infisical for your [Create React App](https://create-react-app.dev)
 
 ```bash
-# navigate to the root of your of your project 
+# move to your React app
 cd /path/to/project
 
-# then initialize infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "start": "infisical run -- react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+}
+...
+```
+
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
-infisical run -- npm run dev
+npm start
 ```

docs/integrations/frameworks/remix.mdx

@@ -10,18 +10,32 @@ Prerequisites:
 ## Initialize Infisical for your [Remix](https://remix.run) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Vue app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    ...
+    "dev": "infisical run -- run-p dev:*",
+    "start": "infisical run -- remix-serve build"
+    ...
+}
+...
+```
+
+## Start your server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
+npm run build && npm run start
 
-# Example
-infisical run -- npm run dev
+# or start development server
+
+npm run dev
 ```

docs/integrations/frameworks/vite.mdx

@@ -10,20 +10,29 @@ Prerequisites:
 ## Initialize Infisical for your [Vite](https://vitejs.dev) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Vite app
 cd /path/to/project
 
-# then initialize Infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "dev": "infisical run -- vite",
+    "build": "infisical run -- vite build",
+    "preview": "infisical run -- vite preview"
+}
+...
+```
+
+## Start your development server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
-infisical run -- npm run dev
+npm run dev
 ```
 
 <Note>

docs/integrations/frameworks/vue.mdx

@@ -10,20 +10,29 @@ Prerequisites:
 ## Initialize Infisical for your [Vue](https://vuejs.org) app
 
 ```bash
-# navigate to the root of your of your project 
+# move to your Vue app
 cd /path/to/project
 
-# then initialize infisical
+# initialize infisical
 infisical init
 ```
 
-## Start your application as usual but with Infisical
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "serve": "infisical run -- vue-cli-service serve",
+    "build": "infisical run -- vue-cli-service build",
+    "lint": "infisical run -- vue-cli-service lint"
+}
+...
+```
+
+## Start your development server with environment variables injected
 
 ```bash
-infisical run -- <your application start command>
-
-# Example
-infisical run -- npm run dev
+npm run serve
 ```
 
 <Note>

docs/integrations/platforms/docker-compose.mdx

@@ -4,14 +4,14 @@ title: "Docker Compose"
 
 The Docker Compose integration enables you to inject environment variables from Infisical into the containers defined in your compose file.
 
-## Add the CLI to your Dockerfile(s) start command
+## Add the CLI to your Dockerfile(s)
 
-Follow the [guide to configure Infisical CLI](./docker) in your your Dockerfile first.
+Follow steps 1 through 3 on our [guide to configure Infisical CLI](../integrations/platforms/docker) in your Dockerfile.
 
 ## Generate Infisical Token
 
 In order for Infisical CLI to authenticate and retrieve your project's secrets without exposing your login credentials, you must generate a Infisical Token.
-To learn how, visit [Infisical Token](../../getting-started/dashboard/token). Once you have generated the token, keep it handy.
+To learn how, visit [Infisical Token](../getting-started/cli/infisical-token). Once you have generated the token, keep it handy.
 
 <Info>
   If you have multiple services and they do not use the same secrets, you will

docs/mint.json

@@ -87,12 +87,12 @@
         "cli/overview",
         "cli/usage",
         {
-          "group": "Commands",
+          "group": "Reference",
           "pages": [
-            "cli/commands/login",
-            "cli/commands/init",
-            "cli/commands/run",
-            "cli/commands/export"
+            "cli/reference/commands",
+            "cli/reference/login",
+            "cli/reference/init",
+            "cli/reference/run"
           ]
         }
       ]
@@ -102,11 +102,8 @@
       "pages": [
         "self-hosting/overview",
         {
-          "group": "Deployments options",
-          "pages": [
-            "self-hosting/deployments/linux",
-            "self-hosting/deployments/kubernetes"
-          ]
+          "group": "Deployments",
+          "pages": ["self-hosting/deployments/linux"]
         },
         {
           "group": "Configuration",

docs/self-hosting/configuration/envars.mdx

@@ -9,24 +9,24 @@ Configuring Infisical requires setting some environment variables. There is a fi
 
 | Variable                     | Description                                                                                                 | Default Value    |
 | ---------------------------- | ----------------------------------------------------------------------------------------------------------- | ---------------- |
-| `PRIVATE_KEY`                | ❗️ NaCl-generated server secret key                                                                         | `None`           |
-| `PUBLIC_KEY`                 | ❗️ NaCl-generated server public key                                                                         | `None`           |
-| `ENCRYPTION_KEY`             | ❗️ Strong hex encryption key                                                                                | `None`           |
-| `JWT_SIGNUP_SECRET`          | ❗️ JWT token secret                                                                                         | `None`           |
-| `JWT_REFRESH_SECRET`         | ❗️ JWT token secret                                                                                         | `None`           |
-| `JWT_AUTH_SECRET`            | ❗️ JWT token secret                                                                                         | `None`           |
+| `PRIVATE_KEY`                | ❗️ NaCl-generated server secret key                                                                        | `None`           |
+| `PUBLIC_KEY`                 | ❗️ NaCl-generated server public key                                                                        | `None`           |
+| `ENCRYPTION_KEY`             | ❗️ Strong hex encryption key                                                                               | `None`           |
+| `JWT_SIGNUP_SECRET`          | ❗️JWT token secret                                                                                         | `None`           |
+| `JWT_REFRESH_SECRET`         | ❗️ JWT token secret                                                                                        | `None`           |
+| `JWT_AUTH_SECRET`            | ❗️ JWT token secret                                                                                        | `None`           |
 | `JWT_SIGNUP_LIFETIME`        | JWT token lifetime expressed in seconds or a string describing a time span (e.g. 60, "2 days", "10h", "7d") | `15m`            |
 | `JWT_REFRESH_LIFETIME`       | JWT token lifetime expressed in seconds or a string describing a time span (e.g. 60, "2 days", "10h", "7d") | `90d`            |
 | `JWT_AUTH_LIFETIME`          | JWT token lifetime expressed in seconds or a string describing a time span (e.g. 60, "2 days", "10h", "7d") | `10d`            |
 | `EMAIL_TOKEN_LIFETIME`       | Email OTP/magic-link lifetime expressed in seconds                                                          | `86400`          |
-| `MONGO_URL`                  | ❗️ MongoDB instance connection string either to container instance or MongoDB Cloud                         | `None`           |
+| `MONGO_URL`                  | ❗️ MongoDB instance connection string either to container instance or MongoDB Cloud                        | `None`           |
 | `MONGO_USERNAME`             | MongoDB username if using container                                                                         | `None`           |
 | `MONGO_PASSWORD`             | MongoDB password if using container                                                                         | `None`           |
-| `SITE_URL`                   | ❗️ Site URL - should be an absolute URL including the protocol (e.g. `https://app.infisical.com`)           | `None`           |
-| `SMTP_HOST`                  | Hostname to connect to for establishing SMTP connections                                                    | `smtp.gmail.com` |
-| `SMTP_NAME`                  | Name label to be used in From field (e.g. `Team`)                                                           | `None`           |
-| `SMTP_USERNAME`              | ❗️ Credential to connect to host (e.g. `team@infisical.com`)                                                | `None`           |
-| `SMTP_PASSWORD`              | ❗️ Credential to connect to host                                                                            | `None`           |
+| `SITE_URL`                   | ❗️ Site URL - should be an absolute URL including the protocol (e.g. `https://app.infisical.com`)          | `None`           |
+| `SMT_HOST`                   | Whether the user joined the community                                                                       | `smtp.gmail.com` |
+| `SMTP_NAME`                  | Hostname to connect to for establishing SMTP connections (e.g. `Team`)                                      | `None`           |
+| `SMTP_USERNAME`              | ❗️ Credential to connect to host (e.g. `team@infisical.com`)                                               | `None`           |
+| `SMTP_PASSWORD`              | ❗️ Credential to connect to host                                                                           | `None`           |
 | `TELEMETRY_ENABLED`          | `true` or `false`. [More](../overview).                                                                     | `true`           |
 | `OAUTH_CLIENT_SECRET_HEROKU` | OAuth client secret for Heroku integration                                                                  | `None`           |
 | `OAUTH_TOKEN_URL_HEROKU`     | OAuth token URL for Heroku integration                                                                      | `None`           |

docs/self-hosting/deployments/kubernetes.mdx

@@ -1,54 +0,0 @@
----
-title: "Kubernetes"
-description: "Deploy with Kubernetes"
----
-
-<Info>
-Self-host vs. Infisical Cloud
-
-Self-hosting Infisical means managing the service yourself, taking care of upgrades, scaling, security, etc.
-
-If you're less technical and looking for a hands-free experience with minimal overhead then we recommend Infisical Cloud.
-
-</Info>
-
-**Prerequisites**
-- You have understanding of [Kubernetes](https://kubernetes.io/)
-- You have understanding of [Helm package manager](https://helm.sh/) 
-- You have [kubectl](https://kubernetes.io/docs/reference/kubectl/kubectl/) installed and connected to your kubernetes cluster
-
-
-#### 1. Fill our environment variables
-
-Before you can deploy the Helm chart, you must fill out the required environment variables. To do so, please either download or copy the
-contents of [this file](https://raw.githubusercontent.com/Infisical/infisical/main/helm-charts/infisical/values.yaml) to a `.yaml` file. 
-_Refer to the available [environment variables](../../self-hosting/configuration/envars)_
-
-Once you have a local copy of the values file, fill our the required environment variables and save the file.
-
-
-#### 2. Install Infisical Helm repository 
-
-```bash
-helm repo add infisical-helm-charts 'https://dl.cloudsmith.io/public/infisical/helm-charts/helm/charts/' 
-  
-helm repo update
-```
-
-#### 3. Install the Helm chart 
-
-By default, the helm chart will be installed on your default namespace. If you wish to install the Chart on a different namespace, you may specify
-that by adding the `--namespace <namespace-to-install-to>` to your `helm install` command.
-
-```bash
-## Installs to default namespace
-helm install infisical-helm-charts/infisical --values <path to the values.yaml you downloaded/created in step 2>
-```
-
-<Note>
-If you have not filled out all of the required environment variables, you will see an error message prompting you to 
-do so. 
-</Note>
-
-4. Your Infisical installation is complete and should be running on the host name you specified in Ingress in `values.yaml`.
-Note: Please allow an additional time (2 minutes) for the frontend pods to be fully ready.

docs/self-hosting/overview.mdx

@@ -9,22 +9,17 @@ Self-hosting Infisical means managing the service yourself, taking care of upgra
 
 If you're less technical and looking for a hands-free experience with minimal overhead then we recommend Infisical Cloud.
 
-Infisical Cloud also comes with some extra features unavailable in the self-hosted edition. You can find more information about Infisical Cloud's offering on the pricing page.
+Infisical Cloud also comes with some extra features unavailabe in the self-hosted edition. You can find more information about Infisical Cloud's offering on the pricing page.
 
 </Info>
 
 ## Deployment options
 
-Infisical can be deployed on a Linux VM with docker-compose and Kubernetes. We're rolling out more specific deployment options for DigitalOcean, AWS, GCP, and Azure soon.
+Infisical can be deployed on a Linux VM with docker-compose. We're rolling out more specific deployment options for DigitalOcean, AWS, GCP, and Azure soon.
 
-<CardGroup cols={2}>
-  <Card title="Any Linux" icon="square-1" color="#ea5a0c" href="/self-hosting/deployments/linux">
-    Deploy to any Linux with Docker
-  </Card>
-  <Card title="Kubernetes" icon="square-2" color="#0285c7" href="/self-hosting/deployments/kubernetes">
-    Deploy to your Kubernetes cluster
-  </Card>
-</CardGroup>
+Options:
+
+- [Linux VM](/self-hosting/deployments/linux)
 
 ## Telemetry
 

frontend/Dockerfile

@@ -1,64 +0,0 @@
-ARG POSTHOG_HOST=https://app.posthog.com
-ARG POSTHOG_API_KEY=posthog-api-key
-
-FROM node:16-alpine AS deps
-# Install dependencies only when needed. Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-# RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Copy over dependency files 
-COPY package.json package-lock.json next.config.js ./
-
-# Install dependencies
-RUN npm ci --only-production
-
-
-# Rebuild the source code only when needed
-FROM node:16-alpine AS builder
-WORKDIR /app
-
-# Copy dependencies
-COPY --from=deps /app/node_modules ./node_modules
-# Copy all files 
-COPY . .
-
-ENV NODE_ENV production
-ENV NEXT_PUBLIC_ENV production
-ARG POSTHOG_HOST
-ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST
-ARG POSTHOG_API_KEY
-ENV NEXT_PUBLIC_POSTHOG_API_KEY $POSTHOG_API_KEY
-
-# Build
-RUN npm run build
-
-
-# Production image
-FROM node:16-alpine AS runner
-WORKDIR /app
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-RUN mkdir -p /app/.next/cache/images && chown nextjs:nodejs /app/.next/cache/images
-VOLUME /app/.next/cache/images
-
-ARG POSTHOG_API_KEY
-ENV NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY \
-    BAKED_NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY
-
-COPY --chown=nextjs:nodejs --chmod=555 scripts ./scripts
-COPY --from=builder /app/public ./public
-RUN chown nextjs:nodejs ./public/data
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-
-EXPOSE 3000
-
-ENV PORT 3000
-ENV NEXT_TELEMETRY_DISABLED 1
-
-
-CMD ["/app/scripts/start.sh"]

frontend/components/analytics/posthog.js

@@ -4,11 +4,12 @@ import {
   ENV,
   POSTHOG_API_KEY,
   POSTHOG_HOST,
+  TELEMETRY_ENABLED,
 } from "../utilities/config";
 
 export const initPostHog = () => {
   if (typeof window !== "undefined") {
-    if (ENV == "production" && TELEMETRY_CAPTURING_ENABLED) { // eslint-disable-line
+    if (ENV == "production" && TELEMETRY_ENABLED) {
       posthog.init(POSTHOG_API_KEY, {
         api_host: POSTHOG_HOST,
       });

frontend/components/basic/InputField.js

@@ -1,27 +1,19 @@
-import React, { useState } from "react";
+import React from "react";
+import { useState } from "react";
 import { useRouter } from "next/router";
-import { faCircle, faEye, faEyeSlash } from "@fortawesome/free-solid-svg-icons";
+import {
+  faCircle,
+  faCircleExclamation,
+  faE,
+  faEye,
+  faEyeSlash,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import guidGenerator from "../utilities/randomId";
+import Error from "./Error";
 
-interface InputFieldProps {
-  static?: boolean;
-  label: string;
-  type: string;
-  value: string;
-  placeholder?: string;
-  isRequired: boolean;
-  disabled?: boolean;
-  error?: boolean;
-  text?: string;
-  name?: string;
-  blurred?: boolean;
-  errorText?: string;
-  onChangeHandler: (value: string) => void;
-}
-
-const InputField = (props: InputFieldProps) => {
+const InputField = (props) => {
   const [passwordVisible, setPasswordVisible] = useState(false);
   const router = useRouter();
 
@@ -75,7 +67,7 @@ const InputField = (props: InputFieldProps) => {
         >
           <input
             onChange={(e) => props.onChangeHandler(e.target.value)}
-            type={passwordVisible === false ? props.type : "text"}
+            type={passwordVisible == false ? props.type : "text"}
             placeholder={props.placeholder}
             value={props.value}
             required={props.isRequired}

frontend/components/basic/Layout.tsx

@@ -1,430 +0,0 @@
-/* eslint-disable no-unexpected-multiline */
-/* eslint-disable react-hooks/exhaustive-deps */
-import { useEffect, useState } from "react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import {
-  faBookOpen,
-  faGear,
-  faKey,
-  faMobile,
-  faPlug,
-  faUser,
-} from "@fortawesome/free-solid-svg-icons";
-import { faPlus } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-import getOrganizations from "~/pages/api/organization/getOrgs";
-import getOrganizationUserProjects from "~/pages/api/organization/GetOrgUserProjects";
-import getOrganizationUsers from "~/pages/api/organization/GetOrgUsers";
-import addUserToWorkspace from "~/pages/api/workspace/addUserToWorkspace";
-import createWorkspace from "~/pages/api/workspace/createWorkspace";
-import getWorkspaces from "~/pages/api/workspace/getWorkspaces";
-import uploadKeys from "~/pages/api/workspace/uploadKeys";
-import checkUserAction from "~/pages/api/userActions/checkUserAction";
-
-import NavBarDashboard from "../navigation/NavBarDashboard";
-import { tempLocalStorage } from "../utilities/checks/tempLocalStorage";
-import {
-  decryptAssymmetric,
-  encryptAssymmetric,
-} from "../utilities/cryptography/crypto";
-import Button from "./buttons/Button";
-import AddWorkspaceDialog from "./dialog/AddWorkspaceDialog";
-import Listbox from "./Listbox";
-
-interface LayoutProps {
-  children: React.ReactNode;
-}
-
-export default function Layout({ children }: LayoutProps) {
-  const router = useRouter();
-  const [workspaceList, setWorkspaceList] = useState([]);
-  const [workspaceMapping, setWorkspaceMapping] = useState([{ 1: 2 }]);
-  const [workspaceSelected, setWorkspaceSelected] = useState("∞");
-  const [newWorkspaceName, setNewWorkspaceName] = useState("");
-  const [isOpen, setIsOpen] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(false);
-  const [hasUserClickedSlack, setHasUserClickedSlack] = useState(false);
-  const [hasUserClickedIntro, setHasUserClickedIntro] = useState(false);
-  const [hasUserStarred, setHasUserStarred] = useState(false);
-  const [usersInOrg, setUsersInOrg] = useState(false);
-  const [totalOnboardingActionsDone, setTotalOnboardingActionsDone] = useState(0);
-
-  function closeModal() {
-    setIsOpen(false);
-  }
-
-  function openModal() {
-    setIsOpen(true);
-  }
-
-  // TODO: what to do about the fact that 2ids can have the same name
-
-  /**
-   * When a user creates a new workspace, redirect them to the page of the new workspace.
-   * @param {*} workspaceName
-   */
-  async function submitModal(workspaceName: string, addAllUsers: boolean) {
-    setLoading(true);
-    // timeout code.
-    setTimeout(() => setLoading(false), 1500);
-
-    try {
-      const workspaces = await getWorkspaces();
-      const currentWorkspaces = workspaces.map((workspace) => workspace.name);
-      if (!currentWorkspaces.includes(workspaceName)) {
-        const newWorkspace = await createWorkspace({
-          workspaceName,
-          organizationId: tempLocalStorage("orgData.id"),
-        });
-        const newWorkspaceId = newWorkspace._id;
-
-        if (addAllUsers) {
-          const orgUsers = await getOrganizationUsers({
-            orgId: tempLocalStorage("orgData.id"),
-          });
-          orgUsers.map(async (user: any) => {
-            if (user.status == "accepted") {
-              const result = await addUserToWorkspace(
-                user.user.email,
-                newWorkspaceId
-              );
-              if (result?.invitee && result?.latestKey) {
-                const PRIVATE_KEY = tempLocalStorage("PRIVATE_KEY");
-
-                // assymmetrically decrypt symmetric key with local private key
-                const key = decryptAssymmetric({
-                  ciphertext: result.latestKey.encryptedKey,
-                  nonce: result.latestKey.nonce,
-                  publicKey: result.latestKey.sender.publicKey,
-                  privateKey: PRIVATE_KEY,
-                });
-
-                const { ciphertext, nonce } = encryptAssymmetric({
-                  plaintext: key,
-                  publicKey: result.invitee.publicKey,
-                  privateKey: PRIVATE_KEY,
-                }) as { ciphertext: string; nonce: string };
-
-                uploadKeys(
-                  newWorkspaceId,
-                  result.invitee._id,
-                  ciphertext,
-                  nonce
-                );
-              }
-            }
-          });
-        }
-        router.push("/dashboard/" + newWorkspaceId + "?Development");
-        setIsOpen(false);
-        setNewWorkspaceName("");
-      } else {
-        console.error("A project with this name already exists.");
-        setError(true);
-        setLoading(false);
-      }
-    } catch (err) {
-      console.error(err);
-      setError(true);
-      setLoading(false);
-    }
-  }
-
-  const menuItems = [
-    {
-      href:
-        "/dashboard/" +
-        workspaceMapping[workspaceSelected as any] +
-        "?Development",
-      title: "Secrets",
-      emoji: <FontAwesomeIcon icon={faKey} />,
-    },
-    {
-      href: "/users/" + workspaceMapping[workspaceSelected as any],
-      title: "Members",
-      emoji: <FontAwesomeIcon icon={faUser} />,
-    },
-    {
-      href: "/integrations/" + workspaceMapping[workspaceSelected as any],
-      title: "Integrations",
-      emoji: <FontAwesomeIcon icon={faPlug} />,
-    },
-    {
-      href: "/settings/project/" + workspaceMapping[workspaceSelected as any],
-      title: "Project Settings",
-      emoji: <FontAwesomeIcon icon={faGear} />,
-    },
-  ];
-
-  useEffect(() => {
-    // Put a user in a workspace if they're not in one yet
-    const putUserInWorkSpace = async () => {
-      if (tempLocalStorage("orgData.id") === "") {
-        const userOrgs = await getOrganizations();
-        localStorage.setItem("orgData.id", userOrgs[0]._id);
-      }
-
-      const orgUserProjects = await getOrganizationUserProjects({
-        orgId: tempLocalStorage("orgData.id"),
-      });
-      const userWorkspaces = orgUserProjects;
-      if (
-        userWorkspaces.length == 0 &&
-        router.asPath != "/noprojects" &&
-        !router.asPath.includes("settings")
-      ) {
-        router.push("/noprojects");
-      } else if (router.asPath != "/noprojects") {
-        const intendedWorkspaceId = router.asPath
-          .split("/")
-          [router.asPath.split("/").length - 1].split("?")[0];
-        // If a user is not a member of a workspace they are trying to access, just push them to one of theirs
-        if (
-          intendedWorkspaceId != "heroku" &&
-          !userWorkspaces
-            .map((workspace: { _id: string }) => workspace._id)
-            .includes(intendedWorkspaceId)
-        ) {
-          router.push("/dashboard/" + userWorkspaces[0]._id + "?Development");
-        } else {
-          setWorkspaceList(
-            userWorkspaces.map((workspace: any) => workspace.name)
-          );
-          setWorkspaceMapping(
-            Object.fromEntries(
-              userWorkspaces.map((workspace: any) => [
-                workspace.name,
-                workspace._id,
-              ])
-            ) as any
-          );
-          setWorkspaceSelected(
-            Object.fromEntries(
-              userWorkspaces.map((workspace: any) => [
-                workspace._id,
-                workspace.name,
-              ])
-            )[
-              router.asPath
-                .split("/")
-                [router.asPath.split("/").length - 1].split("?")[0]
-            ]
-          );
-        }
-      }
-    };
-    putUserInWorkSpace();
-
-    const checkUserActionsFunction = async () => {
-      let countActions = 0;
-      const userActionSlack = await checkUserAction({
-        action: "slack_cta_clicked",
-      });
-      setHasUserClickedSlack(userActionSlack ? true : false);
-      if (userActionSlack) {
-        countActions = countActions + 1;
-      }
-
-      const userActionIntro = await checkUserAction({
-        action: "intro_cta_clicked",
-      });
-      setHasUserClickedIntro(userActionIntro ? true : false);
-      if (userActionIntro) {
-        countActions = countActions + 1;
-      }
-
-      const userActionStar = await checkUserAction({
-        action: "star_cta_clicked",
-      });
-      setHasUserStarred(userActionStar ? true : false);
-      if (userActionStar) {
-        countActions = countActions + 1;
-      }
-
-      const orgId = localStorage.getItem("orgData.id");
-      const orgUsers = await getOrganizationUsers({
-        orgId: orgId ? orgId : "",
-      });
-      setUsersInOrg(orgUsers.length > 1)
-      if (orgUsers.length > 1) {
-        countActions = countActions + 1;
-      }
-      console.log(123, countActions)
-      setTotalOnboardingActionsDone(countActions);
-    };
-    console.log(`images/progress-${totalOnboardingActionsDone == 0 ? "0" : ""}${totalOnboardingActionsDone == 1 ? "14" : ""}${totalOnboardingActionsDone == 1 ? "28" : ""}${totalOnboardingActionsDone == 3 ? "43" : ""}${totalOnboardingActionsDone == 4 ? "57" : ""}.svg`)
-    checkUserActionsFunction();
-  }, []);
-
-  useEffect(() => {
-    try {
-      if (
-        workspaceMapping[Number(workspaceSelected)] &&
-        `${workspaceMapping[Number(workspaceSelected)]}` !==
-          router.asPath
-            .split("/")
-            [router.asPath.split("/").length - 1].split("?")[0]
-      ) {
-        router.push(
-          "/dashboard/" +
-            workspaceMapping[Number(workspaceSelected)] +
-            "?Development"
-        );
-        localStorage.setItem(
-          "projectData.id",
-          `${workspaceMapping[Number(workspaceSelected)]}`
-        );
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  }, [workspaceSelected]);
-
-  return (
-    <>
-      <div className="fixed w-full hidden md:block flex flex-col h-screen">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/alpinejs/3.2.2/cdn.js" defer></script>
-        <NavBarDashboard />
-        <div className="flex flex-col md:flex-row flex-1">
-          <aside className="bg-bunker-600 border-r border-mineshaft-500 w-full md:w-60 h-screen">
-            <nav className="flex flex-col justify-between items-between h-full">
-              {/* <div className="py-6"></div> */}
-              <div>
-                <div className="flex justify-center w-full mt-[4.5rem] mb-6 bg-bunker-600 h-20 flex-col items-center px-4">
-                  <div className="text-gray-400 self-start ml-1 mb-1 text-xs font-semibold tracking-wide">
-                    PROJECT
-                  </div>
-                  {workspaceList.length > 0 ? (
-                    <Listbox
-                      selected={workspaceSelected}
-                      onChange={setWorkspaceSelected as any}
-                      data={workspaceList}
-                      buttonAction={openModal}
-                      text=""
-                      // workspaceMapping={workspaceMapping as any}
-                    />
-                  ) : (
-                    <Button
-                      text="Add Project"
-                      onButtonPressed={openModal}
-                      color="mineshaft"
-                      size="md"
-                      icon={faPlus}
-                    />
-                  )}
-                </div>
-                <ul>
-                  {workspaceList.length > 0 &&
-                    menuItems.map(({ href, title, emoji }) => (
-                      <li className="mt-0.5 mx-2" key={title}>
-                        {router.asPath.split("/")[1] === href.split("/")[1] &&
-                        (["project", "billing", "org", "personal"].includes(
-                          router.asPath.split("/")[2]
-                        )
-                          ? router.asPath.split("/")[2] === href.split("/")[2]
-                          : true) ? (
-                          <div
-                            className={`flex relative px-0.5 py-2.5 text-white text-sm rounded cursor-pointer bg-primary-50/10`}
-                          >
-                            <div className="absolute top-0 my-1 ml-1 inset-0 bg-primary w-1 rounded-xl mr-1"></div>
-                            <p className="w-6 ml-4 mr-2 flex items-center justify-center text-lg">
-                              {emoji}
-                            </p>
-                            {title}
-                          </div>
-                        ) : router.asPath == "/noprojects" ? (
-                          <div
-                            className={`flex p-2.5 text-white text-sm rounded`}
-                          >
-                            <p className="w-10 flex items-center justify-center text-lg">
-                              {emoji}
-                            </p>
-                            {title}
-                          </div>
-                        ) : (
-                          <Link href={href}>
-                            <div
-                              className={`flex p-2.5 text-white text-sm rounded cursor-pointer hover:bg-primary-50/5`}
-                            >
-                              <p className="w-10 flex items-center justify-center text-lg">
-                                {emoji}
-                              </p>
-                              {title}
-                            </div>
-                          </Link>
-                        )}
-                      </li>
-                    ))}
-                </ul>
-              </div>
-              <div className="w-full mt-40 mb-4 px-2">
-                {router.asPath.split("/")[1] === "home" ? (
-                  <div
-                    className={`flex relative px-0.5 py-2.5 text-white text-sm rounded cursor-pointer bg-primary-50/10`}
-                  >
-                    <div className="absolute top-0 my-1 ml-1 inset-0 bg-primary w-1 rounded-xl mr-1"></div>
-                    <p className="w-6 ml-4 mr-2 flex items-center justify-center text-lg">
-                      <FontAwesomeIcon icon={faBookOpen} />
-                    </p>
-                    Infisical Guide
-                    <img
-                      src={`/images/progress-${totalOnboardingActionsDone == 0 ? "0" : ""}${totalOnboardingActionsDone == 1 ? "14" : ""}${totalOnboardingActionsDone == 1 ? "28" : ""}${totalOnboardingActionsDone == 3 ? "43" : ""}${totalOnboardingActionsDone == 4 ? "57" : ""}.svg`}
-                      height={58}
-                      width={58}
-                      alt="progress bar"
-                      className="absolute right-2 -top-2"
-                    ></img>
-                  </div>
-                ) : (
-                  <Link
-                    href={`/home/` + workspaceMapping[workspaceSelected as any]}
-                  >
-                    <div
-                      className={`relative flex p-2.5 overflow-visible text-white h-10 text-sm rounded cursor-pointer bg-white/10 hover:bg-primary-50/[0.15] mt-max`}
-                    >
-                      <p className="w-10 flex items-center justify-center text-lg">
-                        <FontAwesomeIcon icon={faBookOpen} />
-                      </p>
-                      Infisical Guide
-                      <img
-                        src="/images/progress-75.svg"
-                        height={58}
-                        width={58}
-                        alt="progress bar"
-                        className="absolute right-2 -top-2"
-                      ></img>
-                    </div>
-                  </Link>
-                )}
-              </div>
-            </nav>
-          </aside>
-          <AddWorkspaceDialog
-            isOpen={isOpen}
-            closeModal={closeModal}
-            submitModal={submitModal}
-            workspaceName={newWorkspaceName}
-            setWorkspaceName={setNewWorkspaceName}
-            error={error}
-            loading={loading}
-          />
-          <main className="flex-1 bg-bunker-800">{children}</main>
-        </div>
-      </div>
-      <div className="md:hidden bg-bunker-800 w-screen h-screen flex flex-col justify-center items-center">
-        <FontAwesomeIcon
-          icon={faMobile}
-          className="text-gray-300 text-7xl mb-8"
-        />
-        <p className="text-gray-200 px-6 text-center text-lg max-w-sm">
-          {" "}
-          To use Infisical, please log in through a device with larger
-          dimensions.{" "}
-        </p>
-      </div>
-    </>
-  );
-}

frontend/components/basic/Listbox.tsx

@@ -8,13 +8,14 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Listbox, Transition } from "@headlessui/react";
 
-interface ListBoxProps {
-  selected: string;
-  onChange: () => void;
-  data: string[];
-  text: string;
-  buttonAction: () => void;
-  isFull?: boolean;
+
+type ListBoxProps = {
+  selected: string,
+  onChange: () => void,
+  data: string[],
+  text: string,
+  buttonAction: () => void,
+  width: string,
 }
 
 /**
@@ -34,14 +35,14 @@ export default function ListBox({
   data,
   text,
   buttonAction,
-  isFull,
-}: ListBoxProps): JSX.Element {
+  width,
+} : ListBoxProps): JSX.Element {
   return (
     <Listbox value={selected} onChange={onChange}>
       <div className="relative">
         <Listbox.Button
           className={`text-gray-400 relative ${
-            isFull ? "w-full" : "w-52"
+            width == "full" ? "w-full" : "w-52"
           } cursor-default rounded-md bg-white/[0.07] hover:bg-white/[0.11] duration-200 py-2.5 pl-3 pr-10 text-left shadow-md focus:outline-none focus-visible:border-indigo-500 focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75 focus-visible:ring-offset-2 focus-visible:ring-offset-orange-300 sm:text-sm`}
         >
           <div className="flex flex-row">

frontend/components/basic/buttons/Button.tsx

@@ -12,7 +12,7 @@ type ButtonProps = {
   text: string;
   onButtonPressed: () => void;
   loading?: boolean;
-  color?: string;
+  color: string;
   size: string;
   icon?: IconProp;
   active?: boolean;

frontend/components/basic/layout.js

@@ -0,0 +1,321 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { useEffect, useState } from "react";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import {
+  faBookOpen,
+  faGear,
+  faKey,
+  faMobile,
+  faPlug,
+  faUser,
+} from "@fortawesome/free-solid-svg-icons";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import getOrganizations from "~/pages/api/organization/getOrgs";
+import getOrganizationUserProjects from "~/pages/api/organization/GetOrgUserProjects";
+import getOrganizationUsers from "~/pages/api/organization/GetOrgUsers";
+import addUserToWorkspace from "~/pages/api/workspace/addUserToWorkspace";
+import createWorkspace from "~/pages/api/workspace/createWorkspace";
+import getWorkspaces from "~/pages/api/workspace/getWorkspaces";
+import uploadKeys from "~/pages/api/workspace/uploadKeys";
+
+import NavBarDashboard from "../navigation/NavBarDashboard";
+import {
+  decryptAssymmetric,
+  encryptAssymmetric,
+} from "../utilities/cryptography/crypto";
+import Button from "./buttons/Button";
+import AddWorkspaceDialog from "./dialog/AddWorkspaceDialog";
+import Listbox from "./Listbox";
+
+export default function Layout({ children }) {
+  const router = useRouter();
+  const [workspaceList, setWorkspaceList] = useState([]);
+  const [workspaceMapping, setWorkspaceMapping] = useState([{ 1: 2 }]);
+  const [workspaceSelected, setWorkspaceSelected] = useState("∞");
+  let [newWorkspaceName, setNewWorkspaceName] = useState("");
+  let [isOpen, setIsOpen] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(false);
+
+  function closeModal() {
+    setIsOpen(false);
+  }
+
+  // TODO: what to do about the fact that 2ids can have the same name
+
+  /**
+   * When a user creates a new workspace, redirect them to the page of the new workspace.
+   * @param {*} workspaceName
+   */
+  async function submitModal(workspaceName, addAllUsers) {
+    setLoading(true);
+    setTimeout(() => setLoading(false), 1500);
+    const workspaces = await getWorkspaces();
+    const currentWorkspaces = workspaces.map((workspace) => workspace.name);
+    if (!currentWorkspaces.includes(workspaceName)) {
+      const newWorkspace = await createWorkspace({
+        workspaceName,
+        organizationId: localStorage.getItem("orgData.id")
+    });
+      let newWorkspaceId;
+      try {
+        newWorkspaceId = newWorkspace._id;
+      } catch (error) {
+        console.log(error);
+      }
+      if (addAllUsers) {
+        let orgUsers = await getOrganizationUsers({
+          orgId: localStorage.getItem("orgData.id"),
+        });
+        orgUsers.map(async (user) => {
+          if (user.status == "accepted") {
+            let result = await addUserToWorkspace(
+              user.user.email,
+              newWorkspaceId
+            );
+            if (result?.invitee && result?.latestKey) {
+              const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY");
+
+              // assymmetrically decrypt symmetric key with local private key
+              const key = decryptAssymmetric({
+                ciphertext: result.latestKey.encryptedKey,
+                nonce: result.latestKey.nonce,
+                publicKey: result.latestKey.sender.publicKey,
+                privateKey: PRIVATE_KEY,
+              });
+
+              const { ciphertext, nonce } = encryptAssymmetric({
+                plaintext: key,
+                publicKey: result.invitee.publicKey,
+                privateKey: PRIVATE_KEY,
+              });
+
+              uploadKeys(newWorkspaceId, result.invitee._id, ciphertext, nonce);
+            }
+          }
+        });
+      }
+      router.push("/dashboard/" + newWorkspaceId + "?Development");
+      setIsOpen(false);
+      setNewWorkspaceName("");
+    } else {
+      setError("A project with this name already exists.");
+      setLoading(false);
+    }
+  }
+
+  function openModal() {
+    setIsOpen(true);
+  }
+
+  const menuItems = [
+    {
+      href:
+        "/dashboard/" + workspaceMapping[workspaceSelected] + "?Development",
+      title: "Secrets",
+      emoji: <FontAwesomeIcon icon={faKey} />,
+    },
+    {
+      href: "/users/" + workspaceMapping[workspaceSelected],
+      title: "Members",
+      emoji: <FontAwesomeIcon icon={faUser} />,
+    },
+    {
+      href: "/integrations/" + workspaceMapping[workspaceSelected],
+      title: "Integrations",
+      emoji: <FontAwesomeIcon icon={faPlug} />,
+    },
+    {
+      href: "/settings/project/" + workspaceMapping[workspaceSelected],
+      title: "Project Settings",
+      emoji: <FontAwesomeIcon icon={faGear} />,
+    },
+  ];
+
+  useEffect(async () => {
+    // Put a user in a workspace if they're not in one yet
+    if (
+      localStorage.getItem("orgData.id") == null ||
+      localStorage.getItem("orgData.id") == ""
+    ) {
+      const userOrgs = await getOrganizations();
+      localStorage.setItem("orgData.id", userOrgs[0]._id);
+    }
+
+    let orgUserProjects = await getOrganizationUserProjects({
+      orgId: localStorage.getItem("orgData.id"),
+    });
+    let userWorkspaces = orgUserProjects;
+    if (
+      userWorkspaces.length == 0 &&
+      router.asPath != "/noprojects" &&
+      !router.asPath.includes("settings")
+    ) {
+      router.push("/noprojects");
+    } else if (router.asPath != "/noprojects") {
+      const intendedWorkspaceId = router.asPath
+        .split("/")[router.asPath.split("/").length - 1].split("?")[0];
+      // If a user is not a member of a workspace they are trying to access, just push them to one of theirs
+      if (
+        intendedWorkspaceId != "heroku" &&
+        !userWorkspaces
+          .map((workspace) => workspace._id)
+          .includes(intendedWorkspaceId)
+      ) {
+        router.push("/dashboard/" + userWorkspaces[0]._id + "?Development");
+      } else {
+        setWorkspaceList(userWorkspaces.map((workspace) => workspace.name));
+        setWorkspaceMapping(
+          Object.fromEntries(
+            userWorkspaces.map((workspace) => [workspace.name, workspace._id])
+          )
+        );
+        setWorkspaceSelected(
+          Object.fromEntries(
+            userWorkspaces.map((workspace) => [workspace._id, workspace.name])
+          )[
+            router.asPath
+              .split("/")[router.asPath.split("/").length - 1].split("?")[0]]
+        );
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    try {
+      if (
+        workspaceMapping[workspaceSelected] &&
+        workspaceMapping[workspaceSelected] !==
+          router.asPath
+            .split("/")[router.asPath.split("/").length - 1].split("?")[0]
+      ) {
+        router.push("/dashboard/" + workspaceMapping[workspaceSelected] + "?Development");
+        localStorage.setItem(
+          "projectData.id",
+          workspaceMapping[workspaceSelected]
+        );
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  }, [workspaceSelected]);
+
+  return (
+    <>
+      <div className="fixed w-full hidden md:block flex flex-col h-screen">
+        <NavBarDashboard />
+        <div className="flex flex-col md:flex-row flex-1">
+          <aside className="bg-bunker-600 border-r border-mineshaft-500 w-full md:w-60 h-screen">
+            <nav className="flex flex-col justify-between items-between h-full">
+              {/* <div className="py-6"></div> */}
+              <div>
+                <div className="flex justify-center w-full mt-[4.5rem] mb-6 bg-bunker-600 w-full h-20 flex flex-col items-center px-4">
+                  <div className="text-gray-400 self-start ml-1 mb-1 text-xs font-semibold tracking-wide">
+                    PROJECT
+                  </div>
+                  {workspaceList.length > 0 ? (
+                    <Listbox
+                      selected={workspaceSelected}
+                      onChange={setWorkspaceSelected}
+                      data={workspaceList}
+                      buttonAction={openModal}
+                      text=""
+                      workspaceMapping={workspaceMapping}
+                    />
+                  ) : (
+                    <Button
+                      text="Add Project"
+                      onButtonPressed={openModal}
+                      color="mineshaft"
+                      size="md"
+                      icon={faPlus}
+                    />
+                  )}
+                </div>
+                <ul>
+                  {workspaceList.length > 0 &&
+                    menuItems.map(({ href, title, emoji }) => (
+                      <li className="mt-0.5 mx-2" key={title}>
+                        {router.asPath.split("/")[1] === href.split("/")[1] &&
+                        (["project", "billing", "org", "personal"].includes(
+                          router.asPath.split("/")[2]
+                        )
+                          ? router.asPath.split("/")[2] === href.split("/")[2]
+                          : true) ? (
+                          <div
+                            className={`flex relative px-0.5 py-2.5 text-white text-sm rounded cursor-pointer bg-primary-50/10`}
+                          >
+                            <div className="absolute top-0 my-1 ml-1 inset-0 bg-primary w-1 rounded-xl mr-1"></div>
+                            <p className="w-6 ml-4 mr-2 flex items-center justify-center text-lg">{emoji}</p>
+                            {title}
+                          </div>
+                        ) : router.asPath == "/noprojects" ? (
+                          <div className={`flex p-2.5 text-white text-sm rounded`}>
+                            <p className="w-10 flex items-center justify-center text-lg">{emoji}</p>
+                            {title}
+                          </div>
+                        ) : (
+                          <Link href={href}>
+                            <div
+                              className={`flex p-2.5 text-white text-sm rounded cursor-pointer hover:bg-primary-50/5`}
+                            >
+                              <p className="w-10 flex items-center justify-center text-lg">{emoji}</p>
+                              {title}
+                            </div>
+                          </Link>
+                        )}
+                      </li>
+                    ))}
+                </ul>
+              </div>
+              <div className="w-full mt-40 mb-4 px-2">
+                {router.asPath.split("/")[1] === "home" ? (
+                  <div
+                    className={`flex relative px-0.5 py-2.5 text-white text-sm rounded cursor-pointer bg-primary-50/10`}
+                  >
+                    <div className="absolute top-0 my-1 ml-1 inset-0 bg-primary w-1 rounded-xl mr-1"></div>
+                    <p className="w-6 ml-4 mr-2 flex items-center justify-center text-lg"><FontAwesomeIcon icon={faBookOpen}/></p>
+                    Infisical Guide
+                  </div>
+                ) : (
+                  <Link href={`/home/` + workspaceMapping[workspaceSelected]}>
+                    <div
+                      className={`flex p-2.5 text-white text-sm rounded cursor-pointer hover:bg-primary-50/5 mt-max border border-dashed border-bunker-400`}
+                    >
+                      <p className="w-10 flex items-center justify-center text-lg"><FontAwesomeIcon icon={faBookOpen}/></p>
+                      Infisical Guide
+                    </div>
+                  </Link>
+                )}
+              </div>
+            </nav>
+          </aside>
+          <AddWorkspaceDialog
+            isOpen={isOpen}
+            closeModal={closeModal}
+            submitModal={submitModal}
+            workspaceName={newWorkspaceName}
+            setWorkspaceName={setNewWorkspaceName}
+            error={error}
+            loading={loading}
+          />
+          <main className="flex-1 bg-bunker-800">{children}</main>
+        </div>
+      </div>
+      <div className="block md:hidden bg-bunker-800 w-screen h-screen flex flex-col justify-center items-center">
+        <FontAwesomeIcon
+          icon={faMobile}
+          className="text-gray-300 text-7xl mb-8"
+        />
+        <p className="text-gray-200 px-6 text-center text-lg max-w-sm">
+          {" "}
+          To use Infisical, please log in through a device with larger
+          dimensions.{" "}
+        </p>
+      </div>
+    </>
+  );
+}

frontend/components/context/Notifications/Notification.tsx

@@ -1,61 +0,0 @@
-import { useEffect, useRef } from "react";
-import { faXmarkCircle } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import classnames from "classnames";
-
-import { Notification as NotificationType } from "./NotificationProvider";
-
-interface NotificationProps {
-  notification: Required<NotificationType>;
-  clearNotification: (text: string) => void;
-}
-
-const Notification = ({
-  notification,
-  clearNotification,
-}: NotificationProps) => {
-  const timeout = useRef<number>();
-
-  const handleClearNotification = () => clearNotification(notification.text);
-
-  const setNotifTimeout = () => {
-    timeout.current = window.setTimeout(
-      handleClearNotification,
-      notification.timeoutMs
-    );
-  };
-
-  const cancelNotifTimeout = () => {
-    clearTimeout(timeout.current);
-  };
-
-  useEffect(() => {
-    setNotifTimeout();
-
-    return cancelNotifTimeout;
-  }, []);
-
-  return (
-    <div
-      className={classnames(
-        "w-full flex items-center justify-between px-4 py-3 rounded pointer-events-auto",
-        {
-          "bg-green-600": notification.type === "success",
-          "bg-red-500": notification.type === "error",
-          "bg-blue-500": notification.type === "info",
-        }
-      )}
-      role="alert"
-    >
-      <p className="text-white text-sm font-bold">{notification.text}</p>
-      <button
-        className="bg-white/5 rounded-lg p-3"
-        onClick={() => clearNotification(notification.text)}
-      >
-        <FontAwesomeIcon className="text-white" icon={faXmarkCircle} />
-      </button>
-    </div>
-  );
-};
-
-export default Notification;

frontend/components/context/Notifications/NotificationProvider.tsx

@@ -1,69 +0,0 @@
-import { createContext, ReactNode, useContext, useState } from "react";
-
-import Notifications from "./Notifications";
-
-type NotificationType = "success" | "error" | "info";
-
-export type Notification = {
-  text: string;
-  type?: NotificationType;
-  timeoutMs?: number;
-};
-
-type NotificationContextState = {
-  createNotification: (newNotification: Notification) => void;
-};
-
-const NotificationContext = createContext<NotificationContextState>({
-  createNotification: () => console.log("createNotification not set!"),
-});
-
-export const useNotificationContext = () => useContext(NotificationContext);
-
-interface NotificationProviderProps {
-  children: ReactNode;
-}
-
-const NotificationProvider = ({ children }: NotificationProviderProps) => {
-  const [notifications, setNotifications] = useState<Required<Notification>[]>(
-    []
-  );
-
-  const clearNotification = (text: string) => {
-    return setNotifications((state) =>
-      state.filter((notif) => notif.text !== text)
-    );
-  };
-
-  const createNotification = ({
-    text,
-    type = "success",
-    timeoutMs = 2000,
-  }: Notification) => {
-    const doesNotifExist = notifications.some((notif) => notif.text === text);
-
-    if (doesNotifExist) {
-      return;
-    }
-
-    const newNotification: Required<Notification> = { text, type, timeoutMs };
-
-    return setNotifications((state) => [...state, newNotification]);
-  };
-
-  return (
-    <NotificationContext.Provider
-      value={{
-        createNotification,
-      }}
-    >
-      <Notifications
-        notifications={notifications}
-        clearNotification={clearNotification}
-      />
-      {children}
-    </NotificationContext.Provider>
-  );
-};
-
-export default NotificationProvider;

frontend/components/context/Notifications/Notifications.tsx

@@ -1,30 +0,0 @@
-import Notification from "./Notification";
-import { Notification as NotificationType } from "./NotificationProvider";
-
-interface NoticationsProps {
-  notifications: Required<NotificationType>[];
-  clearNotification: (text: string) => void;
-}
-
-const Notifications = ({
-  notifications,
-  clearNotification,
-}: NoticationsProps) => {
-  if (!notifications.length) {
-    return null;
-  }
-
-  return (
-    <div className="hidden fixed z-50 md:flex md:flex-col-reverse bottom-1 gap-y-2 w-96 h-full right-1 pointer-events-none">
-      {notifications.map((notif) => (
-        <Notification
-          key={notif.text}
-          notification={notif}
-          clearNotification={clearNotification}
-        />
-      ))}
-    </div>
-  );
-};
-
-export default Notifications;

frontend/components/utilities/SecurityClient.js

@@ -3,7 +3,7 @@ import token from "~/pages/api/auth/Token";
 export default class SecurityClient {
   static #token = "";
 
-  constructor() {}
+  contructor() {}
 
   static setToken(token) {
     this.#token = token;

frontend/components/utilities/attemptLogin.js

@@ -4,10 +4,10 @@ import login2 from "~/pages/api/auth/Login2";
 import getOrganizations from "~/pages/api/organization/getOrgs";
 import getOrganizationUserProjects from "~/pages/api/organization/GetOrgUserProjects";
 
+import { initPostHog } from "../analytics/posthog";
 import pushKeys from "./secrets/pushKeys";
-import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
+import { ENV } from "./config";
 import SecurityClient from "./SecurityClient";
-import Telemetry from "./telemetry/Telemetry";
 
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");
@@ -32,8 +32,7 @@ const attemptLogin = async (
   isLogin
 ) => {
   try {
-    const telemetry = new Telemetry().getInstance();
-
+    let userWorkspace, userOrg;
     client.init(
       {
         username: email,
@@ -42,38 +41,66 @@ const attemptLogin = async (
       async () => {
         const clientPublicKey = client.getPublicKey();
 
-        const { serverPublicKey, salt } = await login1(email, clientPublicKey);
+        let serverPublicKey, salt;
+        try {
+          let res = await login1(email, clientPublicKey);
+          res = await res.json();
+          serverPublicKey = res.serverPublicKey;
+          salt = res.salt;
+        } catch (err) {
+          setErrorLogin(true);
+          console.log("Wrong password", err);
+        }
 
+        let response;
         try {
           client.setSalt(salt);
           client.setServerPublicKey(serverPublicKey);
           const clientProof = client.getProof(); // called M1
+          response = await login2(email, clientProof);
+        } catch (err) {
+          setErrorLogin(true);
+          console.log("Password verification failed");
+        }
 
-          // if everything works, go the main dashboard page.
-          const { token, publicKey, encryptedPrivateKey, iv, tag } =
-            await login2(email, clientProof);
-          SecurityClient.setToken(token);
+        // if everything works, go the main dashboard page.
+        try {
+          if (response.status == "200") {
+            response = await response.json();
+            SecurityClient.setToken(response["token"]);
+            const publicKey = response["publicKey"];
+            const encryptedPrivateKey = response["encryptedPrivateKey"];
+            const iv = response["iv"];
+            const tag = response["tag"];
 
-          const privateKey = Aes256Gcm.decrypt(
-            encryptedPrivateKey,
-            iv,
-            tag,
-            password
-              .slice(0, 32)
-              .padStart(
-                32 + (password.slice(0, 32).length - new Blob([password]).size),
-                "0"
-              )
-          );
+            const PRIVATE_KEY = Aes256Gcm.decrypt(
+              encryptedPrivateKey,
+              iv,
+              tag,
+              password
+                .slice(0, 32)
+                .padStart(
+                  32 +
+                    (password.slice(0, 32).length - new Blob([password]).size),
+                  "0"
+                )
+            );
 
-          saveTokenToLocalStorage({
-            token,
-            publicKey,
-            encryptedPrivateKey,
-            iv,
-            tag,
-            privateKey,
-          });
+            try {
+              localStorage.setItem("publicKey", publicKey);
+              localStorage.setItem("encryptedPrivateKey", encryptedPrivateKey);
+              localStorage.setItem("iv", iv);
+              localStorage.setItem("tag", tag);
+              localStorage.setItem("PRIVATE_KEY", PRIVATE_KEY);
+            } catch (err) {
+              setErrorLogin(true);
+              console.error(
+                "Unable to send the tokens in local storage:" + err.message
+              );
+            }
+          } else {
+            setErrorLogin(true);
+          }
 
           const userOrgs = await getOrganizations();
           const userOrgsData = userOrgs.map((org) => org._id);
@@ -107,14 +134,20 @@ const attemptLogin = async (
 
           // If user is logging in for the first time, add the example keys
           if (isSignUp) {
-            await pushKeys({
-              obj: {
+            await pushKeys(
+              {
                 DATABASE_URL: [
                   "mongodb+srv://${DB_USERNAME}:${DB_PASSWORD}@mongodb.net",
                   "personal",
                 ],
-                DB_USERNAME: ["user1234", "personal"],
-                DB_PASSWORD: ["ah8jak3hk8dhiu4dw7whxwe1l", "personal"],
+                DB_USERNAME: [
+                  "user1234",
+                  "personal",
+                ],
+                DB_PASSWORD: [
+                  "ah8jak3hk8dhiu4dw7whxwe1l",
+                  "personal",
+                ],
                 TWILIO_AUTH_TOKEN: [
                   "hgSIwDAKvz8PJfkj6xkzYqzGmAP3HLuG",
                   "shared",
@@ -122,13 +155,20 @@ const attemptLogin = async (
                 WEBSITE_URL: ["http://localhost:3000", "shared"],
                 STRIPE_SECRET_KEY: ["sk_test_7348oyho4hfq398HIUOH78", "shared"],
               },
-              workspaceId: projectToLogin,
-              env: "Development",
-            });
+              projectToLogin,
+              "Development"
+            );
           }
-          if (email) {
-            telemetry.identify(email);
-            telemetry.capture("User Logged In");
+          try {
+            if (email) {
+              if (ENV == "production") {
+                const posthog = initPostHog();
+                posthog.identify(email);
+                posthog.capture("User Logged In");
+              }
+            }
+          } catch (error) {
+            console.log("posthog", error);
           }
 
           if (isLogin) {

frontend/components/utilities/checks/PasswordCheck.js

@@ -1,21 +1,18 @@
-interface PasswordCheckProps {
-  password: string;
-  currentErrorCheck: boolean;
-  setPasswordErrorLength: (value: boolean) => void;
-  setPasswordErrorNumber: (value: boolean) => void;
-  setPasswordErrorLowerCase: (value: boolean) => void;
-}
-
 /**
  * This function checks a user password with respect to some criteria.
+ * @param {*} password
+ * @param {*} setPasswordError
+ * @param {*} setPasswordErrorMessage
+ * @param {*} currentErrorCheck
+ * @returns
  */
-const passwordCheck = ({
+const passwordCheck = (
   password,
   setPasswordErrorLength,
   setPasswordErrorNumber,
   setPasswordErrorLowerCase,
-  currentErrorCheck,
-}: PasswordCheckProps) => {
+  currentErrorCheck
+) => {
   let errorCheck = currentErrorCheck;
   if (!password || password.length < 14) {
     setPasswordErrorLength(true);

frontend/components/utilities/checks/tempLocalStorage.ts

@@ -1,11 +0,0 @@
-// this is temporary util function. create error handling logic for localStorage and delete this.
-export const tempLocalStorage = (key: string) => {
-  const value = localStorage.getItem(key);
-
-  if (value === null || value === "") {
-    console.warn("No value found in localStorage for key");
-    return "";
-  }
-
-  return value;
-};

frontend/components/utilities/config/index.ts

@@ -4,6 +4,8 @@ const POSTHOG_HOST =
   process.env.NEXT_PUBLIC_POSTHOG_HOST! || "https://app.posthog.com";
 const STRIPE_PRODUCT_PRO = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_PRO!;
 const STRIPE_PRODUCT_STARTER = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_STARTER!;
+const TELEMETRY_ENABLED =
+  process.env.NEXT_PUBLIC_TELEMETRY_ENABLED! !== "false";
 
 export {
   ENV,
@@ -11,4 +13,5 @@ export {
   POSTHOG_HOST,
   STRIPE_PRODUCT_PRO,
   STRIPE_PRODUCT_STARTER,
+  TELEMETRY_ENABLED,
 };

frontend/components/utilities/saveTokenToLocalStorage.ts

@@ -1,29 +0,0 @@
-interface Props {
-  publicKey: string;
-  encryptedPrivateKey: string;
-  iv: string;
-  tag: string;
-  privateKey: string;
-}
-
-export const saveTokenToLocalStorage = ({
-  publicKey,
-  encryptedPrivateKey,
-  iv,
-  tag,
-  privateKey,
-}: Props) => {
-  try {
-    localStorage.setItem("publicKey", publicKey);
-    localStorage.setItem("encryptedPrivateKey", encryptedPrivateKey);
-    localStorage.setItem("iv", iv);
-    localStorage.setItem("tag", tag);
-    localStorage.setItem("PRIVATE_KEY", privateKey);
-  } catch (err) {
-    if (err instanceof Error) {
-      throw new Error(
-        "Unable to send the tokens in local storage:" + err.message
-      );
-    }
-  }
-};

frontend/components/utilities/telemetry/Telemetry.js

@@ -1,44 +0,0 @@
-/* eslint-disable */
-import { initPostHog } from "~/components/analytics/posthog";
-import { ENV } from "~/components/utilities/config";
-
-class Capturer {
-  constructor() {
-      this.api = initPostHog();
-  }
-
-  capture(item) {
-    if (ENV == "production" && TELEMETRY_CAPTURING_ENABLED) {
-      try {
-        api.capture(item);
-      } catch (error) {
-        console.error("PostHog", error);
-      }
-    }
-  }
-
-  identify(id) {
-    if (ENV == "production" && TELEMETRY_CAPTURING_ENABLED) {
-      try {
-        api.identify(id);
-      } catch (error) {
-        console.error("PostHog", error);
-      }
-    }
-  }
-
-}
-
-class Telemetry {
-  constructor() {
-      if (!Telemetry.instance) {
-        Telemetry.instance = new Capturer();
-      }
-  }
-
-  getInstance() {
-      return Telemetry.instance;
-  }
-}
-
-module.exports = Telemetry;

frontend/package-lock.json

@@ -50,13 +50,13 @@
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.4",
         "@types/node": "18.11.9",
-        "@types/react": "^18.0.26",
         "@typescript-eslint/eslint-plugin": "^5.45.0",
         "@typescript-eslint/parser": "^5.45.0",
         "autoprefixer": "^10.4.7",
         "eslint": "^8.29.0",
         "eslint-config-next": "^13.0.5",
         "eslint-import-resolver-typescript": "^3.5.2",
+        "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-simple-import-sort": "^8.0.0",
         "postcss": "^8.4.14",
         "prettier": "2.7.1",
@@ -64,32 +64,6 @@
         "typescript": "^4.9.3"
       }
     },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@ampproject/remapping/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@babel/code-frame": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -101,83 +75,12 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
-      "peer": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz",
-      "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==",
-      "peer": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-module-transforms": "^7.20.2",
-        "@babel/helpers": "^7.20.5",
-        "@babel/parser": "^7.20.5",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "peer": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "peer": true
-    },
-    "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==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/generator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz",
-      "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
       "dependencies": {
-        "@babel/types": "^7.20.5",
+        "@babel/types": "^7.19.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "jsesc": "^2.5.1"
       },
@@ -196,33 +99,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "peer": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "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==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.18.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
@@ -265,25 +141,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz",
-      "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==",
-      "peer": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-plugin-utils": {
       "version": "7.19.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
@@ -292,18 +149,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "peer": true,
-      "dependencies": {
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
@@ -316,40 +161,17 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "peer": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz",
-      "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==",
-      "peer": true,
-      "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
-      },
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -368,9 +190,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz",
-      "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+      "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -430,18 +252,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz",
-      "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+      "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
+        "@babel/generator": "^7.19.0",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.5",
-        "@babel/types": "^7.20.5",
+        "@babel/parser": "^7.19.1",
+        "@babel/types": "^7.19.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -471,12 +293,12 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/@babel/types": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz",
-      "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.18.10",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1321,9 +1143,9 @@
       "optional": true
     },
     "node_modules/@types/react": {
-      "version": "18.0.26",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
-      "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
+      "version": "18.0.15",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+      "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -2060,6 +1882,7 @@
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
       "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -2649,7 +2472,8 @@
     "node_modules/electron-to-chromium": {
       "version": "1.4.206",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz",
-      "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA=="
+      "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA==",
+      "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -2771,6 +2595,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -3076,6 +2901,27 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-react": {
       "version": "7.31.11",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz",
@@ -3443,6 +3289,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
     "node_modules/fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -3671,15 +3523,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "peer": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
@@ -4410,18 +4253,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "peer": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/jsonp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
@@ -5322,7 +5153,8 @@
     "node_modules/node-releases": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "dev": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -5792,6 +5624,18 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -7198,6 +7042,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
       "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -7403,28 +7248,6 @@
     }
   },
   "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "peer": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-          "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-          "peer": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.0",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        }
-      }
-    },
     "@babel/code-frame": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -7433,64 +7256,12 @@
         "@babel/highlight": "^7.18.6"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
-      "peer": true
-    },
-    "@babel/core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz",
-      "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==",
-      "peer": true,
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-module-transforms": "^7.20.2",
-        "@babel/helpers": "^7.20.5",
-        "@babel/parser": "^7.20.5",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "peer": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "peer": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "peer": true
-        }
-      }
-    },
     "@babel/generator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz",
-      "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
       "requires": {
-        "@babel/types": "^7.20.5",
+        "@babel/types": "^7.19.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "jsesc": "^2.5.1"
       }
@@ -7503,26 +7274,6 @@
         "@babel/types": "^7.18.6"
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "peer": true,
-      "requires": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "peer": true
-        }
-      }
-    },
     "@babel/helper-environment-visitor": {
       "version": "7.18.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
@@ -7553,36 +7304,11 @@
         "@babel/types": "^7.18.6"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz",
-      "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==",
-      "peer": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.2"
-      }
-    },
     "@babel/helper-plugin-utils": {
       "version": "7.19.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
       "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
     },
-    "@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "peer": true,
-      "requires": {
-        "@babel/types": "^7.20.2"
-      }
-    },
     "@babel/helper-split-export-declaration": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
@@ -7592,31 +7318,14 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
-    },
-    "@babel/helper-validator-option": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "peer": true
-    },
-    "@babel/helpers": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz",
-      "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==",
-      "peer": true,
-      "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
-      }
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
     },
     "@babel/highlight": {
       "version": "7.18.6",
@@ -7629,9 +7338,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz",
-      "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+      "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
     },
     "@babel/plugin-syntax-jsx": {
       "version": "7.18.6",
@@ -7670,18 +7379,18 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz",
-      "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+      "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
+        "@babel/generator": "^7.19.0",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.5",
-        "@babel/types": "^7.20.5",
+        "@babel/parser": "^7.19.1",
+        "@babel/types": "^7.19.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -7702,12 +7411,12 @@
       }
     },
     "@babel/types": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz",
-      "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
       "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.18.10",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -7957,8 +7666,7 @@
     "@headlessui/react": {
       "version": "1.6.6",
       "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.6.tgz",
-      "integrity": "sha512-MFJtmj9Xh/hhBMhLccGbBoSk+sk61BlP6sJe4uQcVMtXZhCgGqd2GyIQzzmsdPdTEWGSF434CBi8mnhR6um46Q==",
-      "requires": {}
+      "integrity": "sha512-MFJtmj9Xh/hhBMhLccGbBoSk+sk61BlP6sJe4uQcVMtXZhCgGqd2GyIQzzmsdPdTEWGSF434CBi8mnhR6um46Q=="
     },
     "@humanwhocodes/config-array": {
       "version": "0.11.7",
@@ -8299,9 +8007,9 @@
       "optional": true
     },
     "@types/react": {
-      "version": "18.0.26",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
-      "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
+      "version": "18.0.15",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+      "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -8539,8 +8247,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -8743,8 +8450,7 @@
     "axios-auth-refresh": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/axios-auth-refresh/-/axios-auth-refresh-3.3.3.tgz",
-      "integrity": "sha512-2IbDhJ/h6ddNBBnnzn1VFK/qx17pE9aVqiafB8rx5LVHsJ1HtFpUGkbXY7PzTG+8P9HJWcyA3fNZl9BikSuilg==",
-      "requires": {}
+      "integrity": "sha512-2IbDhJ/h6ddNBBnnzn1VFK/qx17pE9aVqiafB8rx5LVHsJ1HtFpUGkbXY7PzTG+8P9HJWcyA3fNZl9BikSuilg=="
     },
     "axobject-query": {
       "version": "2.2.0",
@@ -8825,6 +8531,7 @@
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
       "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001370",
         "electron-to-chromium": "^1.4.202",
@@ -9273,7 +8980,8 @@
     "electron-to-chromium": {
       "version": "1.4.206",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz",
-      "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA=="
+      "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA==",
+      "dev": true
     },
     "emoji-regex": {
       "version": "9.2.2",
@@ -9374,7 +9082,8 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -9691,6 +9400,15 @@
         }
       }
     },
+    "eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
     "eslint-plugin-react": {
       "version": "7.31.11",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz",
@@ -9746,15 +9464,13 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
       "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-plugin-simple-import-sort": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz",
       "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-scope": {
       "version": "7.1.1",
@@ -9867,6 +9583,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
     "fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -10033,12 +9755,6 @@
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true
     },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "peer": true
-    },
     "get-intrinsic": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
@@ -10553,12 +10269,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "peer": true
-    },
     "jsonp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
@@ -11144,7 +10854,8 @@
     "node-releases": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "dev": true
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -11450,6 +11161,15 @@
       "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true
     },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -11721,8 +11441,7 @@
     "react-table": {
       "version": "7.8.0",
       "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.8.0.tgz",
-      "integrity": "sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA==",
-      "requires": {}
+      "integrity": "sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA=="
     },
     "read-cache": {
       "version": "1.0.0",
@@ -11763,8 +11482,7 @@
     "redux-thunk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "requires": {}
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
     },
     "regenerator-runtime": {
       "version": "0.13.11",
@@ -12116,8 +11834,7 @@
     "styled-jsx": {
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.7.tgz",
-      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==",
-      "requires": {}
+      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA=="
     },
     "stylis": {
       "version": "4.0.13",
@@ -12462,6 +12179,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
       "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -12479,14 +12197,12 @@
     "use-memo-one": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
-      "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==",
-      "requires": {}
+      "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ=="
     },
     "use-sync-external-store": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "requires": {}
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
     },
     "util-deprecate": {
       "version": "1.0.2",

frontend/package.json

@@ -53,7 +53,6 @@
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.4",
     "@types/node": "18.11.9",
-    "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
     "autoprefixer": "^10.4.7",

frontend/pages/_app.js

@@ -2,11 +2,11 @@ import { useEffect } from "react";
 import { useRouter } from "next/router";
 import { config } from "@fortawesome/fontawesome-svg-core";
 
-import Layout from "~/components/basic/Layout";
-import NotificationProvider from "~/components/context/Notifications/NotificationProvider";
+import { initPostHog } from "~/components/analytics/posthog";
+import Layout from "~/components/basic/layout";
 import RouteGuard from "~/components/RouteGuard";
 import { publicPaths } from "~/const";
-import Telemetry from "~/utilities/telemetry/Telemetry";
+import { ENV } from "~/utilities/config";
 
 import "@fortawesome/fontawesome-svg-core/styles.css";
 import "../styles/globals.css";
@@ -15,14 +15,17 @@ config.autoAddCss = false;
 
 const App = ({ Component, pageProps, ...appProps }) => {
   const router = useRouter();
+  const posthog = initPostHog();
 
   useEffect(() => {
     // Init for auto capturing
-    const telemetry = new Telemetry().getInstance();
+    const posthog = initPostHog();
 
     const handleRouteChange = () => {
       if (typeof window !== "undefined") {
-        telemetry.capture("$pageview");
+        if (ENV == "production") {
+          posthog.capture("$pageview");
+        }
       }
     };
 
@@ -43,11 +46,9 @@ const App = ({ Component, pageProps, ...appProps }) => {
 
   return (
     <RouteGuard>
-      <NotificationProvider>
-        <Layout>
-          <Component {...pageProps} />
-        </Layout>
-      </NotificationProvider>
+      <Layout>
+        <Component {...pageProps} />
+      </Layout>
     </RouteGuard>
   );
 };

frontend/pages/api/auth/Login1.js

@@ -0,0 +1,20 @@
+/**
+ * This is the first step of the login process (pake)
+ * @param {*} email
+ * @param {*} clientPublicKey
+ * @returns
+ */
+const login1 = (email, clientPublicKey) => {
+  return fetch("/api/v1/auth/login1", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      email: email,
+      clientPublicKey,
+    }),
+  });
+};
+
+export default login1;

frontend/pages/api/auth/Login1.ts

@@ -1,32 +0,0 @@
-interface Login1 {
-  serverPublicKey: string;
-  salt: string;
-}
-
-/**
- * This is the first step of the login process (pake)
- * @param {*} email
- * @param {*} clientPublicKey
- * @returns
- */
-const login1 = async (email: string, clientPublicKey: string) => {
-  const response = await fetch("/api/v1/auth/login1", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      email: email,
-      clientPublicKey,
-    }),
-  });
-  // need precise error handling about the status code
-  if (response?.status === 200) {
-    const data = (await response.json()) as unknown as Login1;
-    return data;
-  }
-
-  throw new Error("Wrong password");
-};
-
-export default login1;

frontend/pages/api/auth/Login2.js

@@ -0,0 +1,28 @@
+/**
+ * This is the second step of the login process
+ * @param {*} email
+ * @param {*} clientPublicKey
+ * @returns
+ */
+const login2 = (email, clientProof) => {
+  return fetch("/api/v1/auth/login2", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      email: email,
+      clientProof,
+    }),
+    credentials: "include",
+  }).then((res) => {
+    if (res.status == 200) {
+      console.log("User logged in", res);
+      return res;
+    } else {
+      console.log("Failed to log in");
+    }
+  });
+};
+
+export default login2;

frontend/pages/api/auth/Login2.ts

@@ -1,36 +0,0 @@
-interface Login2Response {
-  encryptedPrivateKey: string;
-  iv: string;
-  publicKey: string;
-  tag: string;
-  token: string;
-}
-
-/**
- * This is the second step of the login process
- * @param {*} email
- * @param {*} clientPublicKey
- * @returns
- */
-const login2 = async (email: string, clientProof: string) => {
-  const response = await fetch("/api/v1/auth/login2", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      email: email,
-      clientProof,
-    }),
-    credentials: "include",
-  });
-  // need precise error handling about the status code
-  if (response.status == 200) {
-    const data = (await response.json()) as unknown as Login2Response;
-    return data;
-  }
-
-  throw new Error("Password verification failed");
-};
-
-export default login2;

frontend/pages/api/organization/GetOrgUserProjects.js

@@ -6,7 +6,7 @@ import SecurityClient from "~/utilities/SecurityClient";
  * @param {*} res
  * @returns
  */
-const getOrganizationUserProjects = (req) => {
+const getOrganizationUserProjects = (req, res) => {
   return SecurityClient.fetchCall(
     "/api/v1/organization/" + req.orgId + "/my-workspaces",
     {

frontend/pages/api/workspace/getWorkspaces.ts

@@ -1,12 +1,5 @@
 import SecurityClient from "~/utilities/SecurityClient";
 
-interface Workspace {
-  __v: number;
-  _id: string;
-  name: string;
-  organization: string;
-}
-
 /**
  * This route lets us get the workspaces of a certain user
  * @returns
@@ -19,11 +12,10 @@ const getWorkspaces = () => {
     },
   }).then(async (res) => {
     if (res?.status == 200) {
-      const data = (await res.json()) as unknown as { workspaces: Workspace[] };
-      return data.workspaces;
+      return (await res.json()).workspaces;
+    } else {
+      console.log("Failed to get projects");
     }
-
-    throw new Error("Failed to get projects");
   });
 };
 

frontend/pages/dashboard/[id].js

@@ -26,7 +26,6 @@ import { Menu, Transition } from "@headlessui/react";
 import Button from "~/components/basic/buttons/Button";
 import ListBox from "~/components/basic/Listbox";
 import BottonRightPopup from "~/components/basic/popups/BottomRightPopup";
-import { useNotificationContext } from "~/components/context/Notifications/NotificationProvider";
 import DashboardInputField from "~/components/dashboard/DashboardInputField";
 import DropZone from "~/components/dashboard/DropZone";
 import NavHeader from "~/components/navigation/NavHeader";
@@ -61,7 +60,7 @@ const KeyPair = ({
   modifyValue,
   modifyVisibility,
   isBlurred,
-  duplicates,
+  duplicates
 }) => {
   const [randomStringLength, setRandomStringLength] = useState(32);
 
@@ -228,8 +227,6 @@ export default function Dashboard() {
   const [checkDocsPopUpVisible, setCheckDocsPopUpVisible] = useState(false);
   const [hasUserEverPushed, setHasUserEverPushed] = useState(false);
 
-  const { createNotification } = useNotificationContext();
-
   // #TODO: fix save message for changing reroutes
   // const beforeRouteHandler = (url) => {
   // 	const warningText =
@@ -373,61 +370,46 @@ export default function Dashboard() {
     );
 
     // Checking if any of the secret keys start with a number - if so, don't do anything
-    const nameErrors = !Object.keys(obj)
-      .map((key) => !isNaN(key.charAt(0)))
-      .every((v) => v === false);
-    const duplicatesExist =
-      data
-        ?.map((item) => item[2])
-        .filter(
-          (item, index) => index !== data?.map((item) => item[2]).indexOf(item)
-        ).length > 0;
+    const nameErrors = !Object.keys(obj).map(key => !isNaN(key.charAt(0))).every(v => v === false);
+    const duplicatesExist = data?.map(item => item[2]).filter((item, index) => index !== data?.map(item => item[2]).indexOf(item)).length > 0;
 
     if (nameErrors) {
-      return createNotification({
-        text: "Solve all name errors first!",
-        type: "error",
+      console.log("Solve all name errors first!");
+    } else if (duplicatesExist) {
+      console.log("Remove the duplicated entries first!");
+    } else {
+      // Once "Save changes is clicked", disable that button
+      setButtonReady(false);
+      pushKeys({obj, workspaceId: router.query.id, env});
+
+      /**
+       * Check which integrations are active for this project and environment
+       * If there are any, update environment variables for those integrations
+       */
+      let integrations = await getWorkspaceIntegrations({
+        workspaceId: router.query.id,
       });
-    }
-
-    if (duplicatesExist) {
-      return createNotification({
-        text: "Your secrets weren't saved; please fix the conflicts first.",
-        type: "error",
+      integrations.map(async (integration) => {
+        if (
+          envMapping[env] == integration.environment &&
+          integration.isActive == true
+        ) {
+          let objIntegration = Object.assign(
+            {},
+            ...data.map((row) => ({ [row[2]]: row[3] }))
+          );
+          await pushKeysIntegration({
+            obj: objIntegration,
+            integrationId: integration._id,
+          });
+        }
       });
-    }
 
-    // Once "Save changed is clicked", disable that button
-    setButtonReady(false);
-    pushKeys({ obj, workspaceId: router.query.id, env });
-
-    /**
-     * Check which integrations are active for this project and environment
-     * If there are any, update environment variables for those integrations
-     */
-    let integrations = await getWorkspaceIntegrations({
-      workspaceId: router.query.id,
-    });
-    integrations.map(async (integration) => {
-      if (
-        envMapping[env] == integration.environment &&
-        integration.isActive == true
-      ) {
-        let objIntegration = Object.assign(
-          {},
-          ...data.map((row) => ({ [row[2]]: row[3] }))
-        );
-        await pushKeysIntegration({
-          obj: objIntegration,
-          integrationId: integration._id,
-        });
+      // If this user has never saved environment variables before, show them a prompt to read docs
+      if (!hasUserEverPushed) {
+        setCheckDocsPopUpVisible(true);
+        await registerUserAction({ action: "first_time_secrets_pushed" });
       }
-    });
-
-    // If this user has never saved environment variables before, show them a prompt to read docs
-    if (!hasUserEverPushed) {
-      setCheckDocsPopUpVisible(true);
-      await registerUserAction({ action: "first_time_secrets_pushed" });
     }
   };
 
@@ -667,13 +649,7 @@ export default function Dashboard() {
                           modifyKey={listenChangeKey}
                           modifyVisibility={listenChangeVisibility}
                           isBlurred={blurred}
-                          duplicates={data
-                            ?.map((item) => item[2])
-                            .filter(
-                              (item, index) =>
-                                index !==
-                                data?.map((item) => item[2]).indexOf(item)
-                            )}
+                          duplicates={data?.map(item => item[2]).filter((item, index) => index !== data?.map(item => item[2]).indexOf(item))}
                         />
                       ))}
                   </div>
@@ -721,13 +697,7 @@ export default function Dashboard() {
                           modifyKey={listenChangeKey}
                           modifyVisibility={listenChangeVisibility}
                           isBlurred={blurred}
-                          duplicates={data
-                            ?.map((item) => item[2])
-                            .filter(
-                              (item, index) =>
-                                index !==
-                                data?.map((item) => item[2]).indexOf(item)
-                            )}
+                          duplicates={data?.map(item => item[2]).filter((item, index) => index !== data?.map(item => item[2]).indexOf(item))}
                         />
                       ))}
                   </div>

frontend/pages/settings/personal/[id].js

@@ -125,13 +125,13 @@ export default function PersonalSettings() {
                   label="New Password"
                   onChangeHandler={(password) => {
                     setNewPassword(password);
-                    passwordCheck({
+                    passwordCheck(
                       password,
                       setPasswordErrorLength,
                       setPasswordErrorNumber,
                       setPasswordErrorLowerCase,
-                      currentErrorCheck: false,
-                    });
+                      false
+                    );
                   }}
                   type="password"
                   value={newPassword}

frontend/pages/signup.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useRef, useState } from "react";
-import ReactCodeInput from "react-code-input";
 import dynamic from "next/dynamic";
 import Head from "next/head";
 import Image from "next/image";
@@ -21,7 +20,7 @@ import completeAccountInformationSignup from "./api/auth/CompleteAccountInformat
 import sendVerificationEmail from "./api/auth/SendVerificationEmail";
 import getWorkspaces from "./api/workspace/getWorkspaces";
 
-// const ReactCodeInput = dynamic(import("react-code-input"));
+const ReactCodeInput = dynamic(import("react-code-input"));
 const nacl = require("tweetnacl");
 const jsrp = require("jsrp");
 nacl.util = require("tweetnacl-util");
@@ -43,7 +42,7 @@ const props = {
     border: "1px solid gray",
     textAlign: "center",
   },
-} as const;
+};
 const propsPhone = {
   inputStyle: {
     fontFamily: "monospace",
@@ -59,7 +58,7 @@ const propsPhone = {
     border: "1px solid gray",
     textAlign: "center",
   },
-} as const;
+};
 
 export default function SignUp() {
   const [email, setEmail] = useState("");
@@ -86,16 +85,15 @@ export default function SignUp() {
   const [verificationToken, setVerificationToken] = useState();
   const [backupKeyIssued, setBackupKeyIssued] = useState(false);
 
-  useEffect(() => {
-    const tryAuth = async () => {
-      try {
-        const userWorkspaces = await getWorkspaces();
-        router.push("/dashboard/" + userWorkspaces[0]._id);
-      } catch (error) {
-        console.log("Error - Not logged in yet");
-      }
-    };
-    tryAuth();
+  useEffect(async () => {
+    let userWorkspace;
+    try {
+      const userWorkspaces = await getWorkspaces();
+      userWorkspace = userWorkspaces[0]._id;
+      router.push("/dashboard/" + userWorkspace);
+    } catch (error) {
+      console.log("Error - Not logged in yet");
+    }
   }, []);
 
   /**
@@ -110,7 +108,7 @@ export default function SignUp() {
     } else if (step == 2) {
       // Checking if the code matches the email.
       const response = await checkEmailVerificationCode(email, code);
-      if (response.status === 200 || code == "111222") {
+      if (response.status == "200" || code == "111222") {
         setVerificationToken((await response.json()).token);
         setStep(3);
       } else {
@@ -125,7 +123,7 @@ export default function SignUp() {
    * Verifies if the entered email "looks" correct
    */
   const emailCheck = () => {
-    let emailCheckBool = false;
+    var emailCheckBool = false;
     if (!email) {
       setEmailError(true);
       setEmailErrorMessage("Please enter your email.");
@@ -152,7 +150,7 @@ export default function SignUp() {
   // Verifies if the imformation that the users entered (name, workspace) is there, and if the password matched the criteria.
   const signupErrorCheck = async () => {
     setIsLoading(true);
-    let errorCheck = false;
+    var errorCheck = false;
     if (!firstName) {
       setFirstNameError(true);
       errorCheck = true;
@@ -165,13 +163,13 @@ export default function SignUp() {
     } else {
       setLastNameError(false);
     }
-    errorCheck = passwordCheck({
+    errorCheck = passwordCheck(
       password,
       setPasswordErrorLength,
       setPasswordErrorNumber,
       setPasswordErrorLowerCase,
-      currentErrorCheck: errorCheck,
-    });
+      errorCheck
+    );
 
     if (!errorCheck) {
       // Generate a random pair of a public and a private key
@@ -189,8 +187,7 @@ export default function SignUp() {
             32 + (password.slice(0, 32).length - new Blob([password]).size),
             "0"
           )
-      ) as { ciphertext: string; iv: string; tag: string };
-
+      );
       localStorage.setItem("PRIVATE_KEY", PRIVATE_KEY);
 
       client.init(
@@ -199,47 +196,45 @@ export default function SignUp() {
           password: password,
         },
         async () => {
-          client.createVerifier(
-            async (err: any, result: { salt: string; verifier: string }) => {
-              const response = await completeAccountInformationSignup({
-                email,
-                firstName,
-                lastName,
-                organizationName: firstName + "'s organization",
-                publicKey: PUBLIC_KEY,
-                ciphertext,
-                iv,
-                tag,
-                salt: result.salt,
-                verifier: result.verifier,
-                token: verificationToken,
-              });
+          client.createVerifier(async (err, result) => {
+            let response = await completeAccountInformationSignup({
+              email,
+              firstName,
+              lastName,
+              organizationName: firstName + "'s organization",
+              publicKey: PUBLIC_KEY,
+              ciphertext,
+              iv,
+              tag,
+              salt: result.salt,
+              verifier: result.verifier,
+              token: verificationToken,
+            });
 
-              // if everything works, go the main dashboard page.
-              if (response.status === 200) {
-                // response = await response.json();
+            // if everything works, go the main dashboard page.
+            if (!errorCheck && response.status == "200") {
+              response = await response.json();
 
-                localStorage.setItem("publicKey", PUBLIC_KEY);
-                localStorage.setItem("encryptedPrivateKey", ciphertext);
-                localStorage.setItem("iv", iv);
-                localStorage.setItem("tag", tag);
+              localStorage.setItem("publicKey", PUBLIC_KEY);
+              localStorage.setItem("encryptedPrivateKey", ciphertext);
+              localStorage.setItem("iv", iv);
+              localStorage.setItem("tag", tag);
 
-                try {
-                  await attemptLogin(
-                    email,
-                    password,
-                    setErrorLogin,
-                    router,
-                    true,
-                    false
-                  );
-                  incrementStep();
-                } catch (error) {
-                  setIsLoading(false);
-                }
+              try {
+                await attemptLogin(
+                  email,
+                  password,
+                  setErrorLogin,
+                  router,
+                  true,
+                  false
+                );
+                incrementStep();
+              } catch (error) {
+                setIsLoading(false);
               }
             }
-          );
+          });
         }
       );
     } else {
@@ -301,8 +296,6 @@ export default function SignUp() {
       </p>
       <div className="hidden md:block">
         <ReactCodeInput
-          name=""
-          inputMode="tel"
           type="text"
           fields={6}
           onChange={setCode}
@@ -312,8 +305,6 @@ export default function SignUp() {
       </div>
       <div className="block md:hidden">
         <ReactCodeInput
-          name=""
-          inputMode="tel"
           type="text"
           fields={6}
           onChange={setCode}
@@ -373,15 +364,15 @@ export default function SignUp() {
       <div className="mt-2 flex flex-col items-center justify-center w-full md:p-2 rounded-lg max-h-60">
         <InputField
           label="Password"
-          onChangeHandler={(password: string) => {
+          onChangeHandler={(password) => {
             setPassword(password);
-            passwordCheck({
+            passwordCheck(
               password,
               setPasswordErrorLength,
               setPasswordErrorNumber,
               setPasswordErrorLowerCase,
-              currentErrorCheck: false,
-            });
+              false
+            );
           }}
           type="password"
           value={password}
@@ -505,7 +496,7 @@ export default function SignUp() {
               setBackupKeyIssued,
             });
             const userWorkspaces = await getWorkspaces();
-            const userWorkspace = userWorkspaces[0]._id;
+            let userWorkspace = userWorkspaces[0]._id;
             router.push("/home/" + userWorkspace);
           }}
           size="lg"

frontend/pages/signupinvite.js

@@ -204,13 +204,13 @@ export default function SignupInvite() {
           label="Password"
           onChangeHandler={(password) => {
             setPassword(password);
-            passwordCheck({
+            passwordCheck(
               password,
               setPasswordErrorLength,
               setPasswordErrorNumber,
               setPasswordErrorLowerCase,
-              currentErrorCheck: false,
-            });
+              false
+            );
           }}
           type="password"
           value={password}

frontend/public/images/progress-0.svg

@@ -1,5 +0,0 @@
-<svg width="465" height="465" viewBox="0 0 465 465" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M432.802 232.798C432.802 272.354 421.072 311.022 399.096 343.912C377.119 376.802 345.884 402.436 309.339 417.574C272.793 432.711 232.58 436.672 193.784 428.955C154.988 421.238 119.351 402.19 91.3806 374.219C63.4101 346.249 44.3619 310.612 36.6448 271.816C28.9277 233.02 32.8882 192.807 48.0257 156.262C63.1631 119.716 88.7975 88.4805 121.687 66.5042C154.577 44.5278 193.245 32.798 232.801 32.7978" stroke="#67704D" stroke-width="64"/>
-<path d="M215.758 33.5259C255.17 30.1556 294.697 38.5481 329.34 57.6422C363.983 76.7362 392.185 105.674 410.381 140.797C428.578 175.919 435.95 215.649 431.567 254.962C427.183 294.274 411.241 331.404 385.755 361.656C360.27 391.908 326.386 413.923 288.388 424.918C250.391 435.912 209.986 435.393 172.284 423.424C134.582 411.455 101.276 388.575 76.5769 357.678C51.8782 326.78 36.8963 289.252 33.5259 249.84" stroke="#67704D" stroke-width="64"/>
-<path d="M197.461 263.218C192.386 263.218 188.011 262.016 184.336 259.61C180.662 257.186 177.831 253.711 175.842 249.184C173.853 244.639 172.869 239.175 172.887 232.792C172.906 226.41 173.901 220.993 175.87 216.542C177.859 212.072 180.681 208.673 184.336 206.343C188.011 203.995 192.386 202.821 197.461 202.821C202.537 202.821 206.912 203.995 210.586 206.343C214.28 208.673 217.12 212.072 219.109 216.542C221.098 221.012 222.083 226.429 222.064 232.792C222.064 239.194 221.069 244.667 219.081 249.213C217.092 253.758 214.261 257.233 210.586 259.639C206.931 262.025 202.556 263.218 197.461 263.218ZM197.461 251.713C200.492 251.713 202.944 250.169 204.819 247.082C206.694 243.976 207.622 239.213 207.603 232.792C207.603 228.588 207.177 225.122 206.325 222.394C205.473 219.648 204.289 217.603 202.774 216.258C201.259 214.913 199.488 214.241 197.461 214.241C194.45 214.241 192.016 215.766 190.16 218.815C188.304 221.845 187.367 226.504 187.348 232.792C187.329 237.054 187.736 240.586 188.569 243.389C189.422 246.192 190.615 248.285 192.149 249.667C193.683 251.031 195.454 251.713 197.461 251.713ZM262.703 250.889V247.821C262.703 245.434 263.214 243.228 264.237 241.201C265.279 239.175 266.784 237.546 268.754 236.315C270.724 235.084 273.129 234.468 275.97 234.468C278.868 234.468 281.301 235.084 283.271 236.315C285.26 237.527 286.756 239.146 287.76 241.173C288.782 243.18 289.294 245.396 289.294 247.821V250.889C289.294 253.275 288.782 255.482 287.76 257.508C286.737 259.535 285.231 261.163 283.243 262.394C281.254 263.626 278.83 264.241 275.97 264.241C273.091 264.241 270.667 263.626 268.697 262.394C266.727 261.163 265.231 259.535 264.208 257.508C263.205 255.482 262.703 253.275 262.703 250.889ZM271.765 247.821V250.889C271.765 252.101 272.059 253.266 272.646 254.383C273.252 255.501 274.36 256.059 275.97 256.059C277.618 256.059 278.726 255.519 279.294 254.44C279.862 253.341 280.146 252.158 280.146 250.889V247.821C280.146 246.552 279.871 245.358 279.322 244.241C278.792 243.105 277.674 242.536 275.97 242.536C274.379 242.536 273.28 243.105 272.674 244.241C272.068 245.358 271.765 246.552 271.765 247.821ZM232.532 217.593V214.525C232.532 212.101 233.053 209.885 234.095 207.877C235.155 205.851 236.671 204.232 238.64 203.019C240.61 201.788 242.996 201.173 245.799 201.173C248.697 201.173 251.131 201.788 253.101 203.019C255.089 204.232 256.595 205.851 257.618 207.877C258.64 209.885 259.152 212.101 259.152 214.525V217.593C259.152 220.018 258.631 222.233 257.589 224.241C256.566 226.249 255.061 227.849 253.072 229.042C251.083 230.235 248.659 230.832 245.799 230.832C242.94 230.832 240.515 230.226 238.527 229.014C236.557 227.802 235.061 226.192 234.038 224.184C233.034 222.177 232.532 219.98 232.532 217.593ZM241.68 214.525V217.593C241.68 218.862 241.974 220.046 242.561 221.144C243.167 222.224 244.246 222.764 245.799 222.764C247.466 222.764 248.574 222.224 249.123 221.144C249.691 220.046 249.976 218.862 249.976 217.593V214.525C249.976 213.256 249.71 212.063 249.18 210.946C248.65 209.809 247.523 209.241 245.799 209.241C244.208 209.241 243.119 209.819 242.532 210.974C241.964 212.129 241.68 213.313 241.68 214.525ZM236.822 261.798L276.822 203.616H284.578L244.578 261.798H236.822Z" fill="#BADC58"/>
-</svg>

frontend/public/images/progress-14.svg

@@ -1,6 +0,0 @@
-<svg width="566" height="566" viewBox="0 0 566 566" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M483.002 282.999C483.002 322.556 471.272 361.223 449.296 394.113C427.32 427.003 396.084 452.638 359.539 467.775C322.994 482.913 282.78 486.873 243.984 479.156C205.188 471.439 169.551 452.391 141.581 424.421C113.61 396.45 94.5621 360.814 86.845 322.018C79.1278 283.221 83.0884 243.008 98.2259 206.463C113.363 169.918 138.998 138.682 171.887 116.706C204.777 94.7293 243.445 82.9994 283.001 82.9993" stroke="#67704D" stroke-width="64"/>
-<path d="M426.898 144.1C454.37 172.56 472.785 208.528 479.815 247.454C486.846 286.381 482.175 326.518 466.394 362.79C450.613 399.062 424.431 429.84 391.158 451.231C357.885 472.623 319.015 483.668 279.465 482.969C239.915 482.27 201.461 469.858 168.964 447.304C136.468 424.75 111.389 393.067 96.9001 356.26C82.4107 319.453 79.1612 279.176 87.5626 240.522C95.9639 201.868 115.639 166.574 144.099 139.102" stroke="#67704D" stroke-width="64"/>
-<path d="M283.002 82.9993C312.374 82.9993 341.385 89.4686 367.974 101.948C394.563 114.427 418.078 132.609 436.846 155.202" stroke="#BADC58" stroke-width="64" stroke-linecap="round"/>
-<path d="M231.401 253.817V311.999H217.367V266.942H217.026L204.015 274.897V262.738L218.361 253.817H231.401ZM243.553 302.34V291.374L267.388 253.817H277.132V268.704H271.479L257.53 290.806V291.261H292.047V302.34H243.553ZM271.649 311.999V298.988L271.934 294.187V253.817H285.087V311.999H271.649ZM332.005 301.09V298.022C332.005 295.636 332.516 293.429 333.539 291.403C334.58 289.376 336.086 287.747 338.056 286.516C340.025 285.285 342.431 284.67 345.272 284.67C348.169 284.67 350.603 285.285 352.573 286.516C354.561 287.728 356.058 289.348 357.061 291.374C358.084 293.382 358.595 295.598 358.595 298.022V301.09C358.595 303.477 358.084 305.683 357.061 307.709C356.039 309.736 354.533 311.365 352.544 312.596C350.556 313.827 348.131 314.442 345.272 314.442C342.393 314.442 339.969 313.827 337.999 312.596C336.029 311.365 334.533 309.736 333.51 307.709C332.506 305.683 332.005 303.477 332.005 301.09ZM341.067 298.022V301.09C341.067 302.302 341.361 303.467 341.948 304.584C342.554 305.702 343.662 306.261 345.272 306.261C346.919 306.261 348.027 305.721 348.595 304.641C349.164 303.543 349.448 302.359 349.448 301.09V298.022C349.448 296.753 349.173 295.56 348.624 294.442C348.094 293.306 346.976 292.738 345.272 292.738C343.681 292.738 342.582 293.306 341.976 294.442C341.37 295.56 341.067 296.753 341.067 298.022ZM301.834 267.795V264.727C301.834 262.302 302.355 260.086 303.397 258.079C304.457 256.052 305.972 254.433 307.942 253.221C309.912 251.99 312.298 251.374 315.101 251.374C317.999 251.374 320.433 251.99 322.402 253.221C324.391 254.433 325.897 256.052 326.919 258.079C327.942 260.086 328.453 262.302 328.453 264.727V267.795C328.453 270.219 327.933 272.435 326.891 274.442C325.868 276.45 324.363 278.05 322.374 279.244C320.385 280.437 317.961 281.033 315.101 281.033C312.241 281.033 309.817 280.427 307.828 279.215C305.859 278.003 304.363 276.393 303.34 274.386C302.336 272.378 301.834 270.181 301.834 267.795ZM310.982 264.727V267.795C310.982 269.064 311.275 270.247 311.863 271.346C312.469 272.425 313.548 272.965 315.101 272.965C316.768 272.965 317.876 272.425 318.425 271.346C318.993 270.247 319.277 269.064 319.277 267.795V264.727C319.277 263.458 319.012 262.264 318.482 261.147C317.952 260.011 316.825 259.442 315.101 259.442C313.51 259.442 312.421 260.02 311.834 261.175C311.266 262.331 310.982 263.514 310.982 264.727ZM306.124 311.999L346.124 253.817H353.88L313.88 311.999H306.124Z" fill="#BADC58"/>
-</svg>

frontend/public/images/progress-43.svg

@@ -1,5 +0,0 @@
-<svg width="464" height="464" viewBox="0 0 464 464" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M432 232C432 271.556 420.27 310.224 398.294 343.114C376.318 376.004 345.082 401.638 308.537 416.776C271.992 431.913 231.778 435.874 192.982 428.157C154.186 420.44 118.549 401.392 90.5788 373.422C62.6083 345.451 43.5601 309.815 35.843 271.018C28.1259 232.222 32.0865 192.009 47.2239 155.464C62.3614 118.918 87.9958 87.6827 120.886 65.7063C153.775 43.73 192.443 32.0001 231.999 32" stroke="#67704D" stroke-width="64"/>
-<path d="M232 32C277.35 32 321.353 47.4122 356.792 75.7084C392.23 104.005 417 143.505 427.039 187.729C437.077 231.954 431.787 278.277 412.038 319.1C392.288 359.923 359.251 392.823 318.345 412.401" stroke="#BADC58" stroke-width="64" stroke-linecap="round"/>
-<path d="M145.988 251.341V240.375L169.824 202.818H179.568V217.705H173.915L159.966 239.807V240.261H194.483V251.341H145.988ZM174.085 261V247.989L174.369 243.188V202.818H187.522V261H174.085ZM223.986 261.795C219.554 261.795 215.624 261.038 212.196 259.523C208.787 257.989 206.097 255.877 204.128 253.188C202.158 250.498 201.154 247.402 201.116 243.898H215.264C215.321 245.167 215.728 246.294 216.486 247.278C217.243 248.244 218.275 249.002 219.582 249.551C220.889 250.1 222.376 250.375 224.042 250.375C225.709 250.375 227.177 250.081 228.446 249.494C229.734 248.888 230.737 248.064 231.457 247.023C232.177 245.962 232.527 244.75 232.508 243.386C232.527 242.023 232.139 240.811 231.344 239.75C230.548 238.689 229.421 237.866 227.963 237.278C226.523 236.691 224.819 236.398 222.849 236.398H217.196V226.398H222.849C224.573 226.398 226.088 226.114 227.395 225.545C228.72 224.977 229.753 224.182 230.491 223.159C231.23 222.117 231.59 220.924 231.571 219.58C231.59 218.273 231.277 217.127 230.633 216.142C230.008 215.138 229.128 214.362 227.991 213.812C226.874 213.263 225.576 212.989 224.099 212.989C222.546 212.989 221.135 213.263 219.866 213.812C218.616 214.362 217.622 215.138 216.883 216.142C216.145 217.146 215.756 218.311 215.719 219.636H202.281C202.319 216.17 203.285 213.121 205.179 210.489C207.073 207.837 209.648 205.763 212.906 204.267C216.183 202.771 219.914 202.023 224.099 202.023C228.266 202.023 231.931 202.752 235.094 204.21C238.256 205.669 240.719 207.657 242.48 210.176C244.241 212.676 245.122 215.508 245.122 218.67C245.141 221.947 244.071 224.646 241.912 226.767C239.772 228.888 237.016 230.195 233.645 230.688V231.142C238.152 231.672 241.552 233.131 243.844 235.517C246.154 237.903 247.3 240.886 247.281 244.466C247.281 247.837 246.287 250.83 244.298 253.443C242.328 256.038 239.582 258.083 236.059 259.58C232.556 261.057 228.531 261.795 223.986 261.795ZM287.799 250.091V247.023C287.799 244.636 288.311 242.43 289.334 240.403C290.375 238.377 291.881 236.748 293.851 235.517C295.82 234.286 298.226 233.67 301.067 233.67C303.964 233.67 306.398 234.286 308.368 235.517C310.356 236.729 311.853 238.348 312.856 240.375C313.879 242.383 314.39 244.598 314.39 247.023V250.091C314.39 252.477 313.879 254.684 312.856 256.71C311.834 258.737 310.328 260.366 308.339 261.597C306.351 262.828 303.926 263.443 301.067 263.443C298.188 263.443 295.764 262.828 293.794 261.597C291.824 260.366 290.328 258.737 289.305 256.71C288.301 254.684 287.799 252.477 287.799 250.091ZM296.862 247.023V250.091C296.862 251.303 297.156 252.468 297.743 253.585C298.349 254.703 299.457 255.261 301.067 255.261C302.714 255.261 303.822 254.722 304.39 253.642C304.959 252.544 305.243 251.36 305.243 250.091V247.023C305.243 245.754 304.968 244.561 304.419 243.443C303.889 242.307 302.771 241.739 301.067 241.739C299.476 241.739 298.377 242.307 297.771 243.443C297.165 244.561 296.862 245.754 296.862 247.023ZM257.629 216.795V213.727C257.629 211.303 258.15 209.087 259.192 207.08C260.252 205.053 261.767 203.434 263.737 202.222C265.707 200.991 268.093 200.375 270.896 200.375C273.794 200.375 276.228 200.991 278.197 202.222C280.186 203.434 281.692 205.053 282.714 207.08C283.737 209.087 284.248 211.303 284.248 213.727V216.795C284.248 219.22 283.728 221.436 282.686 223.443C281.663 225.451 280.157 227.051 278.169 228.244C276.18 229.437 273.756 230.034 270.896 230.034C268.036 230.034 265.612 229.428 263.623 228.216C261.654 227.004 260.157 225.394 259.135 223.386C258.131 221.379 257.629 219.182 257.629 216.795ZM266.777 213.727V216.795C266.777 218.064 267.07 219.248 267.657 220.347C268.264 221.426 269.343 221.966 270.896 221.966C272.563 221.966 273.671 221.426 274.22 220.347C274.788 219.248 275.072 218.064 275.072 216.795V213.727C275.072 212.458 274.807 211.265 274.277 210.148C273.746 209.011 272.62 208.443 270.896 208.443C269.305 208.443 268.216 209.021 267.629 210.176C267.061 211.331 266.777 212.515 266.777 213.727ZM261.919 261L301.919 202.818H309.674L269.674 261H261.919Z" fill="#BADC58"/>
-</svg>

frontend/public/images/progress-57.svg

@@ -1,5 +0,0 @@
-<svg width="464" height="464" viewBox="0 0 464 464" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M432 232C432 271.556 420.27 310.224 398.294 343.114C376.318 376.004 345.082 401.638 308.537 416.776C271.992 431.913 231.778 435.874 192.982 428.157C154.186 420.44 118.549 401.392 90.5788 373.422C62.6083 345.451 43.5601 309.815 35.843 271.018C28.1259 232.222 32.0865 192.009 47.2239 155.464C62.3614 118.918 87.9958 87.6827 120.886 65.7063C153.775 43.73 192.443 32.0001 231.999 32" stroke="#67704D" stroke-width="64"/>
-<path d="M232 32C261.853 32 291.327 38.6829 318.261 51.5585C345.194 64.4342 368.904 83.1759 387.65 106.409C406.396 129.642 419.704 156.777 426.596 185.823C433.489 214.869 433.792 245.09 427.482 274.269C421.173 303.447 408.412 330.843 390.135 354.447C371.858 378.051 348.529 397.264 321.859 410.677C295.189 424.089 265.854 431.362 236.008 431.96C206.161 432.558 176.558 426.467 149.372 414.134" stroke="#BADC58" stroke-width="64" stroke-linecap="round"/>
-<path d="M172.839 261.795C168.596 261.795 164.827 261.028 161.532 259.494C158.236 257.96 155.632 255.848 153.719 253.159C151.825 250.47 150.84 247.383 150.765 243.898H164.401C164.515 246.038 165.386 247.761 167.015 249.068C168.643 250.356 170.585 251 172.839 251C174.6 251 176.162 250.612 177.526 249.835C178.89 249.059 179.96 247.97 180.736 246.568C181.513 245.148 181.892 243.519 181.873 241.682C181.892 239.807 181.503 238.169 180.708 236.767C179.931 235.366 178.852 234.277 177.469 233.5C176.106 232.705 174.534 232.307 172.753 232.307C171.068 232.288 169.467 232.657 167.952 233.415C166.456 234.172 165.32 235.205 164.543 236.511L152.128 234.182L154.657 202.818H191.986V214.153H166.219L164.884 227.875H165.225C166.191 226.265 167.744 224.939 169.884 223.898C172.043 222.837 174.496 222.307 177.242 222.307C180.727 222.307 183.833 223.121 186.56 224.75C189.306 226.36 191.465 228.595 193.037 231.455C194.628 234.314 195.424 237.591 195.424 241.284C195.424 245.28 194.477 248.822 192.583 251.909C190.708 254.996 188.075 257.42 184.685 259.182C181.314 260.924 177.365 261.795 172.839 261.795ZM205.616 261L229.081 214.523V214.153H201.638V202.818H243.627V214.239L220.076 261H205.616ZM283.932 250.091V247.023C283.932 244.636 284.444 242.43 285.466 240.403C286.508 238.377 288.014 236.748 289.983 235.517C291.953 234.286 294.358 233.67 297.199 233.67C300.097 233.67 302.531 234.286 304.5 235.517C306.489 236.729 307.985 238.348 308.989 240.375C310.012 242.383 310.523 244.598 310.523 247.023V250.091C310.523 252.477 310.012 254.684 308.989 256.71C307.966 258.737 306.461 260.366 304.472 261.597C302.483 262.828 300.059 263.443 297.199 263.443C294.321 263.443 291.896 262.828 289.927 261.597C287.957 260.366 286.461 258.737 285.438 256.71C284.434 254.684 283.932 252.477 283.932 250.091ZM292.995 247.023V250.091C292.995 251.303 293.288 252.468 293.875 253.585C294.482 254.703 295.589 255.261 297.199 255.261C298.847 255.261 299.955 254.722 300.523 253.642C301.091 252.544 301.375 251.36 301.375 250.091V247.023C301.375 245.754 301.101 244.561 300.552 243.443C300.021 242.307 298.904 241.739 297.199 241.739C295.608 241.739 294.51 242.307 293.904 243.443C293.298 244.561 292.995 245.754 292.995 247.023ZM253.762 216.795V213.727C253.762 211.303 254.283 209.087 255.324 207.08C256.385 205.053 257.9 203.434 259.87 202.222C261.839 200.991 264.226 200.375 267.029 200.375C269.927 200.375 272.36 200.991 274.33 202.222C276.319 203.434 277.824 205.053 278.847 207.08C279.87 209.087 280.381 211.303 280.381 213.727V216.795C280.381 219.22 279.86 221.436 278.819 223.443C277.796 225.451 276.29 227.051 274.302 228.244C272.313 229.437 269.889 230.034 267.029 230.034C264.169 230.034 261.745 229.428 259.756 228.216C257.786 227.004 256.29 225.394 255.268 223.386C254.264 221.379 253.762 219.182 253.762 216.795ZM262.91 213.727V216.795C262.91 218.064 263.203 219.248 263.79 220.347C264.396 221.426 265.476 221.966 267.029 221.966C268.696 221.966 269.804 221.426 270.353 220.347C270.921 219.248 271.205 218.064 271.205 216.795V213.727C271.205 212.458 270.94 211.265 270.41 210.148C269.879 209.011 268.752 208.443 267.029 208.443C265.438 208.443 264.349 209.021 263.762 210.176C263.194 211.331 262.91 212.515 262.91 213.727ZM258.052 261L298.052 202.818H305.807L265.807 261H258.052Z" fill="#BADC58"/>
-</svg>

frontend/scripts/replace-variable.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-ORIGINAL=$1
-REPLACEMENT=$2
-
-if [ "${ORIGINAL}" = "${REPLACEMENT}" ]; then
-    echo "Environment variable replacement is the same, skipping.."
-    exit 0
-fi
-
-echo "Replacing pre-baked value.."
-
-find /app/public /app/.next -type f -name "*.js" |
-while read file; do
-    sed -i "s|$ORIGINAL|$REPLACEMENT|g" "$file"
-done

frontend/scripts/set-telemetry.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-VALUE=$1
-
-find /app/public /app/.next -type f -name "*.js" |
-while read file; do
-    sed -i "s|TELEMETRY_CAPTURING_ENABLED|$VALUE|g" "$file"
-done

frontend/scripts/start.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-scripts/replace-variable.sh "$BAKED_NEXT_PUBLIC_POSTHOG_API_KEY" "$NEXT_PUBLIC_POSTHOG_API_KEY"
-
-if [ "$INFISICAL_TELEMETRY_ENABLED" != "false" ]; then
-    echo "Telemetry is enabled"
-    scripts/set-telemetry.sh true
-else
-    echo "Client opted out of telemetry"
-    scripts/set-telemetry.sh false
-fi
-
-
-node server.js

helm-charts/README.md

@@ -1,16 +1,22 @@
-### helm repository Setup
-Assuming you have helm already installed, it is straight-forward to add a Cloudsmith-based chart repository:
+## Usage
+
+[Helm](https://helm.sh) must be installed to use the charts.  Please refer to
+Helm's [documentation](https://helm.sh/docs) to get started.
+
+Once Helm has been set up correctly, add the repo as follows:
 
 ```
-helm repo add infisical-helm-charts 'https://dl.cloudsmith.io/public/infisical/helm-charts/helm/charts/' 
-  
-helm repo update
+  helm repo add <alias> https://infisical.github.io/helm-charts
 ```
 
-### Installing a Helm Chart
-```
-helm install infisical-helm-charts/<name-of-helm-chart>
-```
+If you had already added this repo earlier, run `helm repo update` to retrieve
+the latest versions of the packages.  You can then run `helm search repo
+<alias>` to see the charts.
 
-#### Available chart names
-- infisical
+To install the <chart-name> chart:
+
+    helm install my-<chart-name> <alias>/<chart-name>
+
+To uninstall the chart:
+
+    helm delete my-<chart-name>

helm-charts/infisical/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm-charts/infisical/templates/backend-deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ .Release.Name }}-backend-deployment
   labels:
     app: backend
+  namespace: {{ .Values.namespace }}
 spec:
   replicas: {{ .Values.backend.replicaCount }}
   selector:
@@ -34,6 +35,7 @@ apiVersion: v1
 kind: Service 
 metadata:
   name: infisical-backend-service 
+  namespace: {{ .Values.namespace }}
 spec:
   selector:
     app: backend 

helm-charts/infisical/templates/frontend-deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ .Release.Name }}-frontend-deployment
   labels:
     app: frontend
+  namespace: {{ .Values.namespace }}
 spec:
   replicas: {{ .Values.frontend.replicaCount }}
   selector:
@@ -25,6 +26,7 @@ apiVersion: v1
 kind: Service 
 metadata:
   name: infisical-frontend-service 
+  namespace: {{ .Values.namespace }}
 spec:
   selector:
     app: frontend 

helm-charts/infisical/templates/ingress.yaml

@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: infisical-ingress
+  namespace: {{ .Values.namespace }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

helm-charts/infisical/templates/mongodb-deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mongodb-deployment 
+  namespace: {{ .Values.namespace }}
   labels:
     app: mongodb
 spec:
@@ -29,6 +30,7 @@ apiVersion: v1
 kind: Service 
 metadata:
   name: mongodb-service
+  namespace: {{ .Values.namespace }} 
 spec:
   selector:
     app: mongodb 

helm-charts/infisical/templates/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: infisical

helm-charts/upload-to-cloudsmith.sh

@@ -1,3 +1,4 @@
+export CLOUDSMITH_API_KEY=f5cf077b879c2ab46a49c6f1ec4199e6fba0fc0b
 ## Loop through each helm chart directoy and build each into helm package
 for d in */ ; do
     helm package $d